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

Conflicts:
	doc/src/examples/simpletreemodel.qdoc
	doc/src/examples/spinboxdelegate.qdoc
	doc/src/index.qdoc

90 files changed, 4769 insertions, 9027 deletions

diff --git a/demos/demos.pro b/demos/demos.pro
index f359bd7..fdc1e4c 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -58,7 +58,7 @@ wince*:SUBDIRS += demos_sqlbrowser
 contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer
 contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser
 contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative
-contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum
+contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum
 
 # install
 sources.files = README *.pro
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro
index c9da205..6305af4 100644
--- a/demos/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro
@@ -1,5 +1,7 @@
 include(../../spectrum.pri)
 
+static: error(This library cannot be built for static linkage)
+
 TEMPLATE = lib
 TARGET   = fftreal
 
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 1b419db..4fe8b6d 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -1,5 +1,7 @@
 include(../spectrum.pri)
 
+static: error(This application cannot be statically linked to the fftreal library)
+
 TEMPLATE = app
 
 TARGET = spectrum
diff --git a/doc/doc.pri b/doc/doc.pri
index e1efa21..a5db3c7 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -20,7 +20,7 @@ $$unixstyle {
     QDOC = $$replace(QDOC, "/", "\\")
 }
 ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf
-QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
                (cd $$QT_BUILD_TREE && \
                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 55b71e1..7a809eb 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -114,6 +114,7 @@ The following table lists the QML elements provided by the \l{QtDeclarative} mod
 \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
diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/demos/spectrum.qdoc
index b720ce1..d5a3f85 100644
--- a/doc/src/demos/spectrum.qdoc
+++ b/doc/src/demos/spectrum.qdoc
@@ -28,8 +28,34 @@
 /*!
     \example demos/spectrum
     \title Spectrum Analyzer
-This application is a demo which uses the QtMultimedia APIs to capture and
-play back PCM audio. While either recording or playback is ongoing, the
-application performs real-time level and frequency spectrum analysis,
-displaying the results in its main window.
+
+    The Spectrum Analyzer demo shows how the \l{QtMultimedia Module} can be
+    used in Qt applications to capture and then play back an audio stream.
+
+    \image spectrum-demo.png
+
+    Because QtMultimedia allows the application to access the raw audio
+    stream, the data can either be inspected or modified by the application.
+    The Spectrum Analyzer demo displays three pieces of information while
+    audio is being either captured or played back:
+
+    \list
+    \o Information about the raw audio stream, shown in the uppermost widget:
+    \list
+        \o The amount of data currently in the buffer, shown in blue
+        \o The segment of data which was most recently analysed to compute
+        the frequency spectrum, shown in green
+        \o The raw audio waveform, shown in white and scrolling from right to
+        left
+    \endlist
+    \o A representation of the frequency spectrum, shown at the lower left
+    \o The current RMS level of the audio stream, and the recent 'high
+    watermark' level, shown at the lower right
+    \endlist
+
+    Spectrum analysis is performed by calculating the Fast Fourier Transform
+    (FFT) of a segment of audio data.  An open-source library,
+    \l{http://ldesoras.free.fr/prod.html}{FFTReal}, against which the
+    application is dynamically linked, is used to compute the transform.
 */
+
diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc
index 790d5fa..7d1f8fe 100644
--- a/doc/src/examples/simpletreemodel.qdoc
+++ b/doc/src/examples/simpletreemodel.qdoc
@@ -36,13 +36,14 @@
 
     \image simpletreemodel-example.png
 
-    Qt's model/view architecture provides a standard way for views to manipulate
-    information in a data source, using an abstract model 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#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.
+    Qt's model/view architecture provides a standard way for views to
+    manipulate information in a data source, using an abstract model
+    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#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/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc
index 48e4bfa..44308ca 100644
--- a/doc/src/examples/spinboxdelegate.qdoc
+++ b/doc/src/examples/spinboxdelegate.qdoc
@@ -42,8 +42,8 @@
     \image spinboxdelegate-example.png
 
     This concepts behind this example are covered in the
-    \l{Model/View Programming#Delegate Classes}{Delegate Classes} chapter of the
-    \l{Model/View Programming} overview.
+    \l{Model/View Programming#Delegate Classes}{Delegate Classes} chapter
+    of the \l{Model/View Programming} overview.
 
     \section1 SpinBoxDelegate Class Definition
 
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 719c861..f52fc92 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -155,6 +155,15 @@
 
     \note The Phonon demos are currently not available for the MinGW platform.
 
+    \section1 Multimedia
+
+    \list
+    \o \l{demos/spectrum}{Spectrum Analyzer} demonstrates how the \l{QtMultimedia Module}
+    can be used to capture and play back an audio stream, at the same time allowing the
+    application to access the raw audio data.  This application analyzes the audio stream
+    in order to display a frequency spectrum.
+    \endlist
+
     \section1 Animation
 
     \list
diff --git a/doc/src/images/spectrum-demo.png b/doc/src/images/spectrum-demo.png
new file mode 100644
index 0000000..7f4938f
--- /dev/null
+++ b/doc/src/images/spectrum-demo.png
diff --git a/doc/src/platforms/emb-directfb-EmbLinux.qdoc b/doc/src/platforms/emb-directfb-EmbLinux.qdoc
index 955258e..f416819 100644
--- a/doc/src/platforms/emb-directfb-EmbLinux.qdoc
+++ b/doc/src/platforms/emb-directfb-EmbLinux.qdoc
@@ -153,6 +153,17 @@ manufacturer to manufacture, different operations will be optimized. This
 require you to define the operations you want to warn about or disable.
 These are listed above in the DIRECTFB_DRAWINGOPERATIONS variable.
 
+You can also customize this with environment variables.
+
+E.g. If you want to disable fallbacks for drawPixmap and fillRect and also get
+a warning printed on stderr when a fallback would have happened.
+
+\code
+$ export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="FILL_RECT|DRAW_PIXMAP"
+$ export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="FILL_RECT|DRAW_PIXMAP"
+$ ./app -qws -display directfb
+\endcode
+
 Following is a table showing which options you have.
 
 \table
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index e0b6503..47c3f1e 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -38,7 +38,7 @@ $(STORE_BUILD_TARGET):
 	echo "#                make sis target." >> $(CACHE_FILENAME) && \
 	echo "#  Version     : " >> $(CACHE_FILENAME) && \
 	echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
-	echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \
+	echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(VARIANTPLATFORM) >> $(CACHE_FILENAME)
 	$(call endrule,qmake_store_build)
 endef
 
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
index 0f7db3c..12857a2 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml
+++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
@@ -37,5 +37,6 @@
 
     <interface name="qt.qmake_store_build" extends="Symbian.UserFLM"
                 flm="qmake_store_build.flm">
+        <param name='VARIANTPLATFORM' />
     </interface>    
 </build>
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index c896ac6..85dcab4 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -249,13 +249,17 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
     } else {
         t << "all: debug release" << endl;
         t << endl;
+
+        QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs();
+
         t << "qmake:" << endl;
-        t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName()
-          << "\" \"" << project->projectFile() << "\"" << endl;
+        t << qmakeCmd << endl;
         t << endl;
-        t << BLD_INF_FILENAME ":" << endl;
-        t << "\t$(QMAKE)" << endl;
+
+        t << BLD_INF_FILENAME ": " << project->projectFile() << endl;
+        t << qmakeCmd << endl;
         t << endl;
+
         t << "$(ABLD): " BLD_INF_FILENAME << endl;
         t << "\tbldmake bldfiles" << endl;
         t << endl;
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 78f6f85..036eb1d 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -56,6 +56,12 @@ SymbianSbsv2MakefileGenerator::~SymbianSbsv2MakefileGenerator() { }
 
 #define FLM_DEST_DIR "epoc32/tools/makefile_templates/qt"
 #define FLM_SOURCE_DIR "/mkspecs/symbian-sbsv2/flm/qt"
+#define UNDETECTED_GCCE_VERSION "0"
+#define PLATFORM_GCCE "gcce"
+#define PLATFORM_WINSCW "winscw"
+#define PLATFORM_ARMV5 "armv5"
+#define BUILD_DEBUG "udeb"
+#define BUILD_RELEASE "urel"
 
 // Copies Qt FLMs to correct location under epocroot.
 // This is not done by configure as it is possible to change epocroot after configure.
@@ -90,6 +96,67 @@ void SymbianSbsv2MakefileGenerator::exportFlm()
     }
 }
 
+QString SymbianSbsv2MakefileGenerator::gcceVersion()
+{
+    static QString gcceVersionStr;
+
+    if (gcceVersionStr.isEmpty()) {
+        // First check if QT_GCCE_VERSION has been set, and use that if it is
+        QByteArray qtGcceVersion = qgetenv("QT_GCCE_VERSION");
+        if (!qtGcceVersion.isEmpty()) {
+            // Check that QT_GCCE_VERSION is in proper format
+            QString check(qtGcceVersion);
+            check.replace(QRegExp("^\\d+\\.\\d+\\.\\d+$"),QString());
+            if (check.isEmpty()) {
+                gcceVersionStr = PLATFORM_GCCE + QString(qtGcceVersion).replace(".","_");
+                return gcceVersionStr;
+            } else {
+                fprintf(stderr, "Warning: Environment variable QT_GCCE_VERSION ('%s') is in incorrect "
+                        "format, expected format is: '1.2.3'. Attempting to autodetect GCCE version.",
+                        qtGcceVersion.constData());
+            }
+        }
+        // Sbsv2 has separate env variable defined for each gcce version, so try to determine
+        // which user is likely to want to use by checking version 4.0.0 to 9.9.9 and taking
+        // the highest found version that actually points to a valid path.
+        // This is kind of a kludge, but since qmake doesn't bootstrap QProcess, there
+        // is no Qt API available to get all environment variables.
+        for (int i = 9; i >= 4; i--) {
+            for (int j = 9; j >= 0; j--) {
+                for (int k = 9; k >= 0; k--) {
+                    QByteArray gcceVar = qgetenv(qPrintable(QString("SBS_GCCE%1%2%3BIN").arg(i).arg(j).arg(k)));
+                    if (!gcceVar.isEmpty() && fileInfo(QString::fromLocal8Bit(gcceVar.constData())).exists()) {
+                        gcceVersionStr = QString(PLATFORM_GCCE "%1_%2_%3").arg(i).arg(j).arg(k);
+                        return gcceVersionStr;
+                   }
+                }
+            }
+        }
+    }
+
+    // Indicate undetected version to avoid rechecking multiple times
+    if (gcceVersionStr.isEmpty())
+        gcceVersionStr = UNDETECTED_GCCE_VERSION;
+
+    return gcceVersionStr;
+}
+
+QString SymbianSbsv2MakefileGenerator::configClause(QString &platform,
+                                                    QString &build,
+                                                    QString &winscwClauseTemplate,
+                                                    QString &gcceClauseTemplate,
+                                                    QString &genericClauseTemplate)
+{
+    QString retval;
+    if (QString::compare(platform, PLATFORM_WINSCW) == 0)
+        retval = winscwClauseTemplate.arg(build);
+    else if (QString::compare(platform, PLATFORM_GCCE) == 0)
+        retval = gcceClauseTemplate.arg(build);
+    else
+        retval = genericClauseTemplate.arg(platform).arg(build);
+    return retval;
+}
+
 void SymbianSbsv2MakefileGenerator::writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t)
 {
     for (int i = 0; i < depList.size(); ++i) {
@@ -118,21 +185,45 @@ void SymbianSbsv2MakefileGenerator::writeMkFile(const QString& wrapperFileName,
 
 void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile)
 {
+    static QString debugBuild(BUILD_DEBUG);
+    static QString releaseBuild(BUILD_RELEASE);
+
     QStringList allPlatforms;
     foreach(QString platform, project->values("SYMBIAN_PLATFORMS")) {
         allPlatforms << platform.toLower();
     }
 
-    QStringList debugPlatforms = allPlatforms;
-    QStringList releasePlatforms = allPlatforms;
-    releasePlatforms.removeAll("winscw"); // No release for emulator
-
     QString testClause;
     if (project->isActiveConfig(SYMBIAN_TEST_CONFIG))
         testClause = QLatin1String(".test");
     else
         testClause = QLatin1String("");
 
+    QString genericClause = " -c %1_%2" + testClause;
+    QString winscwClause = " -c winscw_%1.mwccinc" + testClause;
+    QString gcceClause;
+    if (QString::compare(gcceVersion(), UNDETECTED_GCCE_VERSION) == 0)
+        allPlatforms.removeAll(PLATFORM_GCCE);
+    else
+        gcceClause = " -c arm.v5.%1." + gcceVersion() + ".release_gcce" + testClause;
+
+    QStringList allClauses;
+    QStringList debugClauses;
+    QStringList releaseClauses;
+
+    QStringList debugPlatforms = allPlatforms;
+    QStringList releasePlatforms = allPlatforms;
+    releasePlatforms.removeAll(PLATFORM_WINSCW); // No release for emulator
+
+    foreach(QString item, debugPlatforms) {
+        debugClauses << configClause(item, debugBuild, winscwClause, gcceClause, genericClause);
+    }
+    foreach(QString item, releasePlatforms) {
+        releaseClauses << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause);
+    }
+    allClauses << debugClauses << releaseClauses;
+
+
     QTextStream t(&wrapperFile);
 
     t << "# ==============================================================================" << endl;
@@ -172,9 +263,9 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     }
     t << endl;
     t << "first: default" << endl;
-    if (debugPlatforms.contains("winscw"))
+    if (debugPlatforms.contains(PLATFORM_WINSCW))
         t << "default: debug-winscw";
-    else if (debugPlatforms.contains("armv5"))
+    else if (debugPlatforms.contains(PLATFORM_ARMV5))
         t << "default: debug-armv5";
     else if (debugPlatforms.size())
         t << "default: debug-" << debugPlatforms.first();
@@ -187,60 +278,61 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     } else {
         t << "all: debug release" << endl;
         t << endl;
+
+        QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs();
+
         t << "qmake:" << endl;
-        t << "\t$(QMAKE) -spec symbian-sbsv2 -o \"" << fileInfo(Option::output.fileName()).fileName()
-          << "\" \"" << project->projectFile() << "\"" << endl;
+        t << qmakeCmd << endl;
         t << endl;
-        t << BLD_INF_FILENAME ":" << endl;
-        t << "\t$(QMAKE)" << endl;
+
+        t << BLD_INF_FILENAME ": " << project->projectFile() << endl;
+        t << qmakeCmd << endl;
         t << endl;
 
-        QString winscw("winscw");
+        QString currentClause;
+
         t << "debug: " << BLD_INF_FILENAME << endl;
         t << "\t$(SBS)";
-        foreach(QString item, debugPlatforms) {
-            if(QString::compare(item, winscw) == 0)
-                t << " -c " << item << "_udeb.mwccinc" << testClause;
-            else
-                t << " -c " << item << "_udeb" << testClause;
+        foreach(QString item, debugClauses) {
+            t << item;
         }
         t << endl;
         t << "release: " << BLD_INF_FILENAME << endl;
         t << "\t$(SBS)";
-        foreach(QString item, releasePlatforms) {
-            if(QString::compare(item, winscw) == 0)
-                t << " -c " << item << "_urel.mwccinc" << testClause;
-            else
-                t << " -c " << item << "_urel" << testClause;
+        foreach(QString item, releaseClauses) {
+            t << item;
         }
         t << endl;
 
         // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
         foreach(QString item, debugPlatforms) {
             t << "debug-" << item << ": " << BLD_INF_FILENAME << endl;
-            if(QString::compare(item, winscw) == 0)
-                t << "\t$(SBS) -c " << item << "_udeb.mwccinc" << testClause << endl;
-            else
-                t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl;
+            t << "\t$(SBS)";
+            t << configClause(item, debugBuild, winscwClause, gcceClause, genericClause);
+            t << endl;
         }
 
         foreach(QString item, releasePlatforms) {
             t << "release-" << item << ": " << BLD_INF_FILENAME << endl;
-            if(QString::compare(item, winscw) == 0)
-                t << "\t$(SBS) -c " << item << "_urel.mwccinc" << testClause << endl;
-            else
-                t << "\t$(SBS) -c " << item << "_urel" << testClause << endl;
+            t << "\t$(SBS)";
+            t << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause);
+            t << endl;
         }
 
         t << endl;
         t << "export: " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) export" << endl;
-        t << endl;
+        t << "\t$(SBS) export";
+        foreach(QString clause, allClauses) {
+            t << clause;
+        }
+        t << endl << endl;
 
         t << "cleanexport: " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) cleanexport" << endl;
-        t << endl;
-
+        t << "\t$(SBS) cleanexport";
+        foreach(QString clause, allClauses) {
+            t << clause;
+        }
+        t << endl << endl;
     }
 
     // Add all extra targets including extra compiler targest also to wrapper makefile,
@@ -258,30 +350,37 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     generateDistcleanTargets(t);
 
     t << "clean: " << BLD_INF_FILENAME << endl;
-    t << "\t-$(SBS) reallyclean" << endl;
-    t << endl;
+    t << "\t-$(SBS) reallyclean";
+    foreach(QString clause, allClauses) {
+        t << clause;
+    }
+    t << endl << endl;
 
     t << "clean-debug: " << BLD_INF_FILENAME << endl;
     t << "\t$(SBS) reallyclean";
-    foreach(QString item, debugPlatforms) {
-        t << " -c " << item << "_udeb" << testClause;
+    foreach(QString clause, debugClauses) {
+        t << clause;
     }
-    t << endl;
+    t << endl << endl;
     t << "clean-release: " << BLD_INF_FILENAME << endl;
     t << "\t$(SBS) reallyclean";
-    foreach(QString item, releasePlatforms) {
-        t << " -c " << item << "_urel" << testClause;
+    foreach(QString clause, releaseClauses) {
+        t << clause;
     }
-    t << endl;
+    t << endl << endl;
 
     // For more specific builds, targets are in this form: clean-build-platform, e.g. clean-release-armv5
     foreach(QString item, debugPlatforms) {
         t << "clean-debug-" << item << ": " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) reallyclean -c " << item << "_udeb" << testClause << endl;
+        t << "\t$(SBS) reallyclean";
+        t << configClause(item, debugBuild, winscwClause, gcceClause, genericClause);
+        t << endl;
     }
     foreach(QString item, releasePlatforms) {
         t << "clean-release-" << item << ": " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) reallyclean -c " << item << "_urel" << testClause << endl;
+        t << "\t$(SBS) reallyclean";
+        t << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause);
+        t << endl;
     }
     t << endl;
 }
diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h
index 286c91c..6644a03 100644
--- a/qmake/generators/symbian/symmake_sbsv2.h
+++ b/qmake/generators/symbian/symmake_sbsv2.h
@@ -65,6 +65,13 @@ public:
 
 private:
     void exportFlm();
+    QString gcceVersion();
+    QString configClause(QString &platform,
+                         QString &build,
+                         QString &winscwClauseTemplate,
+                         QString &gcceClauseTemplate,
+                         QString &genericClauseTemplate);
+
     void writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t);
 
     QString extraTargetsCache;
diff --git a/src/3rdparty/phonon/CMakeLists.txt b/src/3rdparty/phonon/CMakeLists.txt
index e2054d3..fd6368c 100644
--- a/src/3rdparty/phonon/CMakeLists.txt
+++ b/src/3rdparty/phonon/CMakeLists.txt
@@ -94,7 +94,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
    set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility")
 
    # get the gcc version
-   exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+   exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
 
    string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index fb2703e..d31a2b4 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-413404da27312051bb3ff2cfd0f3fca42aa4b245
+72b1c38579ca1fdb3f242e29cd16e5bfb4925813
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index c256434..62aa8ce 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        413404da27312051bb3ff2cfd0f3fca42aa4b245
+        72b1c38579ca1fdb3f242e29cd16e5bfb4925813
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 5b78226..98d4d51 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-10  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Make sure NPAPI plugins get an initial setNPWindow on Mac
+
+        https://bugs.webkit.org/show_bug.cgi?id=43782
+
+        * plugins/mac/PluginViewMac.mm:
+
 2010-06-14  Andreas Kling  <andreas.kling@nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm
index 57d74ab..c8781a8 100644
--- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm
+++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm
@@ -227,7 +227,10 @@ bool PluginView::platformStart()
 #endif
     }
 
-    show();
+    updatePluginWidget();
+
+    if (!m_plugin->quirks().contains(PluginQuirkDeferFirstSetWindowCall))
+        setNPWindowIfNeeded();
 
     // TODO: Implement null timer throttling depending on plugin activation
     m_nullEventTimer.set(new Timer<PluginView>(this, &PluginView::nullEventTimerFired));
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 3515777..ea7e2e4 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -476,7 +476,7 @@ QLibraryInfo::location(LibraryLocation loc)
     \value PrefixPath The default prefix for all paths.
     \value DocumentationPath The location for documentation upon install.
     \value HeadersPath The location for all headers.
-    \value LibrariesPath The location of installed librarires.
+    \value LibrariesPath The location of installed libraries.
     \value BinariesPath The location of installed Qt binaries (tools and applications).
     \value PluginsPath The location of installed Qt plugins.
     \value ImportsPath The location of installed QML extensions to import.
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 0a5e06e..512e193 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2308,6 +2308,7 @@ void QCoreApplication::setLibraryPaths(const QStringList &paths)
     if (!coreappdata()->app_libpaths)
         coreappdata()->app_libpaths = new QStringList;
     *(coreappdata()->app_libpaths) = paths;
+    locker.unlock();
     QFactoryLoader::refreshAll();
 }
 
@@ -2341,6 +2342,7 @@ void QCoreApplication::addLibraryPath(const QString &path)
     if (!canonicalPath.isEmpty()
         && !coreappdata()->app_libpaths->contains(canonicalPath)) {
         coreappdata()->app_libpaths->prepend(canonicalPath);
+        locker.unlock();
         QFactoryLoader::refreshAll();
     }
 }
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 79a38cd..9854e68 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -1009,8 +1009,11 @@ QByteArray QMetaObject::normalizedSignature(const char *method)
     int argdepth = 0;
     int templdepth = 0;
     while (*d) {
-        if (argdepth == 1)
+        if (argdepth == 1) {
             d = qNormalizeType(d, templdepth, result);
+            if (!*d) //most likely an invalid signature.
+                break;
+        }
         if (*d == '(')
             ++argdepth;
         if (*d == ')')
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 853f311..91c3a19 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -1523,7 +1523,7 @@ ushort QXmlStreamReaderPrivate::getChar_helper()
         decoder = codec->makeDecoder();
     }
 
-    decoder->toUnicode(&readBuffer, rawReadBuffer.data(), nbytesread);
+    decoder->toUnicode(&readBuffer, rawReadBuffer.constData(), nbytesread);
 
     if(lockEncoding && decoder->hasFailure()) {
         raiseWellFormedError(QXmlStream::tr("Encountered incorrectly encoded content."));
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 2b41710..cc7c673 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -2500,7 +2500,9 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItemPrivate::transi
   This property holds whether clipping is enabled.
 
   if clipping is enabled, an item will clip its own painting, as well
-  as the painting of its children, to its bounding rectangle.
+  as the painting of its children, to its bounding rectangle. If you set
+  clipping during an item's paint operation, remember to re-set it to 
+  prevent clipping the rest of your scene.
 
   Non-rectangular clipping regions are not supported for performance reasons.
 */
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index 2b268fb..68e7e9a 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -133,13 +133,13 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
     create items as they are required.
 
     Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. 
-    For example, it cannot be used to repeat QtObjects:
+    For example, it cannot be used to repeat QObjects:
     \badcode
     Item {
-        //XXX does not work! Can't repeat QtObject as it doesn't derive from Item.
+        //XXX does not work! Can't repeat QObject as it doesn't derive from Item.
         Repeater {
             model: 10
-            QtObject {}
+            QObject {}
         }
     }
     \endcode
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 3d25291..a58dc6c 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -80,10 +80,12 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
 
     \code
     QDeclarativeEngine engine;
+    QStringListModel modelData;
     QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext());
-    context->setContextProperty("myModel", modelData);
+    context->setContextProperty("myModel", &modelData);
 
-    QDeclarativeComponent component(&engine, "ListView { model=myModel }");
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.7\nListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
@@ -104,12 +106,13 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
         ...
     };
 
-    MyDataSet *myDataSet = new MyDataSet;
+    MyDataSet myDataSet;
     QDeclarativeEngine engine;
     QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext());
-    context->setContextObject(myDataSet);
+    context->setContextObject(&myDataSet);
 
-    QDeclarativeComponent component(&engine, "ListView { model=myModel }");
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.7\nListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index a476629..8aab4c2 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -184,11 +184,12 @@ void QDeclarativeEnginePrivate::defineModule()
 }
 
 /*!
-\keyword QmlGlobalQtObject
-\qmlclass Qt QDeclarativeEnginePrivate
+\qmlclass QML:Qt QDeclarativeEnginePrivate
 \brief The QML global Qt object provides useful enums and functions from Qt.
 
-The \c Qt object provides useful enums and functions from Qt, for use in all QML files. 
+\keyword QmlGlobalQtObject
+
+\brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files. 
 
 The \c Qt object is not a QML element; it cannot be instantiated. It is a global object 
 with enums and functions.  To use it, call the members of the global \c Qt object directly. 
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 9ced14f..de2de21 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -525,6 +525,7 @@ void QDeclarativePixmapReader::cancel(QDeclarativePixmapReply *reply)
     mutex.lock();
     if (reply->loading) {
         cancelled.append(reply);
+        reply->data = 0;
         // XXX 
         if (threadObject) threadObject->processJobs();
     } else {
@@ -738,7 +739,6 @@ void QDeclarativePixmapData::release()
 
     if (refCount == 0) {
         if (reply) {
-            reply->data = 0;
             reply->reader->cancel(reply);
             reply = 0;
         }
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp
index 062b5ac..3fc7f10 100644
--- a/src/gui/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp
@@ -641,7 +641,8 @@ QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constrain
     Q_D(const QGraphicsGridLayout);
     qreal left, top, right, bottom;
     getContentsMargins(&left, &top, &right, &bottom);
-    return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom);
+    const QSizeF extraMargins(left + right, top + bottom);
+    return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins;
 }
 
 
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index 5a7f1af..3707591 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -48,6 +48,7 @@
 #include "qgraphicslayoutitem.h"
 #include "qgraphicslayoutitem_p.h"
 #include "qwidget.h"
+#include "qgraphicswidget.h"
 
 #include <QtDebug>
 
@@ -139,9 +140,11 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint)
     if (!sizeHintCacheDirty && cachedConstraint == constraint)
         return cachedSizeHints;
 
+    const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0;
+
     for (int i = 0; i < Qt::NSizeHints; ++i) {
         cachedSizeHints[i] = constraint;
-        if (userSizeHints)
+        if (userSizeHints && !hasConstraint)
             combineSize(cachedSizeHints[i], userSizeHints[i]);
     }
 
@@ -259,6 +262,52 @@ void QGraphicsLayoutItemPrivate::setSizeComponent(
     q->updateGeometry();
 }
 
+
+bool QGraphicsLayoutItemPrivate::hasHeightForWidth() const
+{
+    Q_Q(const QGraphicsLayoutItem);
+    if (isLayout) {
+        const QGraphicsLayout *l = static_cast<const QGraphicsLayout *>(q);
+        for (int i = l->count() - 1; i >= 0; --i) {
+            if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasHeightForWidth())
+                return true;
+        }
+    } else if (QGraphicsItem *item = q->graphicsItem()) {
+        if (item->isWidget()) {
+            QGraphicsWidget *w = static_cast<QGraphicsWidget *>(item);
+            if (w->layout()) {
+                return QGraphicsLayoutItemPrivate::get(w->layout())->hasHeightForWidth();
+            }
+        }
+    }
+    return q->sizePolicy().hasHeightForWidth();
+}
+
+bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const
+{
+    // enable this code when we add QSizePolicy::hasWidthForHeight() (For 4.8)
+#if 1
+    return false;
+#else
+    Q_Q(const QGraphicsLayoutItem);
+    if (isLayout) {
+        const QGraphicsLayout *l = static_cast<const QGraphicsLayout *>(q);
+        for (int i = l->count() - 1; i >= 0; --i) {
+            if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasWidthForHeight())
+                return true;
+        }
+    } else if (QGraphicsItem *item = q->graphicsItem()) {
+        if (item->isWidget()) {
+            QGraphicsWidget *w = static_cast<QGraphicsWidget *>(item);
+            if (w->layout()) {
+                return QGraphicsLayoutItemPrivate::get(w->layout())->hasWidthForHeight();
+            }
+        }
+    }
+    return q->sizePolicy().hasWidthForHeight();
+#endif
+}
+
 /*!
     \class QGraphicsLayoutItem
     \brief The QGraphicsLayoutItem class can be inherited to allow your custom
diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h
index 15cc7a5..b752e03 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem_p.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h
@@ -65,6 +65,9 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutItemPrivate
 public:
     virtual ~QGraphicsLayoutItemPrivate();
     QGraphicsLayoutItemPrivate(QGraphicsLayoutItem *parent, bool isLayout);
+    static QGraphicsLayoutItemPrivate *get(QGraphicsLayoutItem *q) { return q->d_func();}
+    static const QGraphicsLayoutItemPrivate *get(const QGraphicsLayoutItem *q) { return q->d_func();}
+
     void init();
     QSizeF *effectiveSizeHints(const QSizeF &constraint) const;
     QGraphicsItem *parentItem() const;
@@ -73,6 +76,9 @@ public:
     enum SizeComponent { Width, Height };
     void setSizeComponent(Qt::SizeHint which, SizeComponent component, qreal value);
 
+    bool hasHeightForWidth() const;
+    bool hasWidthForHeight() const;
+
     QSizePolicy sizePolicy;
     QGraphicsLayoutItem *parent;
 
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp
index 37408ef..1588364 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp
@@ -528,7 +528,8 @@ QSizeF QGraphicsLinearLayout::sizeHint(Qt::SizeHint which, const QSizeF &constra
     Q_D(const QGraphicsLinearLayout);
     qreal left, top, right, bottom;
     getContentsMargins(&left, &top, &right, &bottom);
-    return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom);
+    const QSizeF extraMargins(left + right, top + bottom);
+    return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins;
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index c486c45..0fabd18 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -385,12 +385,12 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
         if (wd->inSetPos) {
             //set the new pos
             d->geom.moveTopLeft(pos());
+            emit geometryChanged();
             return;
         }
     }
     QSizeF oldSize = size();
     QGraphicsLayoutItem::setGeometry(newGeom);
-    emit geometryChanged();
     // Send resize event
     bool resized = newGeom.size() != oldSize;
     if (resized) {
@@ -403,6 +403,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
             emit heightChanged();
         QApplication::sendEvent(this, &re);
     }
+    emit geometryChanged();
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index a084647..f3b2026 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -250,6 +250,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
 
         sumAvailable = targetSize - totalBox.q_preferredSize;
         if (sumAvailable > 0.0) {
+            qreal sumCurrentAvailable = sumAvailable;
             bool somethingHasAMaximumSize = false;
 
             qreal sumPreferredSizes = 0.0;
@@ -308,12 +309,12 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
                         qreal ultimateFactor = (stretch * ultimateSumPreferredSizes
                                                 / sumStretches)
                                                - (box.q_preferredSize);
-                        qreal transitionalFactor = sumAvailable
+                        qreal transitionalFactor = sumCurrentAvailable
                                                    * (ultimatePreferredSize - box.q_preferredSize)
                                                    / (ultimateSumPreferredSizes
                                                       - sumPreferredSizes);
 
-                        qreal alpha = qMin(sumAvailable,
+                        qreal alpha = qMin(sumCurrentAvailable,
                                            ultimateSumPreferredSizes - sumPreferredSizes);
                         qreal beta = ultimateSumPreferredSizes - sumPreferredSizes;
 
@@ -321,7 +322,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
                                       + ((beta - alpha) * transitionalFactor)) / beta;
                     }
                     sumFactors += factors[i];
-                    if (desired < sumAvailable)
+                    if (desired < sumCurrentAvailable)
                         somethingHasAMaximumSize = true;
 
                     newSizes[i] = -1.0;
@@ -337,12 +338,12 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
                         continue;
 
                     const QGridLayoutBox &box = boxes.at(start + i);
-                    qreal avail = sumAvailable * factors[i] / sumFactors;
+                    qreal avail = sumCurrentAvailable * factors[i] / sumFactors;
                     if (sizes[i] + avail >= box.q_maximumSize) {
                         newSizes[i] = box.q_maximumSize;
-                        sumAvailable -= box.q_maximumSize - sizes[i];
+                        sumCurrentAvailable -= box.q_maximumSize - sizes[i];
                         sumFactors -= factors[i];
-                        keepGoing = (sumAvailable > 0.0);
+                        keepGoing = (sumCurrentAvailable > 0.0);
                         if (!keepGoing)
                             break;
                     }
@@ -352,7 +353,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
             for (int i = 0; i < n; ++i) {
                 if (newSizes[i] < 0.0) {
                     qreal delta = (sumFactors == 0.0) ? 0.0
-                                                      : sumAvailable * factors[i] / sumFactors;
+                                                      : sumCurrentAvailable * factors[i] / sumFactors;
                     newSizes[i] = sizes[i] + delta;
                 }
             }
@@ -545,6 +546,24 @@ QSizePolicy::Policy QGridLayoutItem::sizePolicy(Qt::Orientation orientation) con
                                            : sizePolicy.verticalPolicy();
 }
 
+/*
+  returns true if the size policy returns true for either hasHeightForWidth()
+  or hasWidthForHeight()
+ */
+bool QGridLayoutItem::hasDynamicConstraint() const
+{
+    return QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth()
+        || QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight();
+}
+
+Qt::Orientation QGridLayoutItem::dynamicConstraintOrientation() const
+{
+    if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth())
+        return Qt::Vertical;
+    else //if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight())
+        return Qt::Horizontal;
+}
+
 QSizePolicy::ControlTypes QGridLayoutItem::controlTypes(LayoutSide /* side */) const
 {
     return q_layoutItem->sizePolicy().controlType();
@@ -613,7 +632,14 @@ QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal heig
         qreal cellWidth = width;
         qreal cellHeight = height;
 
-        QSizeF size = effectiveMaxSize().boundedTo(QSizeF(cellWidth, cellHeight));
+        QSize constraint;
+        if (hasDynamicConstraint()) {
+            if (dynamicConstraintOrientation() == Qt::Vertical)
+                constraint.setWidth(cellWidth);
+            else
+                constraint.setHeight(cellHeight);
+        }
+        QSizeF size = effectiveMaxSize(constraint).boundedTo(QSizeF(cellWidth, cellHeight));
         width = size.width();
         height = size.height();
 
@@ -675,13 +701,13 @@ void QGridLayoutItem::insertOrRemoveRows(int row, int delta, Qt::Orientation ori
     Note that effectiveSizeHint does not take sizePolicy into consideration,
     (since it only evaluates the hints, as the name implies)
 */
-QSizeF QGridLayoutItem::effectiveMaxSize() const
+QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const
 {
-    QSizeF size;
+    QSizeF size = constraint;
     bool vGrow = (sizePolicy(Qt::Vertical) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag;
     bool hGrow = (sizePolicy(Qt::Horizontal) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag;
     if (!vGrow || !hGrow) {
-        QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize);
+        QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize, constraint);
         if (!vGrow)
             size.setHeight(pref.height());
         if (!hGrow)
@@ -689,7 +715,7 @@ QSizeF QGridLayoutItem::effectiveMaxSize() const
     }
 
     if (!size.isValid()) {
-        QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize);
+        QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize, constraint);
         if (size.width() == -1)
             size.setWidth(maxSize.width());
         if (size.height() == -1)
@@ -1010,6 +1036,7 @@ void QGridLayoutEngine::invalidate()
     q_cachedEffectiveLastRows[Ver] = -1;
     q_cachedDataForStyleInfo.invalidate();
     q_cachedSize = QSizeF();
+    q_cachedConstraintOrientation = UnknownConstraint;
 }
 
 static void visualRect(QRectF *geom, Qt::LayoutDirection dir, const QRectF &contentsRect)
@@ -1074,10 +1101,13 @@ QRectF QGridLayoutEngine::cellRect(const QLayoutStyleInfo &styleInfo,
 }
 
 QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which,
-                                   const QSizeF & /* constraint */) const
+                                   const QSizeF &constraint) const
 {
     ensureColumnAndRowData(styleInfo);
 
+    if (hasDynamicConstraint())
+        return dynamicallyConstrainedSizeHint(which, constraint);
+
     switch (which) {
     case Qt::MinimumSize:
         return QSizeF(q_totalBoxes[Hor].q_minimumSize, q_totalBoxes[Ver].q_minimumSize);
@@ -1375,7 +1405,11 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, const QLayoutSt
                         box = &multiCell.q_box;
                         multiCell.q_stretch = itemStretch;
                     }
-                    box->combine(item->box(orientation));
+                    // Items with constraints are not included in the orientation that
+                    // they are constrained (since it depends on the hfw/constraint function).
+                    // They must be combined at a later stage.
+                    if (!item->hasDynamicConstraint() || orientation != item->dynamicConstraintOrientation())
+                        box->combine(item->box(orientation));
 
                     if (effectiveRowSpan == 1) {
                         QSizePolicy::ControlTypes controls = item->controlTypes(top);
@@ -1532,6 +1566,138 @@ void QGridLayoutEngine::ensureColumnAndRowData(const QLayoutStyleInfo &styleInfo
     q_cachedDataForStyleInfo = styleInfo;
 }
 
+QSizeF QGridLayoutEngine::dynamicallyConstrainedSizeHint(Qt::SizeHint which,
+                                                         const QSizeF &constraint) const
+{
+    Q_ASSERT(hasDynamicConstraint());
+    if (constraint.width() < 0 && constraint.height() < 0) {
+        // Process the hfw / wfh items that we did not process in fillRowData()
+        const Qt::Orientation constraintOrient = constraintOrientation();
+
+        QGridLayoutRowData rowData = constraintOrient == Qt::Vertical ? q_rowData : q_columnData;
+        for (int i = q_items.count() - 1; i >= 0; --i) {
+            QGridLayoutItem *item = q_items.at(i);
+            if (item->hasDynamicConstraint()) {
+                QGridLayoutBox box = item->box(constraintOrient);
+                QGridLayoutBox &rowBox = rowData.boxes[item->firstRow(constraintOrient)];
+                rowBox.combine(box);
+            }
+        }
+
+        QGridLayoutBox totalBoxes[2];
+        if (constraintOrient == Qt::Vertical) {
+            totalBoxes[Hor] = q_columnData.totalBox(0, columnCount());
+            totalBoxes[Ver] = rowData.totalBox(0, rowCount());
+        } else {
+            totalBoxes[Hor] = rowData.totalBox(0, columnCount());
+            totalBoxes[Ver] = q_rowData.totalBox(0, rowCount());
+        }
+        return QSizeF(totalBoxes[Hor].q_sizes(which), totalBoxes[Ver].q_sizes(which));
+    }
+
+
+    Q_ASSERT(constraint.width() >= 0 || constraint.height() >= 0);
+    q_xx.resize(columnCount());
+    q_yy.resize(rowCount());
+    q_widths.resize(columnCount());
+    q_heights.resize(rowCount());
+    q_descents.resize(rowCount());
+
+
+    const Qt::Orientation orientation = constraintOrientation();
+    QGridLayoutRowData *colData;
+    QGridLayoutRowData constrainedRowData;
+    QGridLayoutBox *totalBox;
+    qreal *sizes;
+    qreal *pos;
+    qreal *descents;
+    qreal targetSize;
+    qreal cCount;
+    qreal rCount;
+
+    if (orientation == Qt::Vertical) {
+        // height for width
+        colData = &q_columnData;
+        totalBox = &q_totalBoxes[Hor];
+        sizes = q_widths.data();
+        pos = q_xx.data();
+        descents = 0;
+        targetSize = constraint.width();
+        cCount = columnCount();
+        rCount = rowCount();
+        constrainedRowData = q_rowData;
+    } else {
+        // width for height
+        colData = &q_rowData;
+        totalBox = &q_totalBoxes[Ver];
+        sizes = q_heights.data();
+        pos = q_yy.data();
+        descents = q_descents.data();
+        targetSize = constraint.height();
+        cCount = rowCount();
+        rCount = columnCount();
+        constrainedRowData = q_columnData;
+    }
+    colData->calculateGeometries(0, cCount, targetSize, pos, sizes, descents, *totalBox);
+    for (int i = q_items.count() - 1; i >= 0; --i) {
+        QGridLayoutItem *item = q_items.at(i);
+
+        if (item->hasDynamicConstraint()) {
+            const qreal size = sizes[item->firstColumn(orientation)];
+            QGridLayoutBox box = item->box(orientation, size);
+            QGridLayoutBox &rowBox = constrainedRowData.boxes[item->firstRow(orientation)];
+            rowBox.combine(box);
+        }
+    }
+    const qreal newSize = constrainedRowData.totalBox(0, rCount).q_sizes(which);
+
+    return (orientation == Qt::Vertical) ? QSizeF(targetSize, newSize) : QSizeF(newSize, targetSize);
+}
+
+
+/**
+   returns false if the layout has contradicting constraints (i.e. some items with a horizontal
+   constraint and other items with a vertical constraint)
+ */
+bool QGridLayoutEngine::ensureDynamicConstraint() const
+{
+    if (q_cachedConstraintOrientation == UnknownConstraint) {
+        for (int i = q_items.count() - 1; i >= 0; --i) {
+            QGridLayoutItem *item = q_items.at(i);
+            if (item->hasDynamicConstraint()) {
+                Qt::Orientation itemConstraintOrientation = item->dynamicConstraintOrientation();
+                if (q_cachedConstraintOrientation == UnknownConstraint) {
+                    q_cachedConstraintOrientation = itemConstraintOrientation;
+                } else if (q_cachedConstraintOrientation != itemConstraintOrientation) {
+                    q_cachedConstraintOrientation = UnfeasibleConstraint;
+                    qWarning("QGridLayoutEngine: Unfeasible, cannot mix horizontal and"
+                             " vertical constraint in the same layout");
+                    return false;
+                }
+            }
+        }
+        if (q_cachedConstraintOrientation == UnknownConstraint)
+            q_cachedConstraintOrientation = NoConstraint;
+    }
+    return true;
+}
+
+bool QGridLayoutEngine::hasDynamicConstraint() const
+{
+    if (!ensureDynamicConstraint())
+        return false;
+    return q_cachedConstraintOrientation != NoConstraint;
+}
+
+/*
+ * return value is only valid if hasConstraint() returns true
+ */
+Qt::Orientation QGridLayoutEngine::constraintOrientation() const
+{
+    (void)ensureDynamicConstraint();
+    return (Qt::Orientation)q_cachedConstraintOrientation;
+}
+
 void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo,
                                          const QSizeF &size) const
 {
@@ -1544,10 +1710,74 @@ void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo,
     q_widths.resize(columnCount());
     q_heights.resize(rowCount());
     q_descents.resize(rowCount());
-    q_columnData.calculateGeometries(0, columnCount(), size.width(), q_xx.data(), q_widths.data(),
-                                     0, q_totalBoxes[Hor]);
-    q_rowData.calculateGeometries(0, rowCount(), size.height(), q_yy.data(), q_heights.data(),
-                                  q_descents.data(), q_totalBoxes[Ver]);
+
+
+    Qt::Orientation orientation = Qt::Vertical;
+    if (hasDynamicConstraint())
+        orientation = constraintOrientation();
+
+    /*
+      In order to do hfw we need to first distribute the columns, then the rows.
+      In order to do wfh we need to first distribute the rows, then the columns.
+
+      If there is no constraint, the order of distributing the rows or columns first is irrelevant.
+      We choose horizontal just to keep the same behaviour as before (however, there shouldn't
+      be any behaviour difference).
+ */
+
+    QGridLayoutRowData *colData;
+    QGridLayoutRowData rowData;
+    qreal *widths;
+    qreal *heights;
+    qreal *xx;
+    qreal *yy;
+    qreal *xdescents = 0;
+    qreal *ydescents = 0;
+    qreal cCount;
+    qreal rCount;
+    QSizeF oSize = size;
+    if (orientation == Qt::Vertical) {
+        // height for width
+        colData = &q_columnData;
+        rowData = q_rowData;
+        widths = q_widths.data();
+        heights = q_heights.data();
+        xx = q_xx.data();
+        yy = q_yy.data();
+        cCount = columnCount();
+        rCount = rowCount();
+        ydescents = q_descents.data();
+    } else {
+        // width for height
+        colData = &q_rowData;
+        rowData = q_columnData;
+        widths = q_heights.data();
+        heights = q_widths.data();
+        xx = q_yy.data();
+        yy = q_xx.data();
+        cCount = rowCount();
+        rCount = columnCount();
+        xdescents = q_descents.data();
+        oSize.transpose();
+    }
+
+    colData->calculateGeometries(0, cCount, oSize.width(), xx, widths,
+                                 xdescents, q_totalBoxes[orientation == Qt::Horizontal]);
+    for (int i = q_items.count() - 1; i >= 0; --i) {
+        QGridLayoutItem *item = q_items.at(i);
+        const int col = item->firstColumn(orientation);
+        const int row = item->firstRow(orientation);
+        if (item->hasDynamicConstraint()) {
+            const qreal sz = widths[col];
+            QGridLayoutBox box = item->box(orientation, sz);
+            rowData.boxes[row].combine(box);
+        }
+    }
+
+    QGridLayoutBox &totalBox = q_totalBoxes[orientation == Qt::Vertical];
+    totalBox = rowData.totalBox(0, rCount);
+    rowData.calculateGeometries(0, rCount, oSize.height(), yy, heights,
+                                 ydescents, totalBox);
 
     q_cachedSize = size;
 }
diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h
index 9ac9a8e..580af7e 100644
--- a/src/gui/graphicsview/qgridlayoutengine_p.h
+++ b/src/gui/graphicsview/qgridlayoutengine_p.h
@@ -91,6 +91,14 @@ enum LayoutSide {
     Bottom
 };
 
+enum {
+    NoConstraint,
+    HorizontalConstraint,
+    VerticalConstraint,
+    UnknownConstraint,      // need to update cache
+    UnfeasibleConstraint    // not feasible, it be has some items with Vertical and others with Horizontal constraints
+};
+
 template <typename T>
 class QLayoutParameter
 {
@@ -270,6 +278,10 @@ public:
     inline void setAlignment(Qt::Alignment alignment) { q_alignment = alignment; }
 
     QSizePolicy::Policy sizePolicy(Qt::Orientation orientation) const;
+
+    bool hasDynamicConstraint() const;
+    Qt::Orientation dynamicConstraintOrientation() const;
+
     QSizePolicy::ControlTypes controlTypes(LayoutSide side) const;
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     QGridLayoutBox box(Qt::Orientation orientation, qreal constraint = -1.0) const;
@@ -280,7 +292,7 @@ public:
     void setGeometry(const QRectF &rect);
     void transpose();
     void insertOrRemoveRows(int row, int delta, Qt::Orientation orientation = Qt::Vertical);
-    QSizeF effectiveMaxSize() const;
+    QSizeF effectiveMaxSize(const QSizeF &constraint) const;
 
 #ifdef QT_DEBUG
     void dump(int indent = 0) const;
@@ -372,6 +384,14 @@ public:
                     int column, int rowSpan, int columnSpan) const;
     QSizeF sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which,
                     const QSizeF &constraint) const;
+
+    // heightForWidth / widthForHeight support
+    QSizeF dynamicallyConstrainedSizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
+    bool ensureDynamicConstraint() const;
+    bool hasDynamicConstraint() const;
+    Qt::Orientation constraintOrientation() const;
+
+
     QSizePolicy::ControlTypes controlTypes(LayoutSide side) const;
     void transpose();
     void setVisualDirection(Qt::LayoutDirection direction);
@@ -405,6 +425,7 @@ private:
     // Lazily computed from the above user input
     mutable int q_cachedEffectiveFirstRows[NOrientations];
     mutable int q_cachedEffectiveLastRows[NOrientations];
+    mutable quint8 q_cachedConstraintOrientation : 2;
 
     // Layout item input
     mutable QLayoutStyleInfo q_cachedDataForStyleInfo;
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 394d374..c4d60a5 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -364,10 +364,10 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
 
     commitTemporaryPreeditString();
 
-    bool numbersOnly = hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
-            || hints & ImhDialableCharactersOnly;
-    bool noOnlys = !(numbersOnly || hints & ImhUppercaseOnly
-            || hints & ImhLowercaseOnly);
+    const bool anynumbermodes = hints & (ImhDigitsOnly | ImhFormattedNumbersOnly | ImhDialableCharactersOnly);
+    const bool anytextmodes = hints & (ImhUppercaseOnly | ImhLowercaseOnly | ImhEmailCharactersOnly | ImhUrlCharactersOnly);
+    const bool numbersOnly = anynumbermodes && !anytextmodes;
+    const bool noOnlys = !(hints & ImhExclusiveInputMask);
     TInt flags;
     Qt::InputMethodHints oldHints = hints;
 
@@ -379,8 +379,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
     }
     if (!noOnlys) {
         // Make sure that the preference is within the permitted set.
-        if (hints & ImhPreferNumbers && !(hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
-                || hints & ImhDialableCharactersOnly)) {
+        if (hints & ImhPreferNumbers && !anynumbermodes) {
             hints &= ~ImhPreferNumbers;
         } else if (hints & ImhPreferUppercase && !(hints & ImhUppercaseOnly)) {
             hints &= ~ImhPreferUppercase;
@@ -393,8 +392,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
                 hints |= ImhPreferLowercase;
             } else if (hints & ImhUppercaseOnly) {
                 hints |= ImhPreferUppercase;
-            } else if (hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
-                    || hints & ImhDialableCharactersOnly) {
+            } else if (numbersOnly) {
                 hints |= ImhPreferNumbers;
             }
         }
@@ -408,13 +406,21 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
         m_fepState->SetCurrentInputMode(EAknEditorTextInputMode);
     }
     flags = 0;
-    if (numbersOnly) {
+    if (noOnlys || (anynumbermodes && anytextmodes)) {
+        flags = EAknEditorAllInputModes;
+    }
+    else if (anynumbermodes) {
         flags |= EAknEditorNumericInputMode;
+        if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0
+            && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) {
+            //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled.
+            flags |= EAknEditorTextInputMode;
+        }
     }
-    if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) {
+    else if (anytextmodes) {
         flags |= EAknEditorTextInputMode;
     }
-    if (flags == 0) {
+    else {
         flags = EAknEditorAllInputModes;
     }
     m_fepState->SetPermittedInputModes(flags);
@@ -461,24 +467,33 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
     if (hints & ImhNoPredictiveText || hints & ImhHiddenText) {
         flags |= EAknEditorFlagNoT9;
     }
+    // if alphanumeric input, or if multiple incompatible number modes are selected;
+    // then make all symbols available in numeric mode too.
+    if (!numbersOnly || ((hints & ImhFormattedNumbersOnly) && (hints & ImhDialableCharactersOnly)))
+        flags |= EAknEditorFlagUseSCTNumericCharmap;
     m_fepState->SetFlags(flags);
     ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateFlagsUpdate);
 
-    if (hints & ImhFormattedNumbersOnly) {
+    if (hints & ImhDialableCharactersOnly) {
+        // This is first, because if (ImhDialableCharactersOnly | ImhFormattedNumbersOnly)
+        // is specified, this one is more natural (# key enters a #)
+        flags = EAknEditorStandardNumberModeKeymap;
+    } else if (hints & ImhFormattedNumbersOnly) {
+        // # key enters decimal point
         flags = EAknEditorCalculatorNumberModeKeymap;
     } else if (hints & ImhDigitsOnly) {
+        // This is last, because it is most restrictive (# key is inactive)
         flags = EAknEditorPlainNumberModeKeymap;
     } else {
-        // ImhDialableCharactersOnly is the fallback as well, so we don't need to check for
-        // that flag.
         flags = EAknEditorStandardNumberModeKeymap;
     }
     m_fepState->SetNumericKeymap(static_cast<TAknEditorNumericKeymap>(flags));
 
-    if (hints & ImhEmailCharactersOnly) {
-        m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG);
-    } else if (hints & ImhUrlCharactersOnly) {
+    if (hints & ImhUrlCharactersOnly) {
+        // URL characters is everything except space, so a superset of the other restrictions
         m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG);
+    } else if (hints & ImhEmailCharactersOnly) {
+        m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG);
     } else {
         m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG);
     }
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index ec26e81..0c48bfd 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -716,8 +716,10 @@ static void qt_set_windows_updateScrollBar(QWidget *widget)
         if (QWidget *w = static_cast<QWidget *>(o))
             qt_set_windows_updateScrollBar(w);
     }
+#ifndef QT_NO_SCROLLBAR
     if (qobject_cast<QScrollBar*>(widget))
         widget->updateGeometry();
+#endif
 }
 
 
@@ -1499,6 +1501,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
 
     switch (message) {
 #ifndef Q_WS_WINCE
+#ifndef QT_NO_SESSIONMANAGER
     case WM_QUERYENDSESSION: {
         if (sm_smActive) // bogus message from windows
             RETURN(true);
@@ -1531,6 +1534,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
 
         RETURN(0);
     }
+#endif
     case WM_DISPLAYCHANGE:
         if (QApplication::type() == QApplication::Tty)
             break;
@@ -2236,6 +2240,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
             }
             break;
 
+#ifndef QT_NO_CONTEXTMENU
             case WM_CONTEXTMENU:
             {
                 // it's not VK_APPS or Shift+F10, but a click in the NC area
@@ -2264,6 +2269,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
             }
             break;
 #endif
+#endif
 
         case WM_IME_STARTCOMPOSITION:
         case WM_IME_ENDCOMPOSITION:
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 8d65aa1..8d38f45 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -255,5 +255,10 @@ QT_USE_NAMESPACE
         qApp->quit();
     }
 }
+
+ - (void)orderFrontCharacterPalette:(id)sender
+ {
+     [NSApp orderFrontCharacterPalette:sender];
+ }
 @end
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/kernel/qcocoamenuloader_mac_p.h
index a75ad0a..edacfa5 100644
--- a/src/gui/kernel/qcocoamenuloader_mac_p.h
+++ b/src/gui/kernel/qcocoamenuloader_mac_p.h
@@ -88,6 +88,7 @@
 - (IBAction)hide:(id)sender;
 - (IBAction)qtDispatcherToQAction:(id)sender;
 - (void)qtUpdateMenubar;
+- (void)orderFrontCharacterPalette:(id)sender;
 @end
 
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 1a87127..d04c70d 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -314,18 +314,61 @@ struct QSpanData
     void adjustSpanMethods();
 };
 
+#if defined(Q_CC_RVCT)
+#  pragma push
+#  pragma arm
+#endif
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
+    uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
+    t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
+    t &= 0xff00ff;
 
-Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) {
-    a += 1;
-    uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0;
-    t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f;
-    return t;
+    x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b;
+    x = (x + ((x >> 8) & 0xff00ff) + 0x800080);
+    x &= 0xff00ff00;
+    x |= t;
+    return x;
 }
+#if defined(Q_CC_RVCT)
+#  pragma pop
+#endif
 
-Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) {
-    uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0;
-    t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f;
-    return t;
+#if QT_POINTER_SIZE == 8 // 64-bit versions
+
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
+    quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
+    t += (((quint64(y)) | ((quint64(y)) << 24)) & 0x00ff00ff00ff00ff) * b;
+    t >>= 8;
+    t &= 0x00ff00ff00ff00ff;
+    return (uint(t)) | (uint(t >> 24));
+}
+
+Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) {
+    quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
+    t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8;
+    t &= 0x00ff00ff00ff00ff;
+    return (uint(t)) | (uint(t >> 24));
+}
+
+Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) {
+    uint a = x >> 24;
+    quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
+    t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8;
+    t &= 0x000000ff00ff00ff;
+    return (uint(t)) | (uint(t >> 24)) | (a << 24);
+}
+
+#else // 32-bit versions
+
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
+    uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
+    t >>= 8;
+    t &= 0xff00ff;
+
+    x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b;
+    x &= 0xff00ff00;
+    x |= t;
+    return x;
 }
 
 #if defined(Q_CC_RVCT)
@@ -359,6 +402,21 @@ Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) {
     x |= t | (a << 24);
     return x;
 }
+#endif
+
+
+Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) {
+    a += 1;
+    uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0;
+    t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f;
+    return t;
+}
+
+Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) {
+    uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0;
+    t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f;
+    return t;
+}
 
 #define INV_PREMUL(p)                                   \
     (qAlpha(p) == 0 ? 0 :                               \
@@ -1847,70 +1905,6 @@ inline int qBlue565(quint16 rgb) {
     return (b << 3) | (b >> 2);
 }
 
-#if 1
-Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
-    uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
-    t >>= 8;
-    t &= 0xff00ff;
-
-    x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b;
-    x &= 0xff00ff00;
-    x |= t;
-    return x;
-}
-
-#if defined(Q_CC_RVCT)
-#  pragma push
-#  pragma arm
-#endif
-Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
-    uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
-    t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
-    t &= 0xff00ff;
-
-    x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b;
-    x = (x + ((x >> 8) & 0xff00ff) + 0x800080);
-    x &= 0xff00ff00;
-    x |= t;
-    return x;
-}
-#if defined(Q_CC_RVCT)
-#  pragma pop
-#endif
-#else
-// possible implementation for 64 bit
-Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
-    ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
-    t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b;
-    t >>= 8;
-    t &= 0x00ff00ff00ff00ff;
-    return (uint(t)) | (uint(t >> 24));
-}
-
-Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
-    ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
-    t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b;
-    t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080);
-    t &= 0x00ff00ff00ff00ff;
-    return (uint(t)) | (uint(t >> 24));
-}
-
-Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) {
-    ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
-    t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080);
-    t &= 0x00ff00ff00ff00ff;
-    return (uint(t)) | (uint(t >> 24));
-}
-
-Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) {
-    uint a = x >> 24;
-    ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
-    t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080);
-    t &= 0x00ff00ff00ff00ff;
-    return (uint(t)) | (uint(t >> 24)) | 0xff000000;
-}
-#endif
-
 const uint qt_bayer_matrix[16][16] = {
     { 0x1, 0xc0, 0x30, 0xf0, 0xc, 0xcc, 0x3c, 0xfc,
       0x3, 0xc3, 0x33, 0xf3, 0xf, 0xcf, 0x3f, 0xff},
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index e1e0ad0..2828e9d 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -366,7 +366,7 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name)
 #ifdef QT_DEBUG
     qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( " << name << " )";
 #endif
-    delete m_graphicsSystem;
+    QGraphicsSystem *oldSystem = m_graphicsSystem;
     m_graphicsSystem = QGraphicsSystemFactory::create(name);
     m_graphicsSystemName = name;
 
@@ -393,6 +393,8 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name)
         proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget));
         qt_widget_private(widget)->invalidateBuffer(widget->rect());
     }
+
+    delete oldSystem;
 }
 
 void QRuntimeGraphicsSystem::removePixmapData(QRuntimePixmapData *pixmapData) const
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 9dadbd5..b694d9c 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -90,6 +90,15 @@ void qt_format_text(const QFont &font,
                     const QRectF &_r, int tf, const QTextOption *option, const QString& str, QRectF *brect,
                     int tabstops, int* tabarray, int tabarraylen,
                     QPainter *painter);
+static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe,
+                                   QTextCharFormat::UnderlineStyle underlineStyle,
+                                   const QTextItem::RenderFlags flags, qreal width,
+                                   const QTextCharFormat &charFormat);
+// Helper function to calculate left most position, width and flags for decoration drawing
+static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray,
+                                    const QFixedPoint *positions, int glyphCount,
+                                    QFontEngine *fontEngine, const QFont &font,
+                                    const QTextCharFormat &charFormat);
 
 static inline QGradient::CoordinateMode coordinateMode(const QBrush &brush)
 {
@@ -5923,6 +5932,10 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText
             currentColor = item->color;
         }
         d->extended->drawStaticTextItem(item);
+
+        drawDecorationForGlyphs(this, item->glyphs, item->glyphPositions,
+                                item->numGlyphs, item->fontEngine, staticText_d->font,
+                                QTextCharFormat());
     }
     if (currentColor != oldPen.color())
         setPen(oldPen);
@@ -6290,15 +6303,15 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen)
     return pixmap;
 }
 
-static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QTextItemInt &ti)
+static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe,
+                                   QTextCharFormat::UnderlineStyle underlineStyle,
+                                   const QTextItem::RenderFlags flags, qreal width,
+                                   const QTextCharFormat &charFormat)
 {
-    QTextCharFormat::UnderlineStyle underlineStyle = ti.underlineStyle;
     if (underlineStyle == QTextCharFormat::NoUnderline
-        && !(ti.flags & (QTextItem::StrikeOut | QTextItem::Overline)))
+        && !(flags & (QTextItem::StrikeOut | QTextItem::Overline)))
         return;
 
-    QFontEngine *fe = ti.fontEngine;
-
     const QPen oldPen = painter->pen();
     const QBrush oldBrush = painter->brush();
     painter->setBrush(Qt::NoBrush);
@@ -6307,7 +6320,7 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
     pen.setWidthF(fe->lineThickness().toReal());
     pen.setCapStyle(Qt::FlatCap);
 
-    QLineF line(pos.x(), pos.y(), pos.x() + ti.width.toReal(), pos.y());
+    QLineF line(pos.x(), pos.y(), pos.x() + width, pos.y());
 
     const qreal underlineOffset = fe->underlinePosition().toReal();
     // deliberately ceil the offset to avoid the underline coming too close to
@@ -6322,21 +6335,21 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
         painter->save();
         painter->translate(0, pos.y() + 1);
 
-        QColor uc = ti.charFormat.underlineColor();
+        QColor uc = charFormat.underlineColor();
         if (uc.isValid())
             pen.setColor(uc);
 
         // Adapt wave to underlineOffset or pen width, whatever is larger, to make it work on all platforms
         const QPixmap wave = generateWavyPixmap(qMax(underlineOffset, pen.widthF()), pen);
-        const int descent = (int) ti.descent.toReal();
+        const int descent = (int) fe->descent().toReal();
 
         painter->setBrushOrigin(painter->brushOrigin().x(), 0);
-        painter->fillRect(pos.x(), 0, qCeil(ti.width.toReal()), qMin(wave.height(), descent), wave);
+        painter->fillRect(pos.x(), 0, qCeil(width), qMin(wave.height(), descent), wave);
         painter->restore();
     } else if (underlineStyle != QTextCharFormat::NoUnderline) {
         QLineF underLine(line.x1(), underlinePos, line.x2(), underlinePos);
 
-        QColor uc = ti.charFormat.underlineColor();
+        QColor uc = charFormat.underlineColor();
         if (uc.isValid())
             pen.setColor(uc);
 
@@ -6348,14 +6361,14 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
     pen.setStyle(Qt::SolidLine);
     pen.setColor(oldPen.color());
 
-    if (ti.flags & QTextItem::StrikeOut) {
+    if (flags & QTextItem::StrikeOut) {
         QLineF strikeOutLine = line;
         strikeOutLine.translate(0., - fe->ascent().toReal() / 3.);
         painter->setPen(pen);
         painter->drawLine(strikeOutLine);
     }
 
-    if (ti.flags & QTextItem::Overline) {
+    if (flags & QTextItem::Overline) {
         QLineF overLine = line;
         overLine.translate(0., - fe->ascent().toReal());
         painter->setPen(pen);
@@ -6366,6 +6379,50 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
     painter->setBrush(oldBrush);
 }
 
+static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray,
+                                    const QFixedPoint *positions, int glyphCount,
+                                    QFontEngine *fontEngine, const QFont &font,
+                                    const QTextCharFormat &charFormat)
+{
+    if (!(font.underline() || font.strikeOut() || font.overline()))
+        return;
+
+    QFixed leftMost;
+    QFixed rightMost;
+    QFixed baseLine;
+    for (int i=0; i<glyphCount; ++i) {
+        glyph_metrics_t gm = fontEngine->boundingBox(glyphArray[i]);
+        if (i == 0 || leftMost > positions[i].x)
+            leftMost = positions[i].x;
+
+        // We don't support glyphs that do not share a common baseline. If this turns out to
+        // be a relevant use case, then we need to find clusters of glyphs that share a baseline
+        // and do a drawTextItemDecorations call per cluster.
+        if (i == 0 || baseLine < positions[i].y)
+            baseLine = positions[i].y;
+
+        // We use the advance rather than the actual bounds to match the algorithm in drawText()
+        if (i == 0 || rightMost < positions[i].x + gm.xoff)
+            rightMost = positions[i].x + gm.xoff;
+    }
+
+    QFixed width = rightMost - leftMost;
+    QTextItem::RenderFlags flags = 0;
+
+    if (font.underline())
+        flags |= QTextItem::Underline;
+    if (font.overline())
+        flags |= QTextItem::Overline;
+    if (font.strikeOut())
+        flags |= QTextItem::StrikeOut;
+
+    drawTextItemDecoration(painter, QPointF(leftMost.toReal(), baseLine.toReal()),
+                           fontEngine,
+                           font.underline() ? QTextCharFormat::SingleUnderline
+                                            : QTextCharFormat::NoUnderline, flags,
+                           width.toReal(), charFormat);
+}
+
 void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti)
 {
 #ifdef QT_DEBUG_DRAW
@@ -6496,7 +6553,8 @@ void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti)
         else
             d->engine->drawTextItem(p, ti);
     }
-    drawTextItemDecoration(this, p, ti);
+    drawTextItemDecoration(this, p, ti.fontEngine, ti.underlineStyle, ti.flags, ti.width.toReal(),
+                           ti.charFormat);
 
     if (d->state->renderHints != oldRenderHints) {
         d->state->renderHints = oldRenderHints;
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index da43913..7d5fa43 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1952,7 +1952,9 @@ void QTextLine::layout_helper(int maxGlyphs)
             // expand the text beyond the edge.
             if (sb_or_ws|breakany) {
                 QFixed rightBearing = lbh.rightBearing; // store previous right bearing
+#if !defined(Q_WS_MAC)
                 if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width)
+#endif
                     lbh.adjustRightBearing();
                 if (lbh.checkFullOtherwiseExtend(line)) {
                     // we are too wide, fix right bearing
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm
index ce85919..15fae23 100644
--- a/src/gui/widgets/qcocoamenu_mac.mm
+++ b/src/gui/widgets/qcocoamenu_mac.mm
@@ -188,6 +188,18 @@ QT_USE_NAMESPACE
     return NO;
 }
 
+- (NSInteger)indexOfItemWithTarget:(id)anObject andAction:(SEL)actionSelector
+{
+     NSInteger index = [super indexOfItemWithTarget:anObject andAction:actionSelector];
+     static SEL selForOFCP = NSSelectorFromString(@"orderFrontCharacterPalette:");
+     if (index == -1 && selForOFCP == actionSelector) {
+         // Check if the 'orderFrontCharacterPalette' SEL exists for QCocoaMenuLoader object
+         QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = [NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)];
+         return [super indexOfItemWithTarget:loader andAction:actionSelector];
+     }
+     return index;
+}
+
 @end
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h
index d6ac8c5..1a42642 100644
--- a/src/gui/widgets/qcocoamenu_mac_p.h
+++ b/src/gui/widgets/qcocoamenu_mac_p.h
@@ -76,6 +76,7 @@ QT_FORWARD_DECLARE_CLASS(QAction)
 }
 - (id)initWithQMenu:(QMenu*)menu;
 - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action;
+- (NSInteger)indexOfItemWithTarget:(id)anObject andAction:(SEL)actionSelector;
 @end
 #endif
 
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index f663dd2..633b309 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -431,21 +431,24 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
 
     while (*n != NULL) {
         name = snd_device_name_get_hint(*n, "NAME");
-        descr = snd_device_name_get_hint(*n, "DESC");
-        io = snd_device_name_get_hint(*n, "IOID");
-        if((name != NULL) && (descr != NULL) && ((io == NULL) || (io == filter))) {
-            QString deviceName = QLatin1String(name);
-            QString deviceDescription = QLatin1String(descr);
-            allDevices.append(deviceName.toLocal8Bit().constData());
-            if(deviceDescription.contains(QLatin1String("Default Audio Device")))
-                devices.append(deviceName.toLocal8Bit().constData());
-        }
-        if(name != NULL)
+        if (name != 0 && qstrcmp(name, "null") != 0) {
+            descr = snd_device_name_get_hint(*n, "DESC");
+            io = snd_device_name_get_hint(*n, "IOID");
+
+            if ((descr != NULL) && ((io == NULL) || (io == filter))) {
+                QString deviceName = QLatin1String(name);
+                QString deviceDescription = QLatin1String(descr);
+                allDevices.append(deviceName.toLocal8Bit().constData());
+                if (deviceDescription.contains(QLatin1String("Default Audio Device")))
+                    devices.append(deviceName.toLocal8Bit().constData());
+            }
+
             free(name);
-        if(descr != NULL)
-            free(descr);
-        if(io != NULL)
-            free(io);
+            if (descr != NULL)
+                free(descr);
+            if (io != NULL)
+                free(io);
+        }
         ++n;
     }
     snd_device_name_free_hint(hints);
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 9e2b85e..ae4d257 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -653,6 +653,8 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
         // is the reply associated the currently processing of this channel?
         if (channels[i].reply == reply) {
             channels[i].reply = 0;
+            channels[i].request = QHttpNetworkRequest();
+            channels[i].resendCurrent = false;
 
             if (!reply->isFinished() && !channels[i].alreadyPipelinedRequests.isEmpty()) {
                 // the reply had to be prematurely removed, e.g. it was not finished
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index d3576dd..6437f6f 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -647,8 +647,10 @@ void QHttpNetworkConnectionChannel::allDone()
     // finished request.
     // Note that this may trigger a segfault at some other point. But then we can fix the underlying
     // problem.
-    if (!resendCurrent)
+    if (!resendCurrent) {
+        request = QHttpNetworkRequest();
         reply = 0;
+    }
 
     // move next from pipeline to current request
     if (!alreadyPipelinedRequests.isEmpty()) {
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 60851ac..3190a30 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -406,13 +406,6 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
     This function is deprecated.  It is equivalent to calling bearerTypeName(), however
     bearerType() should be used in preference.
 */
-QString QNetworkConfiguration::bearerName() const
-{
-    // This function cannot be inline as it would break Qt Mobility.
-    // Qt Mobility uses the Qt header as well and since the Mobility Bearer library
-    // does not provide bearerTypeName() we cannot use an inline function.
-    return bearerTypeName();
-}
 
 /*!
     Returns the type of bearer used by this network configuration.
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 18b92a9..593dbbe 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -103,6 +103,7 @@ public:
 
     Q_DECLARE_FLAGS(StateFlags, StateFlag)
 
+#ifndef QT_MOBILITY_BEARER
     enum BearerType {
         BearerUnknown,
         BearerEthernet,
@@ -114,17 +115,22 @@ public:
         BearerBluetooth,
         BearerWiMAX
     };
+#endif
 
     StateFlags state() const;
     Type type() const;
     Purpose purpose() const;
 
-    // Required to maintain source compatibility with Qt Mobility.
+#ifndef QT_MOBILITY_BEARER
 #ifdef QT_DEPRECATED
-    QT_DEPRECATED QString bearerName() const;
+    // Required to maintain source compatibility with Qt Mobility.
+    QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
 #endif
     BearerType bearerType() const;
     QString bearerTypeName() const;
+#else
+    QString bearerName() const;
+#endif
 
     QString identifier() const;
     bool isRoamingAvailable() const;
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index e7fffac..0b40147 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -89,11 +89,7 @@ public:
         OperationNotSupportedError,
         InvalidConfigurationError
     };
-#ifndef QT_MOBILITY_BEARER
-    QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
-#else
 	explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
-#endif
     virtual ~QNetworkSession();
 
     bool isOpen() const;
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 09ecd4d..d1225c1 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -761,74 +761,95 @@ bool q_resolveOpenSslSymbols()
 //==============================================================================
 QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
 {
-    char lBuffer[24];
-    char *pBuffer = lBuffer;
-
     size_t lTimeLength = aTime->length;
     char *pString = (char *) aTime->data;
 
     if (aTime->type == V_ASN1_UTCTIME) {
+
+        char lBuffer[24];
+        char *pBuffer = lBuffer;
+
         if ((lTimeLength < 11) || (lTimeLength > 17))
             return QDateTime();
 
         memcpy(pBuffer, pString, 10);
         pBuffer += 10;
         pString += 10;
-    } else {
-        if (lTimeLength < 13)
-            return QDateTime();
-
-        memcpy(pBuffer, pString, 12);
-        pBuffer += 12;
-        pString += 12;
-    }
 
-    if ((*pString == 'Z') || (*pString == '-') || (*pString == '+')) {
-        *pBuffer++ = '0';
-        *pBuffer++ = '0';
-    } else {
-        *pBuffer++ = *pString++;
-        *pBuffer++ = *pString++;
-        // Skip any fractional seconds...
-        if (*pString == '.') {
-            pString++;
-            while ((*pString >= '0') && (*pString <= '9'))
+        if ((*pString == 'Z') || (*pString == '-') || (*pString == '+')) {
+            *pBuffer++ = '0';
+            *pBuffer++ = '0';
+        } else {
+            *pBuffer++ = *pString++;
+            *pBuffer++ = *pString++;
+            // Skip any fractional seconds...
+            if (*pString == '.') {
                 pString++;
+                while ((*pString >= '0') && (*pString <= '9'))
+                    pString++;
+            }
         }
-    }
 
-    *pBuffer++ = 'Z';
-    *pBuffer++ = '\0';
+        *pBuffer++ = 'Z';
+        *pBuffer++ = '\0';
 
-    time_t lSecondsFromUCT;
-    if (*pString == 'Z') {
-        lSecondsFromUCT = 0;
-    } else {
-        if ((*pString != '+') && (*pString != '-'))
-            return QDateTime();
+        time_t lSecondsFromUCT;
+        if (*pString == 'Z') {
+            lSecondsFromUCT = 0;
+        } else {
+            if ((*pString != '+') && (*pString != '-'))
+                return QDateTime();
+
+            lSecondsFromUCT = ((pString[1] - '0') * 10 + (pString[2] - '0')) * 60;
+            lSecondsFromUCT += (pString[3] - '0') * 10 + (pString[4] - '0');
+            lSecondsFromUCT *= 60;
+            if (*pString == '-')
+                lSecondsFromUCT = -lSecondsFromUCT;
+        }
+
+        tm lTime;
+        lTime.tm_sec = ((lBuffer[10] - '0') * 10) + (lBuffer[11] - '0');
+        lTime.tm_min = ((lBuffer[8] - '0') * 10) + (lBuffer[9] - '0');
+        lTime.tm_hour = ((lBuffer[6] - '0') * 10) + (lBuffer[7] - '0');
+        lTime.tm_mday = ((lBuffer[4] - '0') * 10) + (lBuffer[5] - '0');
+        lTime.tm_mon = (((lBuffer[2] - '0') * 10) + (lBuffer[3] - '0')) - 1;
+        lTime.tm_year = ((lBuffer[0] - '0') * 10) + (lBuffer[1] - '0');
+        if (lTime.tm_year < 50)
+            lTime.tm_year += 100; // RFC 2459
+
+        QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday);
+        QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
+
+        QDateTime result(resDate, resTime, Qt::UTC);
+        result = result.addSecs(lSecondsFromUCT);
+        return result;
+
+    } else if (aTime->type == V_ASN1_GENERALIZEDTIME) {
 
-        lSecondsFromUCT = ((pString[1] - '0') * 10 + (pString[2] - '0')) * 60;
-        lSecondsFromUCT += (pString[3] - '0') * 10 + (pString[4] - '0');
-        lSecondsFromUCT *= 60;
-        if (*pString == '-')
-            lSecondsFromUCT = -lSecondsFromUCT;
+        if (lTimeLength < 15)
+            return QDateTime(); // hopefully never triggered
+
+        // generalized time is always YYYYMMDDHHMMSSZ (RFC 2459, section 4.1.2.5.2)
+        tm lTime;
+        lTime.tm_sec = ((pString[12] - '0') * 10) + (pString[13] - '0');
+        lTime.tm_min = ((pString[10] - '0') * 10) + (pString[11] - '0');
+        lTime.tm_hour = ((pString[8] - '0') * 10) + (pString[9] - '0');
+        lTime.tm_mday = ((pString[6] - '0') * 10) + (pString[7] - '0');
+        lTime.tm_mon = (((pString[4] - '0') * 10) + (pString[5] - '0'));
+        lTime.tm_year = ((pString[0] - '0') * 1000) + ((pString[1] - '0') * 100) +
+                        ((pString[2] - '0') * 10) + (pString[3] - '0');
+
+        QDate resDate(lTime.tm_year, lTime.tm_mon, lTime.tm_mday);
+        QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
+
+        QDateTime result(resDate, resTime, Qt::UTC);
+        return result;
+
+    } else {
+        qWarning("unsupported date format detected");
+        return QDateTime();
     }
 
-    tm lTime;
-    lTime.tm_sec = ((lBuffer[10] - '0') * 10) + (lBuffer[11] - '0');
-    lTime.tm_min = ((lBuffer[8] - '0') * 10) + (lBuffer[9] - '0');
-    lTime.tm_hour = ((lBuffer[6] - '0') * 10) + (lBuffer[7] - '0');
-    lTime.tm_mday = ((lBuffer[4] - '0') * 10) + (lBuffer[5] - '0');
-    lTime.tm_mon = (((lBuffer[2] - '0') * 10) + (lBuffer[3] - '0')) - 1;
-    lTime.tm_year = ((lBuffer[0] - '0') * 10) + (lBuffer[1] - '0');
-    if (lTime.tm_year < 50)
-        lTime.tm_year += 100; // RFC 2459
-
-    QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday);
-    QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
-    QDateTime result(resDate, resTime, Qt::UTC);
-    result = result.addSecs(lSecondsFromUCT);
-    return result;
 }
 
 QT_END_NAMESPACE
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index 3763926..a154325 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -240,6 +240,7 @@ void QGLContextPrivate::destroyEglSurfaceForDevice()
             if (QGLWidget *wgl = qobject_cast<QGLWidget *>(w)) {
                 if (wgl->d_func()->eglSurfaceWindowId != wgl->winId()) {
                     qWarning("WARNING: Potential EGL surface leak! Not destroying surface.");
+                    eglSurface = EGL_NO_SURFACE;
                     return;
                 }
             }
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm
index 4d7532e..66fe7d3 100644
--- a/src/opengl/qgl_mac.mm
+++ b/src/opengl/qgl_mac.mm
@@ -804,17 +804,22 @@ void QGLContext::generateFontDisplayLists(const QFont & /* fnt */, int /* listBa
 static CFBundleRef qt_getOpenGLBundle()
 {
     CFBundleRef bundle = 0;
+    CFStringRef urlString = QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework"));
     QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,
-                 QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")), kCFURLPOSIXPathStyle, false);
+                 urlString, kCFURLPOSIXPathStyle, false);
     if (url)
         bundle = CFBundleCreate(kCFAllocatorDefault, url);
+    CFRelease(urlString);
     return bundle;
 }
 
 void *QGLContext::getProcAddress(const QString &proc) const
 {
-    return CFBundleGetFunctionPointerForName(QCFType<CFBundleRef>(qt_getOpenGLBundle()),
-                                             QCFString(proc));
+    CFStringRef procName = QCFString(proc).toCFStringRef(proc);
+    void *result = CFBundleGetFunctionPointerForName(QCFType<CFBundleRef>(qt_getOpenGLBundle()),
+                                             procName);
+    CFRelease(procName);
+    return result;
 }
 #ifndef QT_MAC_USE_COCOA
 /*****************************************************************************
diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp
index 8e2bbd4..6aec8ae 100644
--- a/src/opengl/qglextensions.cpp
+++ b/src/opengl/qglextensions.cpp
@@ -255,6 +255,10 @@ bool qt_resolve_glsl_extensions(QGLContext *ctx)
     glFramebufferTextureLayerEXT = (_glFramebufferTextureLayerEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureLayerEXT"));
     glFramebufferTextureFaceEXT = (_glFramebufferTextureFaceEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureFaceEXT"));
 
+    // Must at least have the FragmentShader extension to continue.
+    if (!(QGLExtensions::glExtensions() & QGLExtensions::FragmentShader))
+        return false;
+
     glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShader"));
     if (glCreateShader) {
         glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource"));
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index c7689b8..74382b0 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -2121,7 +2121,7 @@ void QGLShaderProgram::setUniformValue(int location, const QSize& size)
     Q_D(QGLShaderProgram);
     Q_UNUSED(d);
     if (location != -1) {
-        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.width())};
+        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
         glUniform2fv(location, 1, values);
     }
 }
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 6b82ed3..b86fb78 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -199,6 +199,7 @@ public:
         return widget;
     }
 
+    // destroys the share widget and prevents recreation
     void cleanup() {
         QGLWidget *w = widget;
         cleanedUp = true;
@@ -206,6 +207,20 @@ public:
         delete w;
     }
 
+    // destroys the share widget, but allows it to be recreated later on
+    void destroy() {
+        if (cleanedUp)
+            return;
+
+        QGLWidget *w = widget;
+
+        // prevent potential recursions
+        cleanedUp = true;
+        widget = 0;
+        delete w;
+        cleanedUp = false;
+    }
+
     static bool cleanedUp;
 
 private:
@@ -233,6 +248,10 @@ QGLWidget* qt_gl_share_widget()
     return _qt_gl_share_widget()->shareWidget();
 }
 
+void qt_destroy_gl_share_widget()
+{
+    _qt_gl_share_widget()->destroy();
+}
 
 struct QGLWindowSurfacePrivate
 {
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h
index 5e670fe..ffc2e86 100644
--- a/src/opengl/qwindowsurface_gl_p.h
+++ b/src/opengl/qwindowsurface_gl_p.h
@@ -67,6 +67,7 @@ class QWidget;
 struct QGLWindowSurfacePrivate;
 
 Q_OPENGL_EXPORT QGLWidget* qt_gl_share_widget();
+Q_OPENGL_EXPORT void qt_destroy_gl_share_widget();
 
 class QGLWindowSurfaceGLPaintDevice : public QGLPaintDevice
 {
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 1d633ed..75e5a60 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -77,6 +77,9 @@ QT_BEGIN_NAMESPACE
 
 #if !defined(QVG_NO_DRAW_GLYPHS)
 
+// use the same rounding as in qrasterizer.cpp (6 bit fixed point)
+static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
+
 Q_DECL_IMPORT extern int qt_defaultDpiX();
 Q_DECL_IMPORT extern int qt_defaultDpiY();
 
@@ -102,6 +105,7 @@ private:
 
 class QVGPaintEnginePrivate : public QPaintEngineExPrivate
 {
+    Q_DECLARE_PUBLIC(QVGPaintEngine)
 public:
     // Extra blending modes from VG_KHR_advanced_blending extension.
     // Use the QT_VG prefix to avoid conflicts with any definitions
@@ -132,7 +136,7 @@ public:
         QT_VG_BLEND_XOR_KHR           = 0x2026
     };
 
-    QVGPaintEnginePrivate();
+    QVGPaintEnginePrivate(QVGPaintEngine *q_ptr);
     ~QVGPaintEnginePrivate();
 
     void init();
@@ -153,6 +157,7 @@ public:
     void setBrushTransform(const QBrush& brush, VGMatrixMode mode);
     void setupColorRamp(const QGradient *grad, VGPaint paint);
     void setImageOptions();
+    void systemStateChanged();
 #if !defined(QVG_SCISSOR_CLIP)
     void ensureMask(QVGPaintEngine *engine, int width, int height);
     void modifyMask
@@ -281,6 +286,9 @@ public:
 
     // Clear all lazily-set modes.
     void clearModes();
+
+private:
+    QVGPaintEngine *q;
 };
 
 inline void QVGPaintEnginePrivate::setImageMode(VGImageMode mode)
@@ -332,7 +340,7 @@ void QVGPaintEnginePrivate::clearModes()
     imageQuality = (VGImageQuality)0;
 }
 
-QVGPaintEnginePrivate::QVGPaintEnginePrivate()
+QVGPaintEnginePrivate::QVGPaintEnginePrivate(QVGPaintEngine *q_ptr) : q(q_ptr)
 {
     init();
 }
@@ -1431,7 +1439,7 @@ QVGPainterState::~QVGPainterState()
 }
 
 QVGPaintEngine::QVGPaintEngine()
-    : QPaintEngineEx(*new QVGPaintEnginePrivate)
+    : QPaintEngineEx(*new QVGPaintEnginePrivate(this))
 {
 }
 
@@ -2974,6 +2982,11 @@ void QVGPaintEnginePrivate::setImageOptions()
     }
 }
 
+void QVGPaintEnginePrivate::systemStateChanged()
+{
+    q->updateScissor();
+}
+
 static void drawVGImage(QVGPaintEnginePrivate *d,
                         const QRectF& r, VGImage vgImg,
                         const QSize& imageSize, const QRectF& sr)
@@ -3432,9 +3445,10 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
     // Set the transformation to use for drawing the current glyphs.
     QTransform glyphTransform(d->pathTransform);
     if (d->transform.type() <= QTransform::TxTranslate) {
-        // Prevent blurriness of unscaled, unrotated text by using integer coordinates.
-        // Using ceil(x-0.5) instead of qRound() or int-cast, behave like other paint engines.
-        glyphTransform.translate(ceil(p.x() - 0.5), ceil(p.y() - 0.5));
+        // Prevent blurriness of unscaled, unrotated text by forcing integer coordinates.
+        glyphTransform.translate(
+                floor(p.x() + glyphTransform.dx() + aliasedCoordinateDelta) - glyphTransform.dx(),
+                floor(p.y() - glyphTransform.dy() + aliasedCoordinateDelta) + glyphTransform.dy());
     } else {
         glyphTransform.translate(p.x(), p.y());
     }
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index e4a0135..d5f0d42 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -167,7 +167,6 @@ struct CachedImage
 static QCache<qint64, CachedImage> imageCache(4*1024*1024); // 4 MB
 #endif
 
-#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS || defined QT_DEBUG
 #define VOID_ARG() static_cast<bool>(false)
 enum PaintOperation {
     DRAW_RECTS = 0x0001, DRAW_LINES = 0x0002, DRAW_IMAGE = 0x0004,
@@ -178,88 +177,81 @@ enum PaintOperation {
     DRAW_STATICTEXT = 0x8000, ALL = 0xffff
 };
 
-#ifdef QT_DEBUG
-static void initRasterFallbacksMasks(int *warningMask, int *disableMask)
-{
-    struct {
-        const char *name;
-        PaintOperation operation;
-    } const operations[] = {
-        { "DRAW_RECTS", DRAW_RECTS },
-        { "DRAW_LINES", DRAW_LINES },
-        { "DRAW_IMAGE", DRAW_IMAGE },
-        { "DRAW_PIXMAP", DRAW_PIXMAP },
-        { "DRAW_TILED_PIXMAP", DRAW_TILED_PIXMAP },
-        { "STROKE_PATH", STROKE_PATH },
-        { "DRAW_PATH", DRAW_PATH },
-        { "DRAW_POINTS", DRAW_POINTS },
-        { "DRAW_ELLIPSE", DRAW_ELLIPSE },
-        { "DRAW_POLYGON", DRAW_POLYGON },
-        { "DRAW_TEXT", DRAW_TEXT },
-        { "FILL_PATH", FILL_PATH },
-        { "FILL_RECT", FILL_RECT },
-        { "DRAW_COLORSPANS", DRAW_COLORSPANS },
-        { "DRAW_ROUNDED_RECT", DRAW_ROUNDED_RECT },
-        { "ALL", ALL },
-        { 0, ALL }
-    };
-
-    QStringList warning = QString::fromLatin1(qgetenv("QT_DIRECTFB_WARN_ON_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'),
-                                                                                                              QString::SkipEmptyParts);
-    QStringList disable = QString::fromLatin1(qgetenv("QT_DIRECTFB_DISABLE_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'),
-                                                                                                              QString::SkipEmptyParts);
-    *warningMask = 0;
-    *disableMask = 0;
-    if (!warning.isEmpty() || !disable.isEmpty()) {
-        for (int i=0; operations[i].name; ++i) {
-            const QString name = QString::fromLatin1(operations[i].name);
-            int idx = warning.indexOf(name);
-            if (idx != -1) {
-                *warningMask |= operations[i].operation;
-                warning.erase(warning.begin() + idx);
-            }
-            idx = disable.indexOf(name);
-            if (idx != -1) {
-                *disableMask |= operations[i].operation;
-                disable.erase(disable.begin() + idx);
-            }
-        }
-    }
-    if (!warning.isEmpty()) {
-        qWarning("QDirectFBPaintEngine QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Unknown operation(s): %s",
-                 qPrintable(warning.join(QLatin1String("|"))));
-    }
-    if (!disable.isEmpty()) {
-        qWarning("QDirectFBPaintEngine QT_DIRECTFB_DISABLE_RASTERFALLBACKS Unknown operation(s): %s",
-                 qPrintable(disable.join(QLatin1String("|"))));
-    }
-
-}
-#endif
-
-static inline int rasterFallbacksMask(bool warn)
+enum { RasterWarn = 1, RasterDisable = 2 };
+static inline uint rasterFallbacksMask(PaintOperation op)
 {
+    uint ret = 0;
 #ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS
-    if (warn)
-        return QT_DIRECTFB_WARN_ON_RASTERFALLBACKS;
+    if (op & QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)
+        ret |= RasterWarn;
 #endif
 #ifdef QT_DIRECTFB_DISABLE_RASTERFALLBACKS
-    if (!warn)
-        return QT_DIRECTFB_DISABLE_RASTERFALLBACKS;
+    if (op & QT_DIRECTFB_DISABLE_RASTERFALLBACKS)
+        ret |= RasterDisable;
 #endif
-#ifndef QT_DEBUG
-    return 0;
-#else
-    static int warnMask = -1;
+    static int warningMask = -1;
     static int disableMask = -1;
-    if (warnMask == -1)
-        initRasterFallbacksMasks(&warnMask, &disableMask);
-    return warn ? warnMask : disableMask;
-#endif
+    if (warningMask < 0) {
+        struct {
+            const char *name;
+            PaintOperation operation;
+        } const operations[] = {
+            { "DRAW_RECTS", DRAW_RECTS },
+            { "DRAW_LINES", DRAW_LINES },
+            { "DRAW_IMAGE", DRAW_IMAGE },
+            { "DRAW_PIXMAP", DRAW_PIXMAP },
+            { "DRAW_TILED_PIXMAP", DRAW_TILED_PIXMAP },
+            { "STROKE_PATH", STROKE_PATH },
+            { "DRAW_PATH", DRAW_PATH },
+            { "DRAW_POINTS", DRAW_POINTS },
+            { "DRAW_ELLIPSE", DRAW_ELLIPSE },
+            { "DRAW_POLYGON", DRAW_POLYGON },
+            { "DRAW_TEXT", DRAW_TEXT },
+            { "FILL_PATH", FILL_PATH },
+            { "FILL_RECT", FILL_RECT },
+            { "DRAW_COLORSPANS", DRAW_COLORSPANS },
+            { "DRAW_ROUNDED_RECT", DRAW_ROUNDED_RECT },
+            { "ALL", ALL },
+            { 0, ALL }
+        };
+
+        QStringList warning = QString::fromLatin1(qgetenv("QT_DIRECTFB_WARN_ON_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'),
+                                                                                                                  QString::SkipEmptyParts);
+        QStringList disable = QString::fromLatin1(qgetenv("QT_DIRECTFB_DISABLE_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'),
+                                                                                                                  QString::SkipEmptyParts);
+        warningMask = 0;
+        disableMask = 0;
+        if (!warning.isEmpty() || !disable.isEmpty()) {
+            for (int i=0; operations[i].name; ++i) {
+                const QString name = QString::fromLatin1(operations[i].name);
+                int idx = warning.indexOf(name);
+                if (idx != -1) {
+                    warningMask |= operations[i].operation;
+                    warning.erase(warning.begin() + idx);
+                }
+                idx = disable.indexOf(name);
+                if (idx != -1) {
+                    disableMask |= operations[i].operation;
+                    disable.erase(disable.begin() + idx);
+                }
+            }
+        }
+        if (!warning.isEmpty()) {
+            qWarning("QDirectFBPaintEngine QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Unknown operation(s): %s",
+                     qPrintable(warning.join(QLatin1String("|"))));
+        }
+        if (!disable.isEmpty()) {
+            qWarning("QDirectFBPaintEngine QT_DIRECTFB_DISABLE_RASTERFALLBACKS Unknown operation(s): %s",
+                     qPrintable(disable.join(QLatin1String("|"))));
+        }
+    }
+    if (op & warningMask)
+        ret |= RasterWarn;
+    if (op & disableMask)
+        ret |= RasterDisable;
+    return ret;
 }
-#endif
 
-#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DEBUG
 template <typename device, typename T1, typename T2, typename T3>
 static void rasterFallbackWarn(const char *msg, const char *func, const device *dev,
                                uint transformationType, bool simplePen,
@@ -267,16 +259,14 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
                                const char *nameOne, const T1 &one,
                                const char *nameTwo, const T2 &two,
                                const char *nameThree, const T3 &three);
-#endif
 
-#if defined QT_DEBUG || (defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS)
 #define RASTERFALLBACK(op, one, two, three)                             \
     {                                                                   \
-        const bool disable = op & rasterFallbacksMask(false);           \
-        if (op & rasterFallbacksMask(true))                             \
-            rasterFallbackWarn(disable                                  \
-                               ? "Disabled raster engine operation"     \
-                               : "Falling back to raster engine for",   \
+        static const uint rasterFallbacks = rasterFallbacksMask(op);    \
+        switch (rasterFallbacks) {                                      \
+        case 0: break;                                                  \
+        case RasterWarn:                                                \
+            rasterFallbackWarn("Falling back to raster engine for",     \
                                __FUNCTION__,                            \
                                state()->painter->device(),              \
                                d_func()->transformationType,            \
@@ -284,26 +274,20 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
                                d_func()->clipType,                      \
                                d_func()->compositionModeStatus,         \
                                #one, one, #two, two, #three, three);    \
-        if (disable)                                                    \
+            break;                                                      \
+        case RasterDisable|RasterWarn:                                  \
+            rasterFallbackWarn("Disabled raster engine operation",      \
+                               __FUNCTION__,                            \
+                               state()->painter->device(),              \
+                               d_func()->transformationType,            \
+                               d_func()->simplePen,                     \
+                               d_func()->clipType,                      \
+                               d_func()->compositionModeStatus,         \
+                               #one, one, #two, two, #three, three);    \
+        case RasterDisable:                                             \
             return;                                                     \
+        }                                                               \
     }
-#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS
-#define RASTERFALLBACK(op, one, two, three)                             \
-    if (op & rasterFallbacksMask(false))                                \
-        return;
-#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS
-#define RASTERFALLBACK(op, one, two, three)                             \
-    if (op & rasterFallbacksMask(true))                                 \
-        rasterFallbackWarn("Falling back to raster engine for",         \
-                           __FUNCTION__, state()->painter->device(),    \
-                           d_func()->transformationType,                \
-                           d_func()->simplePen,                         \
-                           d_func()->clipType,                          \
-                           d_func()->compositionModeStatus,             \
-                           #one, one, #two, two, #three, three);
-#else
-#define RASTERFALLBACK(op, one, two, three)
-#endif
 
 template <class T>
 static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface);
@@ -1362,7 +1346,6 @@ static inline void drawRects(const T *rects, int n, const QTransform &transform,
     }
 }
 
-#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DEBUG
 template <typename T> inline const T *ptr(const T &t) { return &t; }
 template <> inline const bool* ptr<bool>(const bool &) { return 0; }
 template <typename device, typename T1, typename T2, typename T3>
@@ -1403,8 +1386,6 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
     qWarning("%s", qPrintable(out));
 }
 
-#endif // QT_DIRECTFB_WARN_ON_RASTERFALLBACKS
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_QWS_DIRECTFB
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 2442ee8..6b34a19 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -1131,7 +1131,7 @@ EXPORTS
 	_ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME
 	_ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME
 	_ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME
-	_ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME
+	_ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME ABSENT
 	_ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME
 	_ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME
 	_ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME
diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp
index a5cdc80..9d1ee6a 100644
--- a/src/testlib/qtestfilelogger.cpp
+++ b/src/testlib/qtestfilelogger.cpp
@@ -44,6 +44,8 @@
 #include "QtTest/private/qtestlog_p.h"
 #include "QtTest/private/qtestresult_p.h"
 
+#include <QtCore/qdir.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -69,11 +71,19 @@ QTestFileLogger::~QTestFileLogger()
 void QTestFileLogger::init()
 {
     char filename[100];
+    int index = 0;
+#if defined(Q_OS_SYMBIAN)
+    QByteArray ba(QDir::toNativeSeparators(QString(QDir::homePath()+QDir::separator())).toUtf8());
+    index = ba.length();
+    QTest::qt_snprintf(filename, sizeof(filename), "%s%s.log",
+                ba.constData(), QTestResult::currentTestObjectName());
+#else
     QTest::qt_snprintf(filename, sizeof(filename), "%s.log",
                 QTestResult::currentTestObjectName());
-
-    // Keep filenames simple
-    for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) {
+#endif
+ 
+     // Keep filenames simple
+    for (uint i = index; i < sizeof(filename) && filename[i]; ++i) {
         char& c = filename[i];
         if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
               || (c >= '0' && c <= '9') || c == '-' || c == '.')) {
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index 16d2063..6b36224 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -71,6 +71,7 @@ private slots:
     void parallel();
     void parallel_data();
     void massive();
+    void cancelcrash();
 
 private:
     QDeclarativeEngine engine;
@@ -316,6 +317,15 @@ void tst_qdeclarativepixmapcache::massive()
     }
 }
 
+// QTBUG-12729
+void tst_qdeclarativepixmapcache::cancelcrash()
+{
+    QUrl url("http://127.0.0.1:14452/cancelcrash_notexist.png");
+    for (int ii = 0; ii < 1000; ++ii) {
+        QDeclarativePixmap pix(&engine, url);
+    }
+}
+
 QTEST_MAIN(tst_qdeclarativepixmapcache)
 
 #include "tst_qdeclarativepixmapcache.moc"
diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index d1d6860..03c1d5b 100644
--- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -107,12 +107,13 @@ private slots:
     void avoidRecursionInInsertItem();
     void styleInfoLeak();
     void task236367_maxSizeHint();
+    void heightForWidth();
 };
 
 class RectWidget : public QGraphicsWidget
 {
 public:
-    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
+    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {}
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
@@ -125,9 +126,12 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
     {
-        if (m_sizeHints[which].isValid()) {
+        if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) {
             return m_sizeHints[which];
         }
+        if (m_fnConstraint) {
+            return m_fnConstraint(which, constraint);
+        }
         return QGraphicsWidget::sizeHint(which, constraint);
     }
 
@@ -136,7 +140,13 @@ public:
         updateGeometry();
     }
 
+    void setConstraintFunction(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) {
+        m_fnConstraint = fnConstraint;
+    }
+
     QSizeF m_sizeHints[Qt::NSizeHints];
+    QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &);
+
 };
 
 struct ItemDesc
@@ -146,7 +156,8 @@ struct ItemDesc
       m_rowSpan(1),
       m_colSpan(1),
       m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)),
-      m_align(0)
+      m_align(0),
+      m_fnConstraint(0)
     {
     }
 
@@ -213,8 +224,20 @@ struct ItemDesc
         return (*this);
     }
 
+    ItemDesc &heightForWidth(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) {
+        m_fnConstraint = fnConstraint;
+        m_constraintOrientation = Qt::Vertical;
+        return (*this);
+    }
+
     void apply(QGraphicsGridLayout *layout, QGraphicsWidget *item) {
-        item->setSizePolicy(m_sizePolicy);
+        QSizePolicy sp = m_sizePolicy;
+        if (m_fnConstraint) {
+            sp.setHeightForWidth(m_constraintOrientation == Qt::Vertical);
+            //sp.setWidthForHeight(m_constraintOrientation == Qt::Horizontal);
+        }
+
+        item->setSizePolicy(sp);
         for (int i = 0; i < Qt::NSizeHints; ++i) {
             if (!m_sizes[i].isValid())
                 continue;
@@ -233,6 +256,7 @@ struct ItemDesc
                 break;
             }
         }
+
         layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan);
         layout->setAlignment(item, m_align);
     }
@@ -240,6 +264,7 @@ struct ItemDesc
     void apply(QGraphicsGridLayout *layout, RectWidget *item) {
         for (int i = 0; i < Qt::NSizeHints; ++i)
             item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]);
+        item->setConstraintFunction(m_fnConstraint);
         apply(layout, static_cast<QGraphicsWidget*>(item));
     }
 
@@ -251,6 +276,9 @@ struct ItemDesc
     QSizeF m_sizeHints[Qt::NSizeHints];
     QSizeF m_sizes[Qt::NSizeHints];
     Qt::Alignment m_align;
+
+    Qt::Orientation m_constraintOrientation;
+    QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &);
 };
 
 typedef QList<ItemDesc> ItemList;
@@ -485,12 +513,12 @@ void tst_QGraphicsGridLayout::alignment()
     widget->resize(widget->effectiveSizeHint(Qt::MaximumSize));
     QApplication::processEvents();
 
-    QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0,    0,  50,  25));
-    QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0,   25,  50,  25));
-    QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125,  0,  50,  25));
-    QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 25,  50,  25));
-    QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250,  0,  50,  25));
-    QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 25,  50,  25));
+    QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0,    0,  50,  50));
+    QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0,   50,  50,  50));
+    QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125,  0,  50,  50));
+    QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 50,  50,  50));
+    QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250,  0,  50,  50));
+    QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 50,  50,  50));
 
     delete widget;
 }
@@ -544,12 +572,12 @@ void tst_QGraphicsGridLayout::columnAlignment()
       | HCenter  |   Right    |   Left  |
       +---------------------------------+
     */
-    QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0,   0,   50,  25));
-    QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25,  26,  50,  25));   // item is king
-    QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126,  0,  50,  25));
-    QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 26,  50,  25));   // item is king
-    QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252,  0,  50,  25));
-    QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 26,  50,  25));   // item is king
+    QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0,   0,   50,  50));
+    QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25,  51,  50,  50));   // item is king
+    QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126,  0,  50,  50));
+    QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 51,  50,  50));   // item is king
+    QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252,  0,  50,  50));
+    QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 51,  50,  50));   // item is king
 
     delete widget;
 }
@@ -2116,6 +2144,17 @@ void tst_QGraphicsGridLayout::alignment2()
     delete widget;
 }
 
+static QSizeF hfw1(Qt::SizeHint, const QSizeF &constraint)
+{
+    QSizeF result(constraint);
+    if (constraint.width() < 0 && constraint.height() < 0) {
+        return QSizeF(50, 400);
+    } else if (constraint.width() >= 0) {
+        result.setHeight(20000./constraint.width());
+    }
+    return result;
+}
+
 void tst_QGraphicsGridLayout::geometries_data()
 {
 
@@ -2145,6 +2184,186 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF(0, 0, 60,10) << QRectF(0, 10, 60,10)
                             );
 
+    // change layout height and verify
+    QTest::newRow("hfw-h401") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(500, 500))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(100, 401)
+                            << (RectList()
+                                << QRectF(0, 0, 50,  1) << QRectF(50, 0, 50,  1)
+                                << QRectF(0, 1, 50,100) << QRectF(50, 1, 50,400)
+                            );
+
+
+    QTest::newRow("hfw-h408") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(500, 500))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(100, 408)
+                            << (RectList()
+                                << QRectF(0, 0, 50,  8) << QRectF(50,  0, 50,  8)
+                                << QRectF(0, 8, 50,100) << QRectF(50,  8, 50,400)
+                            );
+
+    QTest::newRow("hfw-h410") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(500, 500))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(100, 410)
+                            << (RectList()
+                                << QRectF(0, 0, 50,10) << QRectF(50, 0, 50,10)
+                                << QRectF(0, 10, 50,100) << QRectF(50, 10, 50,400)
+                            );
+
+    QTest::newRow("hfw-h470") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(500, 500))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(100, 470)
+                            << (RectList()
+                                << QRectF(0, 0, 50,70) << QRectF(50, 0, 50,70)
+                                << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400)
+                            );
+
+
+    // change layout width and verify
+    QTest::newRow("hfw-w100") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(5000, 5000))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(100, 401)
+                            << (RectList()
+                                << QRectF( 0, 0,  50,   1) << QRectF( 50,  0,  50,   1)
+                                << QRectF( 0, 1,  50, 100) << QRectF( 50,  1,  50, 400)
+                            );
+
+    QTest::newRow("hfw-w160") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(5000, 5000))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(160, 401)
+                            << (RectList()
+                                << QRectF( 0,   0,  80, 100) << QRectF( 80,   0,  80, 100)
+                                << QRectF( 0, 100,  80, 100) << QRectF( 80, 100,  80, 250)
+                            );
+
+
+    QTest::newRow("hfw-w500") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(1,1))
+                                        .preferredSize(QSizeF(50,10))
+                                        .maxSize(QSizeF(100, 100))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(40,40))
+                                        .preferredSize(QSizeF(50,400))
+                                        .maxSize(QSizeF(5000, 5000))
+                                        .heightForWidth(hfw1)
+                                )
+                            << QSizeF(500, 401)
+                            << (RectList()
+                                << QRectF( 0,   0, 100, 100) << QRectF(100,   0, 100, 100)
+                                << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400,  50)
+                            );
+
 }
 
 void tst_QGraphicsGridLayout::geometries()
@@ -2215,6 +2434,143 @@ void tst_QGraphicsGridLayout::task236367_maxSizeHint()
     QCOMPARE(widget->size(), QSizeF(w, h));
 }
 
+/*
+static qreal hfw(qreal w)
+{
+    if (w == 0)
+        return 20000;
+    return 20000/w;
+}
+*/
+static QSizeF hfw(Qt::SizeHint /*which*/, const QSizeF &constraint)
+{
+    QSizeF result(constraint);
+    const qreal cw = constraint.width();
+    const qreal ch = constraint.height();
+    if (cw < 0 && ch < 0) {
+        return QSizeF(200, 100);
+    } else if (cw >= 0) {
+        result.setHeight(20000./cw);
+    } else if (cw == 0) {
+        result.setHeight(20000);
+    } else if (ch >= 0) {
+        result.setWidth(20000./ch);
+    } else if (ch == 0) {
+        result.setWidth(20000);
+    }
+
+    return result;
+}
+
+static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired)
+{
+    Q_ASSERT(sumDesired != 0.0);
+    return desired * qPow(sumAvailable / sumDesired, desired / sumDesired);
+}
+
+static void expectedWidth(qreal minSize1, qreal prefSize1,
+                          qreal minSize2, qreal prefSize2,
+                          qreal targetSize, qreal *width1, qreal *width2)
+{
+    qreal sumAvail,factor1,factor2;
+    // stretch behaviour is different below and above preferred size...
+    if (targetSize < prefSize1 + prefSize2) {
+        sumAvail = targetSize - minSize1 - minSize2;
+        const qreal desired1 = prefSize1 - minSize1;
+        const qreal desired2 = prefSize2 - minSize2;
+        const qreal sumDesired = desired1 + desired2;
+        factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired);
+        factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired);
+        const qreal sumFactors = factor1 + factor2;
+        *width1 = sumAvail*factor1/sumFactors + minSize1;
+        *width2 = sumAvail*factor2/sumFactors + minSize2;
+    } else {
+        sumAvail = targetSize - prefSize1 - prefSize2;
+        factor1 = prefSize1;
+        factor2 = prefSize2;
+        const qreal sumFactors = factor1 + factor2;
+        *width1 = sumAvail*factor1/sumFactors + prefSize1;
+        *width2 = sumAvail*factor2/sumFactors + prefSize2;
+    }
+}
+
+
+bool qFuzzyCompare(const QSizeF &a, const QSizeF &b)
+{
+    return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height());
+}
+
+void tst_QGraphicsGridLayout::heightForWidth()
+{
+    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsGridLayout *layout = new QGraphicsGridLayout;
+    widget->setLayout(layout);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+    RectWidget *w00 = new RectWidget;
+    w00->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
+    w00->setSizeHint(Qt::PreferredSize, QSizeF(10,10));
+    w00->setSizeHint(Qt::MaximumSize, QSizeF(100,100));
+    layout->addItem(w00, 0, 0);
+
+    RectWidget *w01 = new RectWidget;
+    w01->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
+    w01->setSizeHint(Qt::PreferredSize, QSizeF(10,10));
+    w01->setSizeHint(Qt::MaximumSize, QSizeF(100,100));
+    layout->addItem(w01, 0, 1);
+
+    RectWidget *w10 = new RectWidget;
+    w10->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
+    w10->setSizeHint(Qt::PreferredSize, QSizeF(10,10));
+    w10->setSizeHint(Qt::MaximumSize, QSizeF(100,100));
+    layout->addItem(w10, 1, 0);
+
+    RectWidget *w11 = new RectWidget;
+    w11->setSizeHint(Qt::MinimumSize, QSizeF(1,1));
+    w11->setSizeHint(Qt::MaximumSize, QSizeF(30000,30000));
+    w11->setConstraintFunction(hfw);
+    QSizePolicy sp(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    sp.setHeightForWidth(true);
+    w11->setSizePolicy(sp);
+    layout->addItem(w11, 1, 1);
+
+    QSizeF prefSize = layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1));
+    QCOMPARE(prefSize, QSizeF(10+200, 10+100));
+
+    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(2, -1)), QSizeF(2, 20001));
+    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(2, -1)), QSizeF(2, 20010));
+    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(2, -1)), QSizeF(2, 20100));
+    qreal width1;
+    qreal width2;
+    expectedWidth(1, 10, 1, 200, 20, &width1, &width2);
+    QSizeF expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1);
+    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(20, -1)), expectedSize);
+    expectedSize.rheight()+=9;
+    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(20, -1)), expectedSize);
+    expectedSize.rheight()+=90;
+    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(20, -1)), expectedSize);
+
+    expectedWidth(1, 10, 1, 200, 300, &width1, &width2);
+    expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1);
+    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(300, -1)), expectedSize);
+    expectedSize.rheight()+=9;
+    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(300, -1)), expectedSize);
+    // the height of the hfw widget is shorter than the one to the left, which is 100, so
+    // the total height of the last row is 100 (which leaves the layout height to be 200)
+    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(300, -1)), QSizeF(300, 200));
+
+    // the hfw item is shorter than the item to the left
+    expectedWidth(1, 10, 1, 200, 500, &width1, &width2);
+    expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1);
+    QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(500, -1)), expectedSize);
+    expectedSize.rheight()+=9;
+    QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(500, -1)), expectedSize);
+    // the height of the hfw widget is shorter than the one to the left, which is 100, so
+    // the total height of the last row is 100 (which leaves the layout height to be 200)
+    QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(500, -1)), QSizeF(500, 200));
+
+}
+
 QTEST_MAIN(tst_QGraphicsGridLayout)
 #include "tst_qgraphicsgridlayout.moc"
 
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index a771332..bda22eb 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -111,6 +111,7 @@ private slots:
     void fontPropagationSceneChange();
     void geometry_data();
     void geometry();
+    void geometryChanged();
     void width();
     void height();
     void getContentsMargins_data();
@@ -776,11 +777,28 @@ void tst_QGraphicsWidget::geometry()
     QFETCH(QSizeF, size);
     widget.setPos(pos);
     widget.resize(size);
-    if (!size.isNull())
+    if (!size.isNull() && !pos.isNull())
+        QCOMPARE(spy.count(), 2);
+    if (!size.isNull() && pos.isNull())
         QCOMPARE(spy.count(), 1);
     QCOMPARE(widget.geometry(), QRectF(pos, size));
 }
 
+void tst_QGraphicsWidget::geometryChanged()
+{
+    QGraphicsWidget w;
+    w.setGeometry(0, 0, 200, 200);
+    QCOMPARE(w.geometry(), QRectF(0, 0, 200, 200));
+    QSignalSpy spy(&w, SIGNAL(geometryChanged()));
+    w.setGeometry(0, 0, 100, 100);
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(w.geometry(), QRectF(0, 0, 100, 100));
+    w.setPos(10, 10);
+    QCOMPARE(spy.count(), 2);
+    QCOMPARE(w.geometry(), QRectF(10, 10, 100, 100));
+
+}
+
 void tst_QGraphicsWidget::width()
 {
     QGraphicsWidget w;
diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp
index 62416b1..bb96da1 100644
--- a/tests/auto/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp
@@ -714,6 +714,8 @@ void tst_QMetaObject::normalizedSignature_data()
     QTest::newRow("const12") << "void foo(Foo<Bar>const*const *const)" << "void foo(Foo<Bar>*const*const)";
     QTest::newRow("const13") << "void foo(const Foo<Bar>&)" << "void foo(Foo<Bar>)";
     QTest::newRow("const14") << "void foo(Foo<Bar>const&)" << "void foo(Foo<Bar>)";
+
+    QTest::newRow("invalid1") << "a( b" << "a(b";
 }
 
 void tst_QMetaObject::normalizedSignature()
@@ -721,7 +723,7 @@ void tst_QMetaObject::normalizedSignature()
     QFETCH(QString, signature);
     QFETCH(QString, result);
 
-    QCOMPARE(QString::fromLatin1(QMetaObject::normalizedSignature(signature.toLatin1())), result);
+    QCOMPARE(QMetaObject::normalizedSignature(signature.toLatin1()), result.toLatin1());
 }
 
 void tst_QMetaObject::normalizedType_data()
@@ -759,7 +761,7 @@ void tst_QMetaObject::normalizedType()
     QFETCH(QString, type);
     QFETCH(QString, result);
 
-    QCOMPARE(QString::fromLatin1(QMetaObject::normalizedType(type.toLatin1())), result);
+    QCOMPARE(QMetaObject::normalizedType(type.toLatin1()), result.toLatin1());
 }
 
 void tst_QMetaObject::customPropertyType()
diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp
index ea07323..d0d26ee 100644
--- a/tests/auto/qregexp/tst_qregexp.cpp
+++ b/tests/auto/qregexp/tst_qregexp.cpp
@@ -105,6 +105,7 @@ private slots:
 
     void QTBUG_7049_data();
     void QTBUG_7049();
+    void interval();
 };
 
 // Testing get/set functions
@@ -1426,5 +1427,22 @@ void tst_QRegExp::QTBUG_7049()
     QCOMPARE( re.cap(2), cap2 );
 }
 
+void tst_QRegExp::interval()
+{
+    {
+        QRegExp exp("a{0,1}");
+        QVERIFY(exp.isValid());
+    }
+    {
+        QRegExp exp("a{1,1}");
+        QVERIFY(exp.isValid());
+    }
+    {
+        QRegExp exp("a{1,0}");
+        QVERIFY(!exp.isValid());
+    }
+}
+
+
 QTEST_APPLESS_MAIN(tst_QRegExp)
 #include "tst_qregexp.moc"
diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem b/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem
new file mode 100644
index 0000000..416dd4d
--- /dev/null
+++ b/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcOgAwIBAgIJAM7bMShFxAVAMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwIBcNMTAwODA0MDk1MzQxWhgPMjA1MTA4MjkwOTUzNDFa
+MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ
+bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAM2q22/WNMmn8cC+5EEYGeICySLmp9W6Ay6eKHr0Xxp3X3epETuPfvAuxp7r
+OtkS18EMUegkUj8jw0IMEcbyHKFC/rTCaYOt93CxGBXMIChiMPAsFeYzGa/D6xzA
+kfcRaJRQ+Ek3CDLXPnXfo7xpABXezYcPXAJrgsgBfWrwHdxzAgMBAAGjUDBOMB0G
+A1UdDgQWBBSKbhnnl5uP2X+zuwFP6GovUpUN2TAfBgNVHSMEGDAWgBSKbhnnl5uP
+2X+zuwFP6GovUpUN2TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKF0
+jl02liwFfupmzC5oxz2T3IyjEa21fm7QBMQJvQr5OTuX1/C7DAl7g/6/h7BH6JS3
+qpx5rXGet8SZmG8dODL4o3U4xOXnNzch7HtQixWwlx4XnFAXPMHflFX7YC5QQNHq
+I8Y8IW+XjAYWpYJywWMUZIbr1/9y9gn1beYEE3pq
+-----END CERTIFICATE-----
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index d0509bb..963bf11 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -110,6 +110,7 @@ private slots:
     void nulInCN();
     void nulInSan();
     void largeSerialNumber();
+    void largeExpirationDate();
 // ### add tests for certificate bundles (multiple certificates concatenated into a single
 //     structure); both PEM and DER formatted
 #endif
@@ -802,6 +803,20 @@ void tst_QSslCertificate::largeSerialNumber()
     QCOMPARE(cert.serialNumber(), QByteArray("01:02:03:04:05:06:07:08:09:10:aa:bb:cc:dd:ee:ff:17:18:19:20"));
 }
 
+void tst_QSslCertificate::largeExpirationDate() // QTBUG-12489
+{
+    QList<QSslCertificate> certList =
+        QSslCertificate::fromPath(SRCDIR "more-certificates/cert-large-expiration-date.pem");
+
+    QCOMPARE(certList.size(), 1);
+
+    const QSslCertificate &cert = certList.at(0);
+    QVERIFY(!cert.isNull());
+    QCOMPARE(cert.effectiveDate().toUTC(), QDateTime(QDate(2010, 8, 4), QTime(9, 53, 41), Qt::UTC));
+    // if the date is larger than 2049, then the generalized time format is used
+    QCOMPARE(cert.expiryDate().toUTC(), QDateTime(QDate(2051, 8, 29), QTime(9, 53, 41), Qt::UTC));
+}
+
 #endif // QT_NO_OPENSSL
 
 QTEST_MAIN(tst_QSslCertificate)
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index 1d166f4..0ae5320 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -85,6 +85,10 @@ private slots:
     void setPenPlainText();
     void setPenRichText();
     void richTextOverridesPen();
+
+    void drawStruckOutText();
+    void drawOverlinedText();
+    void drawUnderlinedText();
 };
 
 void tst_QStaticText::init()
@@ -620,5 +624,107 @@ void tst_QStaticText::richTextOverridesPen()
     }
 }
 
+void tst_QStaticText::drawStruckOutText()
+{
+    QPixmap imageDrawText(1000, 1000);
+    QPixmap imageDrawStaticText(1000, 1000);
+
+    imageDrawText.fill(Qt::white);
+    imageDrawStaticText.fill(Qt::white);
+
+    QString s = QString::fromLatin1("Foobar");
+
+    QFont font;
+    font.setStrikeOut(true);
+
+    {
+        QPainter p(&imageDrawText);
+        p.setFont(font);
+        p.drawText(QPointF(50, 50), s);
+    }
+
+    {
+        QPainter p(&imageDrawStaticText);
+        QStaticText text = QStaticText(s);
+        p.setFont(font);
+        p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text);
+    }
+
+#if defined(DEBUG_SAVE_IMAGE)
+    imageDrawText.save("drawStruckOutText_imageDrawText.png");
+    imageDrawStaticText.save("drawStruckOutText_imageDrawStaticText.png");
+#endif
+
+    QCOMPARE(imageDrawText, imageDrawStaticText);
+}
+
+void tst_QStaticText::drawOverlinedText()
+{
+    QPixmap imageDrawText(1000, 1000);
+    QPixmap imageDrawStaticText(1000, 1000);
+
+    imageDrawText.fill(Qt::white);
+    imageDrawStaticText.fill(Qt::white);
+
+    QString s = QString::fromLatin1("Foobar");
+
+    QFont font;
+    font.setOverline(true);
+
+    {
+        QPainter p(&imageDrawText);
+        p.setFont(font);
+        p.drawText(QPointF(50, 50), s);
+    }
+
+    {
+        QPainter p(&imageDrawStaticText);
+        QStaticText text = QStaticText(s);
+        p.setFont(font);
+        p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text);
+    }
+
+#if defined(DEBUG_SAVE_IMAGE)
+    imageDrawText.save("drawOverlinedText_imageDrawText.png");
+    imageDrawStaticText.save("drawOverlinedText_imageDrawStaticText.png");
+#endif
+
+    QCOMPARE(imageDrawText, imageDrawStaticText);
+}
+
+void tst_QStaticText::drawUnderlinedText()
+{
+    QPixmap imageDrawText(1000, 1000);
+    QPixmap imageDrawStaticText(1000, 1000);
+
+    imageDrawText.fill(Qt::white);
+    imageDrawStaticText.fill(Qt::white);
+
+    QString s = QString::fromLatin1("Foobar");
+
+    QFont font;
+    font.setUnderline(true);
+
+    {
+        QPainter p(&imageDrawText);
+        p.setFont(font);
+        p.drawText(QPointF(50, 50), s);
+    }
+
+    {
+        QPainter p(&imageDrawStaticText);
+        QStaticText text = QStaticText(s);
+        p.setFont(font);
+        p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text);
+    }
+
+#if defined(DEBUG_SAVE_IMAGE)
+    imageDrawText.save("drawUnderlinedText_imageDrawText.png");
+    imageDrawStaticText.save("drawUnderlinedText_imageDrawStaticText.png");
+#endif
+
+    QCOMPARE(imageDrawText, imageDrawStaticText);
+}
+
 QTEST_MAIN(tst_QStaticText)
 #include "tst_qstatictext.moc"
diff --git a/tests/manual/inputmethodhints/inputmethodhints.cpp b/tests/manual/inputmethodhints/inputmethodhints.cpp
new file mode 100644
index 0000000..0c00b8d
--- /dev/null
+++ b/tests/manual/inputmethodhints/inputmethodhints.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** 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 examples 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$
+**
+****************************************************************************/
+
+#include "inputmethodhints.h"
+
+inputmethodhints::inputmethodhints(QWidget *parent)
+    : QMainWindow(parent)
+{
+    ui.setupUi(this);
+    connect(ui.cbDialableOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbDigitsOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbEmailOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbFormattedNumbersOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbHiddenText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbLowercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbNoAutoUppercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbNoPredictiveText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbPreferLowercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbPreferNumbers, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbPreferUpperCase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbUppercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+    connect(ui.cbUrlOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int)));
+}
+
+inputmethodhints::~inputmethodhints()
+{
+
+}
+
+void inputmethodhints::checkboxChanged(int)
+{
+    int flags = 0;
+    if (ui.cbDialableOnly->isChecked())
+        flags |= Qt::ImhDialableCharactersOnly;
+    if (ui.cbDigitsOnly->isChecked())
+        flags |= Qt::ImhDigitsOnly;
+    if (ui.cbEmailOnly->isChecked())
+        flags |= Qt::ImhEmailCharactersOnly;
+    if (ui.cbFormattedNumbersOnly->isChecked())
+        flags |= Qt::ImhFormattedNumbersOnly;
+    if (ui.cbHiddenText->isChecked())
+        flags |= Qt::ImhHiddenText;
+    if (ui.cbLowercaseOnly->isChecked())
+        flags |= Qt::ImhLowercaseOnly;
+    if (ui.cbNoAutoUppercase->isChecked())
+        flags |= Qt::ImhNoAutoUppercase;
+    if (ui.cbNoPredictiveText->isChecked())
+        flags |= Qt::ImhNoPredictiveText;
+    if (ui.cbPreferLowercase->isChecked())
+        flags |= Qt::ImhPreferLowercase;
+    if (ui.cbPreferNumbers->isChecked())
+        flags |= Qt::ImhPreferNumbers;
+    if (ui.cbPreferUpperCase->isChecked())
+        flags |= Qt::ImhPreferUppercase;
+    if (ui.cbUppercaseOnly->isChecked())
+        flags |= Qt::ImhUppercaseOnly;
+    if (ui.cbUrlOnly->isChecked())
+        flags |= Qt::ImhUrlCharactersOnly;
+    ui.lineEdit->clear();
+    ui.lineEdit->setInputMethodHints(Qt::InputMethodHints(flags));
+}
diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h
new file mode 100644
index 0000000..988a4be
--- /dev/null
+++ b/tests/manual/inputmethodhints/inputmethodhints.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** 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 examples 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$
+**
+****************************************************************************/
+
+#ifndef INPUTMETHODHINTS_H
+#define INPUTMETHODHINTS_H
+
+#include <QtGui/QMainWindow>
+#include "ui_tst_inputmethodhints.h"
+
+class inputmethodhints : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    inputmethodhints(QWidget *parent = 0);
+    ~inputmethodhints();
+    
+public slots:
+    void checkboxChanged(int);
+
+private:
+    Ui::MainWindow ui;
+};
+
+#endif // INPUTMETHODHINTS_H
diff --git a/tests/manual/inputmethodhints/inputmethodhints.pro b/tests/manual/inputmethodhints/inputmethodhints.pro
new file mode 100644
index 0000000..7298ec6
--- /dev/null
+++ b/tests/manual/inputmethodhints/inputmethodhints.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET = tst_inputmethodhints
+
+QT        += core \
+    gui 
+
+HEADERS   += inputmethodhints.h
+SOURCES   += main.cpp \
+    inputmethodhints.cpp
+FORMS     += inputmethodhints.ui
+RESOURCES +=
+
+symbian:TARGET.UID3 = 0xE4938ABC
diff --git a/tests/manual/inputmethodhints/inputmethodhints.ui b/tests/manual/inputmethodhints/inputmethodhints.ui
new file mode 100644
index 0000000..d0dc01d
--- /dev/null
+++ b/tests/manual/inputmethodhints/inputmethodhints.ui
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>360</width>
+    <height>640</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout_3">
+    <item>
+     <widget class="QTabWidget" name="tabWidget">
+      <property name="currentIndex">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="tab">
+       <attribute name="title">
+        <string>behaviour</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QCheckBox" name="cbHiddenText">
+          <property name="text">
+           <string>ImhHiddenText</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbNoAutoUppercase">
+          <property name="text">
+           <string>ImhNoAutoUppercase</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbPreferNumbers">
+          <property name="text">
+           <string>ImhPreferNumbers</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbPreferUpperCase">
+          <property name="text">
+           <string>ImhPreferUppercase</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbPreferLowercase">
+          <property name="text">
+           <string>ImhPreferLowercase</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbNoPredictiveText">
+          <property name="text">
+           <string>ImhNoPredictiveText</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tab_2">
+       <attribute name="title">
+        <string>restrictions</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="cbDigitsOnly">
+          <property name="text">
+           <string>ImhDigitsOnly</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbFormattedNumbersOnly">
+          <property name="text">
+           <string>ImhFormattedNumbersOnly</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbUppercaseOnly">
+          <property name="text">
+           <string>ImhUppercaseOnly</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbLowercaseOnly">
+          <property name="text">
+           <string>ImhLowercaseOnly</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbDialableOnly">
+          <property name="text">
+           <string>ImhDialableCharactersOnly</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbEmailOnly">
+          <property name="text">
+           <string>ImhEmailCharactersOnly</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="cbUrlOnly">
+          <property name="text">
+           <string>ImhUrlCharactersOnly</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="lineEdit"/>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/manual/inputmethodhints/main.cpp b/tests/manual/inputmethodhints/main.cpp
new file mode 100644
index 0000000..022bf3f
--- /dev/null
+++ b/tests/manual/inputmethodhints/main.cpp
@@ -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 examples 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$
+**
+****************************************************************************/
+
+#include "inputmethodhints.h"
+
+#include <QtGui>
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    inputmethodhints w;
+    w.showMaximized();
+    return a.exec();
+}
diff --git a/tools/linguist/phrasebooks/russian.qph b/tools/linguist/phrasebooks/russian.qph
index 750fda0..5876ee9 100644
--- a/tools/linguist/phrasebooks/russian.qph
+++ b/tools/linguist/phrasebooks/russian.qph
@@ -498,7 +498,7 @@
 </phrase>
 <phrase>
     <source>Next</source>
-    <target>Следующий</target>
+    <target>Далее</target>
 </phrase>
 <phrase>
     <source>object</source>
@@ -1070,7 +1070,7 @@
 </phrase>
 <phrase>
     <source>Next</source>
-    <target>Далее</target>
+    <target>Следующий</target>
 </phrase>
 <phrase>
     <source>tree view</source>
@@ -1204,4 +1204,16 @@
     <source>Permission denied</source>
     <target>Доступ запрещён</target>
 </phrase>
+<phrase>
+    <source>Previous</source>
+    <target>Предыдущий</target>
+</phrase>
+<phrase>
+    <source>Next</source>
+    <target>Следующее</target>
+</phrase>
+<phrase>
+    <source>Previous</source>
+    <target>Предыдущее</target>
+</phrase>
 </QPH>
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 9e8d768..4603a40 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -293,12 +293,8 @@ void HtmlGenerator::initializeGenerator(const Config &config)
         application = Online;
     else if (app == "creator")
         application = Creator;
-    else if (app == "assistant")
-        application = Assistant;
-    else if (app == "base")
-        application = Assistant;
     else 
-        application = Online;
+        application = Creator;
 
     projectDescription = config.getString(CONFIG_DESCRIPTION);
     if (projectDescription.isEmpty() && !project.isEmpty())
@@ -1841,10 +1837,6 @@ void HtmlGenerator::generateHeader(const QString& title,
 	// CheckEmptyAndLoadList activating search
 	out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
         break;
-    case Assistant:
-	out() << "</head>\n";
-	out() << "<body class=\"offline \">\n";
-        break;
     case Creator:
 	out() << "</head>\n";
 	out() << "<body class=\"offline narrow creator\">\n"; // offline narrow
@@ -1866,11 +1858,6 @@ void HtmlGenerator::generateHeader(const QString& title,
         generateBreadCrumbs(title,node,marker);
         out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
         break;
-    case Assistant:
-        out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        generateBreadCrumbs(title,node,marker);
-        out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        break;
     case Creator:
         out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
         generateBreadCrumbs(title,node,marker);
@@ -1988,9 +1975,6 @@ void HtmlGenerator::generateFooter(const Node *node)
         out() << "  </script> -->\n";
         out() << "</body>\n";
 	break;
-    case Assistant:
-        out() << "</body>\n";
-        break;
     case Creator:
         out() << "</body>\n";
 	break;
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 07226f5..eab10c6 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -97,7 +97,6 @@ class HtmlGenerator : public PageGenerator
 
     enum Application {
         Online,
-        Assistant,
         Creator};
 
  public:
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 38b76a4..fa7efee 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -194,10 +194,7 @@ static void processQdocconfFile(const QString &fileName)
 
     /*
       Set the application to which qdoc will create the output.
-      The three applications are:
-
-      base or assistant: simple, basic html output
-      for offline viewing in the Assistant application.
+      The two applications are:
 
       creator: additional formatting for viewing in
       the Creator application.
@@ -207,9 +204,9 @@ static void processQdocconfFile(const QString &fileName)
     */
     if (appArg.isEmpty()) {
         qDebug() << "Warning: Application flag not specified on"
-                 << "command line. Options are -assistant, -creator,"
-                 << "and -online (default).";
-        appArg = "online";
+                 << "command line. Options are -creator (default)"
+                 << "and -online.";
+        appArg = "creator";
     }
     config.setStringList(CONFIG_APPLICATION, QStringList(appArg));
 
@@ -484,10 +481,6 @@ int main(int argc, char **argv)
         else if (opt == "-obsoletelinks") {
             obsoleteLinks = true;
         }
-	else if (opt == "-base")
-		appArg = "base";
-	else if (opt == "-assistant")
-		appArg = "assistant";
 	else if (opt == "-creator")
 		appArg = "creator";
 	else if (opt == "-online")
diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index 5244483..f5ba461 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -4,7 +4,6 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="+117"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
@@ -12,19 +11,16 @@
 <context>
     <name>AboutLabel</name>
     <message>
-        <location line="-15"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Unable to launch external application.
 </source>
         <translation>Невозможно запустить внешнее приложение.
 </translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>OK</source>
         <translation>Закрыть</translation>
     </message>
@@ -32,17 +28,14 @@
 <context>
     <name>Assistant</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="+177"/>
         <source>Error registering documentation file &apos;%1&apos;: %2</source>
         <translation>Ошибка регистрации файла документации &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Error: %1</source>
         <translation>Ошибка: %1</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Could not register documentation file
 %1
 
@@ -55,12 +48,10 @@ Reason:
 %2</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Documentation successfully registered.</source>
         <translation>Документация успешно зарегистрирована.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Could not unregister documentation file
 %1
 
@@ -73,27 +64,22 @@ Reason:
 %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Documentation successfully unregistered.</source>
         <translation>Документация успешно дерегистрирована.</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>Error reading collection file &apos;%1&apos;: %2.</source>
-        <translation type="unfinished">Ошибка чтения файла коллекции справки &apos;%1&apos;: %2.</translation>
+        <translation>Ошибка чтения файла коллекции справки &apos;%1&apos;: %2.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Error creating collection file &apos;%1&apos;: %2.</source>
-        <translation type="unfinished">Ошибка создания файла коллекции справки &apos;%1&apos;: %2.</translation>
+        <translation>Ошибка создания файла коллекции справки &apos;%1&apos;: %2.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error reading collection file &apos;%1&apos;: %2</source>
-        <translation type="unfinished">Ошибка чтения файла коллекции справки &apos;%1&apos;: %2</translation>
+        <translation>Ошибка чтения файла коллекции справки &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Cannot load sqlite database driver!</source>
         <translation>Не удалось загрузить драйвер баз данных sqlite!</translation>
     </message>
@@ -101,139 +87,229 @@ Reason:
 <context>
     <name>BookmarkDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui"/>
         <source>Add Bookmark</source>
         <translation>Добавление закладки</translation>
     </message>
     <message>
-        <location/>
         <source>Bookmark:</source>
         <translation>Закладка:</translation>
     </message>
     <message>
-        <location/>
         <source>Add in Folder:</source>
         <translation>Добавить в папку:</translation>
     </message>
     <message>
-        <location/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location/>
         <source>New Folder</source>
         <translation>Новая папка</translation>
     </message>
+    <message>
+        <source>Rename Folder</source>
+        <translation>Переименовать папку</translation>
+    </message>
 </context>
 <context>
     <name>BookmarkManager</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="+216"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>You are going to delete a Folder, this will also&lt;br&gt;remove it&apos;s content. Are you sure to continue?</source>
         <translation>Удаление папки приведёт к удалению её содержимого.&lt;br&gt;Желаете продолжить?</translation>
     </message>
     <message>
-        <location line="+150"/>
         <source>Add Bookmark...</source>
         <translation>Добавить закладку...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+D</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-217"/>
         <source>Untitled</source>
         <translation>Неозаглавлено</translation>
     </message>
     <message>
-        <location line="+213"/>
         <source>Manage Bookmarks...</source>
         <translation>Управление закладками...</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Delete Folder</source>
         <translation>Удалить папку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rename Folder</source>
         <translation>Переименовать папку</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Show Bookmark</source>
         <translation>Открыть закладку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show Bookmark in New Tab</source>
         <translation>Открыть закладку в новой вкладке</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Delete Bookmark</source>
         <translation>Удалить закладку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rename Bookmark</source>
         <translation>Переименовать закладку</translation>
     </message>
 </context>
 <context>
+    <name>BookmarkManagerWidget</name>
+    <message>
+        <source>Manage Bookmarks</source>
+        <translation>Управление закладками</translation>
+    </message>
+    <message>
+        <source>Search:</source>
+        <translation>Поиск:</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Import and Backup</source>
+        <translation>Резервное копирование</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Import...</source>
+        <translation>Импорт...</translation>
+    </message>
+    <message>
+        <source>Export...</source>
+        <translation>Экспорт...</translation>
+    </message>
+    <message>
+        <source>Open File</source>
+        <translation>Открыть файл</translation>
+    </message>
+    <message>
+        <source>Files (*.xbel)</source>
+        <translation>Файлы (*.xbel)</translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation>Сохранить файл</translation>
+    </message>
+    <message>
+        <source>Qt Assistant</source>
+        <translation>Qt Assistant</translation>
+    </message>
+    <message>
+        <source>Unable to save bookmarks.</source>
+        <translation>Невозможно сохранитьзакладки.</translation>
+    </message>
+    <message>
+        <source>You are goingto delete a Folder, this will also&lt;br&gt; remove it&apos;s content. Are you sure to continue?</source>
+        <translation>Удаление папки приведёт к удалению её содержимого.&lt;br&gt;Желаете продолжить?</translation>
+    </message>
+    <message>
+        <source>Delete Folder</source>
+        <translation>Удалить папку</translation>
+    </message>
+    <message>
+        <source>Rename Folder</source>
+        <translation>Переименовать папку</translation>
+    </message>
+    <message>
+        <source>Show Bookmark</source>
+        <translation>Открыть закладку</translation>
+    </message>
+    <message>
+        <source>Show Bookmark in New Tab</source>
+        <translation>Открыть закладку в новой вкладке</translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation>Удалить закладку</translation>
+    </message>
+    <message>
+        <source>Rename Bookmark</source>
+        <translation>Переименовать закладку</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarkModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Название</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <source>Bookmarks Menu</source>
+        <translation>Меню закладок</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarkWidget</name>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Закладки</translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation>Фильтр:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+</context>
+<context>
     <name>CentralWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+121"/>
         <source>Add new page</source>
         <translation>Открыть новую страницу</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Close current page</source>
         <translation>Закрыть текущую страницу</translation>
     </message>
     <message>
-        <location line="+287"/>
         <source>Print Document</source>
         <translation>Печать документа</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+2"/>
         <source>unknown</source>
         <translation>безымянная вкладка</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Add New Page</source>
         <translation>Открыть новую страницу</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close This Page</source>
         <translation>Закрыть данную страницу</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close Other Pages</source>
         <translation>Закрыть остальные страницы</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Add Bookmark for this Page...</source>
         <translation>Добавить закладку для этой страницы...</translation>
     </message>
     <message>
-        <location line="+264"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
@@ -241,62 +317,50 @@ Reason:
 <context>
     <name>CmdLineParser</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+137"/>
         <source>Unknown option: %1</source>
         <translation>Неизвестный параметр: %1</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>Unknown widget: %1</source>
         <translation>Неизвестный виджет: %1</translation>
     </message>
     <message>
-        <location line="-54"/>
         <source>The collection file &apos;%1&apos; does not exist.</source>
-        <translation type="unfinished">Файл коллекции справки &apos;%1&apos; не существует.</translation>
+        <translation>Файл коллекции справки &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Missing collection file.</source>
-        <translation type="unfinished">Отсутствует файл коллекции справки.</translation>
+        <translation>Отсутствует файл коллекции справки.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Invalid URL &apos;%1&apos;.</source>
         <translation>Некорректный URL &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Missing URL.</source>
         <translation>Отсутствует URL.</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Missing widget.</source>
         <translation>Отсутствует виджет.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>The Qt help file &apos;%1&apos; does not exist.</source>
         <translation>Файл справки Qt &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Missing help file.</source>
         <translation>Отсутствует файл справки.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Missing filter argument.</source>
         <translation>Отсутствует параметр фильтра.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Notice</source>
         <translation>Замечание</translation>
     </message>
@@ -304,12 +368,10 @@ Reason:
 <context>
     <name>ContentWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="+173"/>
         <source>Open Link</source>
         <translation>Открыть ссылку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open Link in New Tab</source>
         <translation>Открыть ссылку в новой вкладке</translation>
     </message>
@@ -317,40 +379,52 @@ Reason:
 <context>
     <name>FilterNameDialogClass</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/filternamedialog.ui"/>
         <source>Add Filter Name</source>
         <translation>Добавление фильтра</translation>
     </message>
     <message>
-        <location/>
         <source>Filter Name:</source>
         <translation>Название фильтра:</translation>
     </message>
 </context>
 <context>
+    <name>FindWidget</name>
+    <message>
+        <source>Previous</source>
+        <translation>Предыдущее</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Следующее</translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation>Учитывать регистр символов</translation>
+    </message>
+    <message>
+        <source>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
+        <translation>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Поиск с начала</translation>
+    </message>
+</context>
+<context>
     <name>FontPanel</name>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Writing system</source>
         <translation>Система &amp;письма</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Family</source>
         <translation>&amp;Шрифт</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Style</source>
         <translation>&amp;Начертание</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Point size</source>
         <translation>&amp;Размер</translation>
     </message>
@@ -358,30 +432,37 @@ Reason:
 <context>
     <name>HelpViewer</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+58"/>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
         <translation>&lt;title&gt;Ошибка 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;Страница не найдена&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
+    <message>
+        <source>Copy &amp;Link Location</source>
+        <translation>Копировать &amp;адрес ссылки</translation>
+    </message>
+    <message>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
+        <translation>Открыть ссылку в новой вкладке	Ctrl+LMB</translation>
+    </message>
+    <message>
+        <source>Open Link in New Tab</source>
+        <translation>Открыть ссылку в новой вкладке</translation>
+    </message>
 </context>
 <context>
     <name>IndexWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="+68"/>
         <source>&amp;Look for:</source>
         <translation>&amp;Искать:</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>Open Link</source>
         <translation>Открыть ссылку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open Link in New Tab</source>
         <translation>Открыть ссылку в новой вкладке</translation>
     </message>
@@ -389,99 +470,76 @@ Reason:
 <context>
     <name>InstallDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+78"/>
         <source>Install Documentation</source>
         <translation>Установка документации</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+33"/>
         <source>Downloading documentation info...</source>
         <translation>Загрузка информации о документации...</translation>
     </message>
     <message>
-        <location line="+51"/>
         <source>Download canceled.</source>
         <translation>Загрузка отменена.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+79"/>
-        <location line="+27"/>
         <source>Done.</source>
         <translation>Готово.</translation>
     </message>
     <message>
-        <location line="-91"/>
         <source>The file %1 already exists. Do you want to overwrite it?</source>
         <translation>Файл %1 уже существует. Желаете перезаписать его?</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to save the file %1: %2.</source>
         <translation>Невозможно сохранить файл %1: %2.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Downloading %1...</source>
         <translation>Загрузка %1...</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+42"/>
-        <location line="+40"/>
         <source>Download failed: %1.</source>
         <translation>Загрузка не удалась: %1.</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>Documentation info file is corrupt!</source>
         <translation>Файл информации о документации повреждён!</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Download failed: Downloaded file is corrupted.</source>
         <translation>Загрузка не удалась: загруженный файл повреждён.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Installing documentation %1...</source>
         <translation>Установка документации %1...</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Error while installing documentation:
 %1</source>
         <translation>При установке документации возникла ошибка:
 %1</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui"/>
         <source>Available Documentation:</source>
         <translation>Доступная документация:</translation>
     </message>
     <message>
-        <location/>
         <source>Install</source>
         <translation>Установить</translation>
     </message>
     <message>
-        <location/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location/>
         <source>Installation Path:</source>
         <translation>Путь установки:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -489,297 +547,234 @@ Reason:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+123"/>
-        <location line="+369"/>
         <source>Index</source>
         <translation>Указатель</translation>
     </message>
     <message>
-        <location line="-363"/>
-        <location line="+361"/>
         <source>Contents</source>
         <translation>Содержание</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+358"/>
         <source>Bookmarks</source>
         <translation>Закладки</translation>
     </message>
     <message>
-        <location line="-336"/>
-        <location line="+680"/>
-        <location line="+284"/>
         <source>Qt Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location line="-772"/>
         <source>Looking for Qt Documentation...</source>
         <translation>Поиск документации Qt...</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Page Set&amp;up...</source>
         <translation>Параметры &amp;страницы...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Print Preview...</source>
         <translation>Предпросмотр печати...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Print...</source>
         <translation>&amp;Печать...</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>New &amp;Tab</source>
         <translation>Новая &amp;вкладка</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&amp;Close Tab</source>
         <translation>&amp;Закрыть вкладку</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Quit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>CTRL+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Copy selected Text</source>
         <translation>&amp;Копировать выделенный текст</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Find in Text...</source>
         <translation>П&amp;оиск в тексте...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Find</source>
         <translation>&amp;Поиск</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Find &amp;Next</source>
         <translation>Найти &amp;следующее</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Find &amp;Previous</source>
         <translation>Найти &amp;предыдущее</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Preferences...</source>
         <translation>Настройки...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom &amp;in</source>
         <translation>У&amp;величить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Zoom &amp;out</source>
         <translation>У&amp;меньшить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Normal &amp;Size</source>
         <translation>Нормальный р&amp;азмер</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Ctrl+0</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>ALT+C</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ALT+I</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ALT+O</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ALT+S</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Go</source>
         <translation>&amp;Перейти</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Home</source>
         <translation>&amp;Домой</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ALT+Home</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Back</source>
         <translation>&amp;Назад</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Forward</source>
         <translation>&amp;Вперёд</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Sync with Table of Contents</source>
         <translation>Синхронизировать с оглавлением</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Sync</source>
         <translation>Синхронизировать</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Next Page</source>
         <translation>Следующая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+Alt+Right</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Previous Page</source>
         <translation>Предыдущая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+Alt+Left</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Закладки</translation>
     </message>
     <message>
-        <location line="+592"/>
         <source>Could not register file &apos;%1&apos;: %2</source>
         <translation>Не удалось зарегистрировать файл &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="-590"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>About...</source>
         <translation>О программе...</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Navigation Toolbar</source>
         <translation>Панель навигации</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+M</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Toolbars</source>
         <translation>Панели инструментов</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Filter Toolbar</source>
         <translation>Панель фильтров</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Filtered by:</source>
         <translation>Отфильтровано по:</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Address Toolbar</source>
         <translation>Панель адреса</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Address:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Could not find the associated content item.</source>
         <translation>Не удалось найти элемент, связанный с содержанием.</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
     <message>
-        <location line="+175"/>
         <source>Updating search index</source>
         <translation>Обновление поискового индекса</translation>
     </message>
@@ -787,48 +782,38 @@ Reason:
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+252"/>
-        <location line="+44"/>
         <source>Add Documentation</source>
         <translation>Добавить документацию</translation>
     </message>
     <message>
-        <location line="-44"/>
         <source>Qt Compressed Help Files (*.qch)</source>
         <translation>Сжатые файлы справки Qt (*.qch)</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>The namespace %1 is already registered!</source>
         <translation>Пространство имён %1 уже зарегистрировано!</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The specified file is not a valid Qt Help File!</source>
         <translation>Указанный файл не является корректным файлом справки Qt!</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Remove Documentation</source>
         <translation>Удалить документацию</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source>
         <translation>Некоторые открытые в Qt Assistant документы ссылаются на документацию, которую вы пытаетесь удалить. Её удаление приведёт к закрытию этих документов.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>OK</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Use custom settings</source>
         <translation>Использовать индивидуальные настройки</translation>
     </message>
@@ -836,117 +821,94 @@ Reason:
 <context>
     <name>PreferencesDialogClass</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
-        <location/>
         <source>Font settings:</source>
         <translation>Настройки шрифта:</translation>
     </message>
     <message>
-        <location/>
         <source>Browser</source>
         <translation>Обозреватель</translation>
     </message>
     <message>
-        <location/>
         <source>Application</source>
         <translation>Приложение</translation>
     </message>
     <message>
-        <location/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location/>
         <source>Filter:</source>
         <translation>Фильтр:</translation>
     </message>
     <message>
-        <location/>
         <source>Attributes:</source>
         <translation>Атрибуты:</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Documentation</source>
         <translation>Документация</translation>
     </message>
     <message>
-        <location/>
         <source>Registered Documentation:</source>
         <translation>Зарегистрированная документация:</translation>
     </message>
     <message>
-        <location/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location/>
         <source>Homepage</source>
         <translation>Стартовая страница</translation>
     </message>
     <message>
-        <location/>
         <source>Current Page</source>
         <translation>Текущая страница</translation>
     </message>
     <message>
-        <location/>
         <source>Restore to default</source>
         <translation>Страница по умолчанию</translation>
     </message>
     <message>
-        <location/>
         <source>On help start:</source>
         <translation>При запуске:</translation>
     </message>
     <message>
-        <location/>
         <source>Show my home page</source>
         <translation>Отобразить стартовую страницу</translation>
     </message>
     <message>
-        <location/>
         <source>Show a blank page</source>
         <translation>Отобразить пустую страницу</translation>
     </message>
     <message>
-        <location/>
         <source>Show my tabs from last session</source>
         <translation>Восстановить предыдущую сессиию</translation>
     </message>
     <message>
-        <location/>
         <source>Blank Page</source>
         <translation>Пустая страница</translation>
     </message>
@@ -954,12 +916,10 @@ Reason:
 <context>
     <name>RemoteControl</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="+165"/>
         <source>Debugging Remote Control</source>
         <translation>Отладочное удалённое управление</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Received Command: %1 %2</source>
         <translation>Получена команда: %1 %2</translation>
     </message>
@@ -967,22 +927,18 @@ Reason:
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+210"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy &amp;Link Location</source>
         <translation>Копировать &amp;адрес ссылки</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Open Link in New Tab</source>
         <translation>Открыть ссылку в новой вкладке</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
@@ -990,27 +946,22 @@ Reason:
 <context>
     <name>TopicChooser</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="+53"/>
         <source>Choose a topic for &lt;b&gt;%1&lt;/b&gt;:</source>
         <translation>Выберите раздел для &lt;b&gt;%1&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.ui"/>
         <source>Choose Topic</source>
         <translation>Выбор раздела</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Topics</source>
         <translation>&amp;Разделы</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Display</source>
         <translation>&amp;Показать</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts
index 72f3532..89977b1 100644
--- a/translations/designer_ru.ts
+++ b/translations/designer_ru.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;Предыдущий</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Next</source>
         <translation>&amp;Следующий</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>&amp;Case sensitive</source>
         <translation>&amp;Учитывать регистр</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Whole &amp;words</source>
         <translation>Слова &amp;целиком</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;Поиск с начала</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>Вставить ссылку</translation>
     </message>
     <message>
-        <location/>
         <source>Title:</source>
         <translation>Заголовок:</translation>
     </message>
     <message>
-        <location/>
         <source>URL:</source>
         <translation>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>Дополнительные шрифты</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; не является файлом.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The font file &apos;%1&apos; does not have read permissions.</source>
         <translation>Файл шрифтов &apos;%1&apos; не доступен для чтения.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The font file &apos;%1&apos; is already loaded.</source>
         <translation>Файл шрифтов &apos;%1&apos;уже загружен.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The font file &apos;%1&apos; could not be loaded.</source>
         <translation>Файл шрифтов &apos;%1&apos; не может быть загружен.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&apos;%1&apos; is not a valid font id.</source>
         <translation>&apos;%1&apos; не является корректным идентификатором шрифта.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>There is no loaded font matching the id &apos;%1&apos;.</source>
         <translation>Нет загруженного шрифта, соответствующего идентификатору &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>The font &apos;%1&apos; (%2) could not be unloaded.</source>
         <translation>Шрифт &apos;%1&apos; (%2) не может быть выгружен.</translation>
     </message>
@@ -96,52 +80,42 @@
 <context>
     <name>AppFontWidget</name>
     <message>
-        <location line="+26"/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Add font files</source>
         <translation>Добавить файлы шрифтов</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Remove current font file</source>
         <translation>Удалить текущий файл шрифта</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Remove all font files</source>
         <translation>Удалить все файлы шрифтов</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Add Font Files</source>
         <translation>Добавить файлы шрифтов</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font files (*.ttf)</source>
         <translation>Файлы шрифтов (*.ttf)</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Error Adding Fonts</source>
         <translation>Ошибка добавления шрифтов</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Error Removing Fonts</source>
         <translation>Ошибка удаления шрифтов</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Remove Fonts</source>
         <translation>Удалить шрифты</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Would you like to remove all fonts?</source>
         <translation>Желаете удалить все шрифты?</translation>
     </message>
@@ -149,12 +123,10 @@
 <context>
     <name>AppearanceOptionsWidget</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>User Interface Mode</source>
         <translation>Режим пользовательского интерфейса</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>Невозможно отправить запрос: Qt Assistant не отвечает.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>The binary &apos;%1&apos; does not exist.</source>
         <translation>Исполняемый файл &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unable to launch assistant (%1).</source>
         <translation>Невозможно запустить Qt Assistant (%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>Пустая</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Solid</source>
         <translation>Сплошная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 1</source>
         <translation>Плотность 1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 2</source>
         <translation>Плотность 2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 3</source>
         <translation>Плотность 3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 4</source>
         <translation>Плотность 4</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 5</source>
         <translation>Плотность 5</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 6</source>
         <translation>Плотность 6</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 7</source>
         <translation>Плотность 7</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Horizontal</source>
         <translation>Горизонтальная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Vertical</source>
         <translation>Вертикальная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cross</source>
         <translation>Крестообразная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backward diagonal</source>
         <translation>Обратная диагональ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Forward diagonal</source>
         <translation>Диагональ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Crossing diagonal</source>
         <translation>Пересекающиеся диагонали</translation>
     </message>
     <message>
-        <location line="+93"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>[%1, %2]</source>
         <translation>[%1, %2]</translation>
     </message>
@@ -273,350 +224,269 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="+208"/>
-        <location line="+258"/>
         <source>Change signal</source>
         <translation>Сменить сигнал</translation>
     </message>
     <message>
-        <location line="-256"/>
-        <location line="+268"/>
         <source>Change slot</source>
         <translation>Сменить слот</translation>
     </message>
     <message>
-        <location line="-220"/>
         <source>Change signal-slot connection</source>
         <translation>Изменить соединение сигнал-слот</translation>
     </message>
     <message>
-        <location line="+234"/>
         <source>Change sender</source>
         <translation>Сменить отправителя</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Change receiver</source>
         <translation>Сменить получателя</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+221"/>
         <source>Create button group</source>
         <translation>Создать группу кнопок</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Break button group</source>
         <translation>Разбить группу кнопок</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Break button group &apos;%1&apos;</source>
         <translation>Разбить группу кнопок &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Add buttons to group</source>
         <translation>Добавить кнопки в группу</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="+458"/>
         <source>Add &apos;%1&apos; to &apos;%2&apos;</source>
         <extracomment>Command description for adding buttons to a QButtonGroup</extracomment>
         <translation>Добавить &apos;%1&apos; в &apos;%2&apos;</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Remove buttons from group</source>
         <translation>Удалить кнопки из группы</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>Удалить &apos;%1&apos; из &apos;%2&apos;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+143"/>
         <source>Add connection</source>
         <translation>Добавить соединение</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Adjust connection</source>
         <translation>Настроить соединение</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Delete connections</source>
         <translation>Удалить соединения</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Change source</source>
         <translation>Сменить источник</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Change target</source>
         <translation>Сменить приёмника</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>Преобразовать %1/&apos;%2&apos; в %3</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="+149"/>
         <source>Insert &apos;%1&apos;</source>
         <translation>Вставить &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+133"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished">Изменить порядок удалённости &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Raise &apos;%1&apos;</source>
         <translation>Поднять &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Lower &apos;%1&apos;</source>
         <translation>Опустить &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Delete &apos;%1&apos;</source>
         <translation>Удалить &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+119"/>
         <source>Reparent &apos;%1&apos;</source>
         <translation>Сменить владельца у &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Promote to custom widget</source>
         <translation type="unfinished">Преобразовать в пользовательский виджет</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Demote from custom widget</source>
         <translation type="unfinished">Преобразовать из пользовательского виджета</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Lay out using grid</source>
         <translation>Скомпоновать, используя сетку</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lay out vertically</source>
         <translation>Скомпоновать по вертикали</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lay out horizontally</source>
         <translation>Скомпоновать по горизонтали</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Break layout</source>
         <translation>Разбить компоновку</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>Simplify Grid Layout</source>
         <translation type="unfinished">Упрощённая компоновка по сетке</translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location line="+235"/>
-        <location line="+78"/>
         <source>Move Page</source>
         <translation>Переместить страницу</translation>
     </message>
     <message>
-        <location line="-279"/>
-        <location line="+123"/>
-        <location line="+188"/>
-        <location line="+666"/>
         <source>Delete Page</source>
         <translation>Удалить страницу</translation>
     </message>
     <message>
-        <location line="-939"/>
-        <location line="+123"/>
         <source>Page</source>
         <translation>Страница</translation>
     </message>
     <message>
-        <location line="+860"/>
         <source>page</source>
         <translation>страница</translation>
     </message>
     <message>
-        <location line="-978"/>
-        <location line="+123"/>
-        <location line="+186"/>
-        <location line="+667"/>
         <source>Insert Page</source>
         <translation>Вставить страницу</translation>
     </message>
     <message>
-        <location line="-647"/>
         <source>Change Tab order</source>
         <translation>Изменить последовательность переключений</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Create Menu Bar</source>
         <translation>Создать панель меню</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Delete Menu Bar</source>
         <translation>Удалить панель меню</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Create Status Bar</source>
         <translation>Создать строку состояния</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Delete Status Bar</source>
         <translation>Удалить строку состояния</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Add Tool Bar</source>
         <translation>Добавить панель инструментов</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Add Dock Window</source>
         <translation type="unfinished">Добавить прикрепляемое окно</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Adjust Size of &apos;%1&apos;</source>
         <translation>Подогнать размер &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Change Form Layout Item Geometry</source>
         <translation type="unfinished">Изменить геометрию элементов компоновки столбцами</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>Change Layout Item Geometry</source>
         <translation type="unfinished">Изменить геометрию элементов компоновки</translation>
     </message>
     <message>
-        <location line="+138"/>
         <source>Delete Subwindow</source>
         <translation>Удалить дочернее окно</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Insert Subwindow</source>
         <translation>Вставить дочернее окно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>subwindow</source>
         <translation>дочернее окно</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Subwindow</source>
         <translation>Дочернее окно</translation>
     </message>
     <message>
-        <location line="+391"/>
         <source>Change Table Contents</source>
         <translation>Изменить содержимое таблицы</translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Change Tree Contents</source>
         <translation>Изменить содержимое дерева</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location line="+146"/>
         <source>Add action</source>
         <translation>Добавить действие</translation>
     </message>
     <message>
-        <location line="-120"/>
-        <location line="+126"/>
         <source>Remove action</source>
         <translation>Удалить действие</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Add menu</source>
         <translation>Добавить меню</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Remove menu</source>
         <translation>Удалить меню</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Create submenu</source>
         <translation>Создать дочернее меню</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Delete Tool Bar</source>
         <translation>Удалить панель инструментов</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>Изменить компоновку &apos;%1&apos; с %2 на %3</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="+1194"/>
         <source>Set action text</source>
         <translation>Установить текст действия</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert action</source>
         <translation>Вставить действие</translation>
     </message>
     <message>
-        <location line="+89"/>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+915"/>
         <source>Move action</source>
         <translation>Переместить действие</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-432"/>
         <source>Change Title</source>
         <translation>Изменить заголовок</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Insert Menu</source>
         <translation>Вставить меню</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>Изменено &apos;%1&apos; у &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Changed &apos;%1&apos; of %n objects</source>
         <translation>
             <numerusform>Изменено &apos;%1&apos; у %n объекта</numerusform>
@@ -625,12 +495,10 @@
         </translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Reset &apos;%1&apos; of &apos;%2&apos;</source>
         <translation>Восстановлено &apos;%1&apos; у &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Reset &apos;%1&apos; of %n objects</source>
         <translation>
             <numerusform>Восстановлено &apos;%1&apos; у %n объекта</numerusform>
@@ -639,12 +507,10 @@
         </translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Add dynamic property &apos;%1&apos; to &apos;%2&apos;</source>
         <translation>Добавлено динамическое свойство &apos;%1&apos; &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Add dynamic property &apos;%1&apos; to %n objects</source>
         <translation>
             <numerusform>Добавлено динамическое свойство &apos;%1&apos; %n объекту</numerusform>
@@ -653,12 +519,10 @@
         </translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Remove dynamic property &apos;%1&apos; from &apos;%2&apos;</source>
         <translation>Удалено динамическое свойство &apos;%1&apos; у &apos;%2&apos;</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Remove dynamic property &apos;%1&apos; from %n objects</source>
         <translation>
             <numerusform>Удалено динамическое свойство &apos;%1&apos; у %n объекта</numerusform>
@@ -667,12 +531,10 @@
         </translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scriptcommand.cpp" line="+55"/>
         <source>Change script</source>
         <translation>Изменить сценарий</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="+202"/>
         <source>Change signals/slots</source>
         <translation>Изменить сигналы/слоты</translation>
     </message>
@@ -680,22 +542,18 @@
 <context>
     <name>ConnectDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui"/>
         <source>Configure Connection</source>
         <translation>Настройка соединения</translation>
     </message>
     <message>
-        <location/>
         <source>GroupBox</source>
         <translation>GroupBox</translation>
     </message>
     <message>
-        <location/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
     <message>
-        <location/>
         <source>Show signals and slots inherited from QWidget</source>
         <translation>Показывать сигналы и слоты, унаследованные от QWidget</translation>
     </message>
@@ -703,17 +561,14 @@
 <context>
     <name>ConnectionDelegate</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="+644"/>
         <source>&lt;object&gt;</source>
         <translation>&lt;объект&gt;</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>&lt;signal&gt;</source>
         <translation>&lt;сигнал&gt;</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&lt;slot&gt;</source>
         <translation>&lt;слот&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>Стандартное (96 x 96)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Greenphone (179 x 185)</source>
         <extracomment>Embedded device screen resolution</extracomment>
         <translation>Greenphone (179 x 185)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>High (192 x 192)</source>
         <extracomment>Embedded device high definition screen resolution</extracomment>
         <translation>Высокое (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 line="+10"/>
         <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>Этот файл содержит верхнеуровневые разделители.&lt;br&gt;Они &lt;b&gt;НЕ&lt;/b&gt; были сохранены в форме.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Perhaps you forgot to create a layout?</source>
         <translation>Возможно, вы забыли создать компоновщик?</translation>
     </message>
     <message>
-        <location line="+173"/>
         <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
         <translation>Некорректный файл UI: Отсутствует корневой элемент &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>При чтении файла UI в строке %1 позиции %2 возникла ошибка: %3</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>This file cannot be read because it was created using %1.</source>
         <translation>Не удалось прочитать файл, так как он был создан с использованием %1.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>This file was created using Designer from Qt-%1 and cannot be read.</source>
         <translation>Не удалось прочитать файл, так как он был создан с использованием Designer из Qt-%1.</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>The converted file could not be read.</source>
         <translation>Не удалось прочитать преобразованный файл.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer.</source>
         <translation>Этот файл был создан с использованием Designer из Qt-%1 и будет преобразован в новый формат.</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>Старая форма была изменена, но вы можете сохранить форму под новым именем.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>This file was created using Designer from Qt-%1 and could not be read:
 %2</source>
         <translation>Не удалось прочитать файл, так как он был создан с использованием Designer из Qt-%1:
 %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>Пожалуйста, пропустите его через &lt;b&gt;uic3&amp;nbsp;-convert&lt;/b&gt; для преобразования в формат ui для Qt-4.</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>This file cannot be read because the extra info extension failed to load.</source>
         <translation>Не удалось прочитать файл, так как возникла ошибка при загрузке расширения дополнительной информации.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qsimpleresource.cpp" line="+339"/>
         <source>Custom Widgets</source>
         <translation>Пользовательские виджеты</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Promoted Widgets</source>
         <translation type="unfinished">Преобразованные виджеты</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="+682"/>
         <source>Unable to launch %1.</source>
         <translation>Невозможно запустить %1.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 timed out.</source>
         <translation>%1 время ожидания истекло.</translation>
     </message>
@@ -832,12 +667,10 @@
 <context>
     <name>DesignerMetaEnum</name>
     <message>
-        <location line="-513"/>
         <source>%1 is not a valid enumeration value of &apos;%2&apos;.</source>
         <translation>%1 не является корректным перечислением типа &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>Не удалось преобразовать &apos;%1&apos; к значению перечисления &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>Не удалось преобразовать &apos;%1&apos; к флаговому значению типа &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; не является числом.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>An invalid tag &lt;%1&gt; was encountered.</source>
         <translation>Обнаружен некоррекнтый тэг &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;Шрифт</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Point Size</source>
         <translation>&amp;Размер</translation>
     </message>
     <message>
-        <location/>
         <source>Style</source>
         <translation>Начертание</translation>
     </message>
     <message>
-        <location/>
         <source>Device DPI</source>
         <translation>DPI устройства</translation>
     </message>
     <message>
-        <location/>
         <source>Name</source>
         <translation>Название</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>Не удалось загрузить файл изображения &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
         <translation>Каталог &apos;%1&apos; не содержит файла настроек обложки.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
         <translation>Не удалось открыть файл настроек обложки &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
         <translation>Не удалось прочитать файл настроек обложки &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Syntax error: %1</source>
         <translation>Синтаксическая ошибка: %1</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>The skin &quot;up&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Отсутствует файл изображения &quot;up&quot; обложки &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The skin &quot;down&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Отсутствует файл изображения &quot;down&quot; обложки &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The skin &quot;closed&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Отсутствует файл изображения обложки &quot;closed&quot; &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The skin cursor image file &apos;%1&apos; does not exist.</source>
         <translation>Отсутствует файл изображения курсора обложки &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Syntax error in area definition: %1</source>
         <translation>Синтаксическая ошибка в определении области: %1</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Mismatch in number of areas, expected %1, got %2.</source>
         <translation>Несоответствие количества областей: ожидалось %1, найдено %2.</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;Шрифт&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;Стиль&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;Разрешение&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 type="unfinished">Оформление портативных устройств</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Device Profiles</source>
         <extracomment>EmbeddedOptionsControl group box&quot;</extracomment>
         <translation>Профили устройств</translation>
@@ -977,27 +788,22 @@
 <context>
     <name>FontPanel</name>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Writing system</source>
         <translation>Система &amp;письма</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Family</source>
         <translation>&amp;Шрифт</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Style</source>
         <translation>&amp;Начертание</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Point size</source>
         <translation>&amp;Размер</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>По умолчанию</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>NoAntialias</source>
         <translation>Без сглаживания</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PreferAntialias</source>
         <translation>Сглаживание, если возможно</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>Antialiasing</source>
         <translation>Сглаживание</translation>
     </message>
@@ -1028,43 +830,44 @@
 <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</extracomment>
+        <extracomment>Parsing layout stretch values
+----------
+Parsing layout stretch values
+----------
+Parsing layout stretch values</extracomment>
         <translation>Некорректный коэффициент растяжения для &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</extracomment>
+        <extracomment>Parsing grid layout minimum size values
+----------
+Parsing grid layout minimum size values
+----------
+Parsing grid layout minimum size values</extracomment>
         <translation>Некорректный минимальный размер для &apos;%1&apos;: &apos;%2&apos;</translation>
     </message>
 </context>
 <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>Масштаб предпросмотра</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Default Zoom</source>
         <translation>Масштаб по умолчанию</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Forms</source>
         <extracomment>Tab in preferences dialog</extracomment>
         <translation>Формы</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Default Grid</source>
         <translation>Сетка по умолчанию</translation>
     </message>
@@ -1072,37 +875,30 @@
 <context>
     <name>FormLayoutRowDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui"/>
         <source>Add Form Layout Row</source>
         <translation type="unfinished">Добавление строки  компоновщика формы</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Label text:</source>
         <translation>Текст &amp;метки:</translation>
     </message>
     <message>
-        <location/>
         <source>Field &amp;type:</source>
         <translation>&amp;Тип поля:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Field name:</source>
         <translation>Имя п&amp;оля:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Buddy:</source>
         <translation>П&amp;артнёр:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Row:</source>
         <translation>&amp;Строка:</translation>
     </message>
     <message>
-        <location/>
         <source>Label &amp;name:</source>
         <translation>Имя м&amp;етки:</translation>
     </message>
@@ -1110,12 +906,10 @@
 <context>
     <name>FormWindow</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="+1754"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Неожиданный элемент &lt;%1&gt;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error while pasting clipboard contents at line %1, column %2: %3</source>
         <translation>Ошибка вставки содержимого из буфера обмена в строке %1, позиции %2: %3</translation>
     </message>
@@ -1123,62 +917,50 @@
 <context>
     <name>FormWindowSettings</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui"/>
         <source>Form Settings</source>
         <translation>Настройки формы</translation>
     </message>
     <message>
-        <location/>
         <source>Layout &amp;Default</source>
         <translation>Компоновка по &amp;умолчанию</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Spacing:</source>
         <translation>&amp;Отступ:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Margin:</source>
         <translation>&amp;Границы:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Layout Function</source>
         <translation>&amp;Функция компоновки</translation>
     </message>
     <message>
-        <location/>
         <source>Ma&amp;rgin:</source>
         <translation>Г&amp;раницы:</translation>
     </message>
     <message>
-        <location/>
         <source>Spa&amp;cing:</source>
         <translation>О&amp;тступ:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Author</source>
         <translation>&amp;Автор</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Include Hints</source>
         <translation>&amp;Подключить подсказки</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Pixmap Function</source>
         <translation type="unfinished">&amp;Загрузчик изображений</translation>
     </message>
     <message>
-        <location/>
         <source>Grid</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location/>
         <source>Embedded Design</source>
         <translation type="unfinished">Оформление портативных устройств</translation>
     </message>
@@ -1186,7 +968,6 @@
 <context>
     <name>IconSelector</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="+352"/>
         <source>All Pixmaps (</source>
         <translation>Растровые изображения (</translation>
     </message>
@@ -1194,7 +975,6 @@
 <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 Пикт Выделена откл</translation>
@@ -1203,33 +983,27 @@
 <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>Главное</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tools</source>
         <translation>Инструменты</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
@@ -1237,52 +1011,42 @@
 <context>
     <name>NewForm</name>
     <message>
-        <location filename="../tools/designer/src/designer/newform.cpp" line="+79"/>
         <source>C&amp;reate</source>
         <translation>&amp;Создать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Recent</source>
         <translation>Последние</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Recent Forms</source>
         <translation>&amp;Последние формы</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>Read error</source>
         <translation>Ошибка чтения</translation>
     </message>
     <message>
-        <location line="-100"/>
         <source>New Form</source>
         <translation>Новая форма</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Show this Dialog on Startup</source>
         <translation>Показывать диалог при старте</translation>
     </message>
     <message>
-        <location line="+128"/>
         <source>A temporary form file could not be created in %1.</source>
         <translation>Временный файл формы не может быть создан в %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary form file %1 could not be written.</source>
         <translation>Временный файл формы %1 не может быть записан.</translation>
     </message>
@@ -1290,22 +1054,18 @@
 <context>
     <name>ObjectInspectorModel</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="+360"/>
         <source>Object</source>
         <translation>Объект</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Class</source>
         <translation>Класс</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>separator</source>
         <translation>разделитель</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>&lt;noname&gt;</source>
         <translation>&lt;без имени&gt;</translation>
     </message>
@@ -1313,12 +1073,10 @@
 <context>
     <name>ObjectNameDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+158"/>
         <source>Change Object Name</source>
         <translation>Изменить имя объекта</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Object Name</source>
         <translation>Имя объекта</translation>
     </message>
@@ -1326,12 +1084,10 @@
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plugindialog.ui"/>
         <source>Plugin Information</source>
         <translation>Информация о модуле</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -1339,7 +1095,6 @@
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/preferencesdialog.ui"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
@@ -1347,32 +1102,26 @@
 <context>
     <name>PreviewConfigurationWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Print/Preview Configuration</source>
         <translation>Настройка печати/предпросмотра</translation>
     </message>
     <message>
-        <location/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location/>
         <source>Style sheet</source>
         <translation>Таблица стилей</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Device skin</source>
         <translation>Обложка устройства</translation>
     </message>
@@ -1380,7 +1129,6 @@
 <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>Не используется</translation>
@@ -1389,8 +1137,6 @@
 <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>Страница</translation>
     </message>
@@ -1398,59 +1144,48 @@
 <context>
     <name>QAbstractFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="+206"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Неожиданный элемент &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>Возникла ошибка при чтении файла UI в строке %1 позиции %2: %3</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
         <translation>Некорректный файл UI: отсутствует корневой элемент &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+104"/>
         <source>The creation of a widget of the class &apos;%1&apos; failed.</source>
         <translation>Не удалось создание виджета класса &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+296"/>
         <source>Attempt to add child that is not of class QWizardPage to QWizard.</source>
         <translation>Попытка добавить в QWizard дочерний виджет, который не является классом QWizardPage.</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>Попытка добавить компоновщик виджету &apos;%1&apos; (%2), у которого уже имеется компоновщик типа %3.
 Это указывает на некорректность файла UI.</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Empty widget item in %1 &apos;%2&apos;.</source>
         <translation>Пустой элемент виджета в %1 &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+680"/>
         <source>Flags property are not supported yet.</source>
         <translation>Флаговые свойства еще не поддерживаются.</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>While applying tab stops: The widget &apos;%1&apos; could not be found.</source>
         <translation>При применении позиций табуляции: не удалось найти виджет &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+908"/>
         <source>Invalid QButtonGroup reference &apos;%1&apos; referenced by &apos;%2&apos;.</source>
         <translation>&apos;%2&apos; содержит некорректную ссылку на QButtonGroup &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+511"/>
         <source>This version of the uitools library is linked without script support.</source>
         <translation>Данная версия библиотеки uitools собрана без поддержки сценариев.</translation>
     </message>
@@ -1458,12 +1193,10 @@ This indicates an inconsistency in the ui-file.</source>
 <context>
     <name>QAxWidgetPlugin</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp" line="+75"/>
         <source>ActiveX control</source>
         <translation>Элемент управления ActiveX</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>ActiveX control widget</source>
         <translation>Виджет элемента управления ActiveX</translation>
     </message>
@@ -1471,22 +1204,18 @@ This indicates an inconsistency in the ui-file.</source>
 <context>
     <name>QAxWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="+119"/>
         <source>Set Control</source>
         <translation>Установить элемент управления</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset Control</source>
         <translation type="unfinished">Удалить элемент управления</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Licensed Control</source>
         <translation>Лицензионный элемент управления</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The control requires a design-time license</source>
         <translation>Компонент требует лицензию периода разработки</translation>
     </message>
@@ -1494,68 +1223,55 @@ This indicates an inconsistency in the ui-file.</source>
 <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 type="unfinished">%1 не является преобразованным классом.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>The base class %1 is invalid.</source>
         <translation>Неверный базовый класс %1.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The class %1 already exists.</source>
         <translation>Класс %1 уже существует.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Promoted Widgets</source>
         <translation type="unfinished">Преобразованные виджеты</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>The class %1 cannot be removed</source>
         <translation>Нельзя удалить класс %1</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The class %1 cannot be removed because it is still referenced.</source>
         <translation>Нельзя удалить класс %1, так как на него ещё есть ссылки.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The class %1 cannot be renamed</source>
         <translation>Нельзя переименовать класс %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The class %1 cannot be renamed to an empty name.</source>
         <translation>Нельзя дать классу %1 пустое имя.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>There is already a class named %1.</source>
         <translation>Уже есть класс с именем %1.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Cannot set an empty include file.</source>
         <translatorcomment>перевод близко к тексту - буквальный совсем глаз режет</translatorcomment>
         <translation>Пустое имя у подключаемого файла не допустимо.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="+88"/>
         <source>Exception at line %1: %2</source>
         <translation>Исключение в строке %1: %2</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>An error occurred while running the script for %1: %2
 Script: %3</source>
         <translation>При выполнении сценария %1 возникла ошибка: %2
@@ -1565,17 +1281,14 @@ Script: %3</source>
 <context>
     <name>QDesigner</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner.cpp" line="+141"/>
         <source>%1 - warning</source>
         <translation>%1 - предупреждение</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>Это приложение не может быть использовано для консольной версии Qt</translation>
     </message>
@@ -1583,248 +1296,194 @@ Script: %3</source>
 <context>
     <name>QDesignerActions</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="+130"/>
         <source>Saved %1.</source>
         <translation>Сохранено %1.</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>Edit Widgets</source>
         <translation>Изменение виджетов</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Minimize</source>
         <translation>&amp;Свернуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bring All to Front</source>
         <translation>Перенести все назад</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Preferences...</source>
         <translation>Настройки...</translation>
     </message>
     <message>
-        <location line="+322"/>
         <source>Clear &amp;Menu</source>
         <translation>Очистить &amp;меню</translation>
     </message>
     <message>
-        <location line="-247"/>
         <source>CTRL+SHIFT+S</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+127"/>
         <source>CTRL+R</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>CTRL+M</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Qt Designer &amp;Help</source>
         <translation>&amp;Справка по Qt Designer</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Current Widget Help</source>
         <translation>Справка по виджету</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>What&apos;s New in Qt Designer?</source>
         <translation>Что нового в Qt Designer?</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>About Plugins</source>
         <translation>О модулях</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+601"/>
         <source>About Qt Designer</source>
         <translation>О Qt Designer</translation>
     </message>
     <message>
-        <location line="-595"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location line="+121"/>
-        <location line="+197"/>
         <source>Open Form</source>
         <translation>Открыть форму</translation>
     </message>
     <message>
-        <location line="-196"/>
-        <location line="+37"/>
-        <location line="+160"/>
         <source>Designer UI files (*.%1);;All Files (*)</source>
         <translation>UI файлы Qt Designer (*.%1);;Все файлы (*)</translation>
     </message>
     <message>
-        <location line="-644"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 уже существует.
 Хотите заменить его?</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Additional Fonts...</source>
         <translation>Дополнительные шрифты...</translation>
     </message>
     <message>
-        <location line="+327"/>
         <source>&amp;Recent Forms</source>
         <translation>&amp;Последние формы</translation>
     </message>
     <message>
-        <location line="+202"/>
         <source>Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Feature not implemented yet!</source>
         <translation>Возможность ещё не реализована!</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Read error</source>
         <translation>Ошиька чтения</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1
 Do you want to update the file location or generate a new form?</source>
         <translation>%1
 Вы хотите обновить расположение файла или генерировать новую форму?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Update</source>
         <translation>&amp;Обновить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;New Form</source>
         <translation>&amp;Новая форма</translation>
     </message>
     <message>
-        <location line="+77"/>
-        <location line="+40"/>
         <source>Save Form?</source>
         <translation>Сохранить форму?</translation>
     </message>
     <message>
-        <location line="-39"/>
         <source>Could not open file</source>
         <translation>Невозможно открыть файл</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Select New File</source>
         <translation>Выбрать новый файл</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Could not write file</source>
         <translation>Невозможно записать файл</translation>
     </message>
     <message>
-        <location line="+201"/>
         <source>&amp;Close Preview</source>
         <translation>&amp;Закрыть предпросмотр</translation>
     </message>
     <message>
-        <location line="-929"/>
         <source>&amp;New...</source>
         <translation>&amp;Новый...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save &amp;As...</source>
         <translation>Сохранить &amp;как...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save A&amp;ll</source>
         <translation>Сохранить &amp;все</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save As &amp;Template...</source>
         <translation>Сохранить как &amp;шаблон...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+925"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="-924"/>
         <source>Save &amp;Image...</source>
         <translation>Сохранить &amp;Изображение...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Print...</source>
         <translation>&amp;Печать...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>View &amp;Code...</source>
         <translation>Показать &amp;код...</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>ALT+CTRL+S</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+370"/>
-        <location line="+248"/>
         <source>Save Form As</source>
         <translation>Сохранить форму как</translation>
     </message>
     <message>
-        <location line="+429"/>
         <source>Preview failed</source>
         <translation>Ошибка предпросмотра</translation>
     </message>
     <message>
-        <location line="-575"/>
         <source>Code generation failed</source>
         <translation>Ошибка генерации кода</translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>The file %1 could not be opened.
 Reason: %2
 Would you like to retry or select a different file?</source>
@@ -1833,7 +1492,6 @@ Would you like to retry or select a different file?</source>
 Вы хотите повторить или выбрать другой файл?</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>It was not possible to write the entire file %1 to disk.
 Reason:%2
 Would you like to retry?</source>
@@ -1842,55 +1500,42 @@ Would you like to retry?</source>
 Желаете повторить?</translation>
     </message>
     <message>
-        <location line="+158"/>
-        <location line="+34"/>
         <source>Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+23"/>
         <source>The backup file %1 could not be written.</source>
         <translation>Не удалось записать файл резервной копии %1.</translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>The backup directory %1 could not be created.</source>
         <translation>Не удалось создать каталог резервных копий %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary backup directory %1 could not be created.</source>
         <translation>Не удалось создать временный каталог резервных копий %1.</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Image files (*.%1)</source>
         <translation>Файлы изображений (*.%1)</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location line="+17"/>
         <source>Save Image</source>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Saved image %1.</source>
         <translation>Сохранить изображение %1.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The file %1 could not be written.</source>
         <translation>Файл %1 не может быть записан.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Please close all forms to enable the loading of additional fonts.</source>
         <translation>Пожалуйста закройте все формы, чтобы разрешить загрузку дополнительных шрифтов.</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Printed %1.</source>
         <translation>Распечатано %1.</translation>
     </message>
@@ -1898,7 +1543,6 @@ Would you like to retry?</source>
 <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>Оформление</translation>
@@ -1907,17 +1551,14 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerAppearanceOptionsWidget</name>
     <message>
-        <location line="-53"/>
         <source>Docked Window</source>
         <translation>Всё в одном окне верхнего уровня</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Multiple Top-Level Windows</source>
         <translation>Множество окон верхнего уровня</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Toolwindow Font</source>
         <translation>Шрифт окна инструментов</translation>
     </message>
@@ -1925,22 +1566,18 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerAxWidget</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="-71"/>
         <source>Reset control</source>
         <translation type="unfinished">Сбросить элемент управления</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Set control</source>
         <translation>Установить элемент управления</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp" line="+179"/>
         <source>Control loaded</source>
         <translation>Элемент управления загружен</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 type="unfinished">Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 &quot;%3&quot;.</translation>
     </message>
@@ -1948,17 +1585,14 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="+89"/>
         <source>Script errors occurred:</source>
         <translation>Возникла ошибка сценария:</translation>
     </message>
     <message>
-        <location line="+307"/>
         <source>The preview failed to build.</source>
         <translation>Не удалось создать предпросмотр.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Designer</source>
         <translation>Qt Designer</translation>
     </message>
@@ -1966,22 +1600,18 @@ Would you like to retry?</source>
 <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>Сохранить форму?</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Do you want to save the changes to this document before closing?</source>
         <translation>Документ был изменен, хотите сохранить изменения?</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>If you don&apos;t save, your changes will be lost.</source>
         <translation>Если вы не сохраните, ваши изменения будут потеряны.</translation>
     </message>
@@ -1989,38 +1619,30 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="-1179"/>
         <source>Type Here</source>
         <translation>Пишите здесь</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Add Separator</source>
         <translation>Добавить разделитель</translation>
     </message>
     <message>
-        <location line="+371"/>
         <source>Insert separator</source>
         <translation>Вставить разделитель</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Remove separator</source>
         <translation>Удалить разделитель</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Удалить действие &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <location line="+648"/>
         <source>Add separator</source>
         <translation>Добавить разделитель</translation>
     </message>
     <message>
-        <location line="-348"/>
         <source>Insert action</source>
         <translation>Вставить действие</translation>
     </message>
@@ -2028,22 +1650,18 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerMenuBar</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-375"/>
         <source>Type Here</source>
         <translation>Пишите здесь</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Remove Menu &apos;%1&apos;</source>
         <translation>Удалить меню &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Remove Menu Bar</source>
         <translation>Удалить панель меню</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
@@ -2051,37 +1669,30 @@ Would you like to retry?</source>
 <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>Обнаружена ошибка XML при разборе XML пользовательского виджета %1: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>A required attribute (&apos;%1&apos;) is missing.</source>
         <translation>Отсутствует необходимый атрибут (&apos;%1&apos;).</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>An invalid property specification (&apos;%1&apos;) was encountered. Supported types: %2</source>
         <translation>Обнаружена неверная спецификация (&apos;%1&apos;) свойства. Поддерживаются типы: %2</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>&apos;%1&apos; is not a valid string property specification.</source>
         <translation>&apos;%1&apos; не является корректной спецификацией строкового свойства.</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>XML пользовательского виджета %1 не содержит элементов &lt;widget&gt; и &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The class attribute for the class %1 is missing.</source>
         <translation>Отсутствует атрибут для класса %1.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The class attribute for the class %1 does not match the class name %2.</source>
         <translation>Атрибут для класса %1 не совпадает с именем класса %2.</translation>
     </message>
@@ -2089,7 +1700,6 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_propertysheet.cpp" line="+758"/>
         <source>Dynamic Properties</source>
         <translation>Динамические свойства</translation>
     </message>
@@ -2097,31 +1707,26 @@ Would you like to retry?</source>
 <context>
     <name>QDesignerResource</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+461"/>
         <source>The layout type &apos;%1&apos; is not supported, defaulting to grid.</source>
         <translation>Компоновка типа &apos;%1&apos; не поддерживается, заменена на компоновку сеткой.</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>Контейнерное расширение виджета &apos;%1&apos; (%2) возвратило виджет, который не управляется Qt Designer &apos;%3&apos; (%4), при запросе страницы №%5.
 Страницы контейнера должны быть добавлены указанием их в XML, который возвращается методом domXml() пользовательского виджета.</translation>
     </message>
     <message>
-        <location line="+545"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <extracomment>Parsing clipboard contents</extracomment>
         <translation>Неожиданный элемент &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>Ошибка вставки содержимого буфера обмена в строку %1, позицию %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>Ошибка вставки содержимого буфера обмена: отсутствует корневой элемент &lt;ui&gt;.</translation>
@@ -2130,12 +1735,10 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>Не удалось создать временный путь %1.</translation>
     </message>
     <message>
-        <location line="+184"/>
         <source>An error has been encountered while parsing device profile XML: %1</source>
         <translation>Обнаружена ошибка при разборе XML профиля устройства: %1</translation>
     </message>
@@ -2143,32 +1746,26 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerToolWindow</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="+190"/>
         <source>Property Editor</source>
         <translation>Редактор свойств</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Action Editor</source>
         <translation>Редактор действий</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Object Inspector</source>
         <translation>Инспектор объектов</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Resource Browser</source>
         <translation>Обозреватель ресурсов</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Signal/Slot Editor</source>
         <translation>Редактор Сигналов/Слотов</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Widget Box</source>
         <translation>Панель виджетов</translation>
     </message>
@@ -2176,47 +1773,38 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWorkbench</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="+199"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>F&amp;orm</source>
         <translation>Ф&amp;орма</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Preview in</source>
         <translation>Предпросмотр в</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Toolbars</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location line="+466"/>
         <source>Save Forms?</source>
         <translation>Сохранить форму?</translation>
     </message>
     <message numerus="yes">
-        <location line="+1"/>
         <source>There are %n forms with unsaved changes. Do you want to review these changes before quitting?</source>
         <translation>
             <numerusform>Имеется %n форма с несохранёнными изменениями. Желаете просмотреть изменения перед выходом?</numerusform>
@@ -2225,52 +1813,42 @@ Container pages should only be added by specifying them in XML returned by the d
         </translation>
     </message>
     <message>
-        <location line="-496"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location line="+204"/>
         <source>Widget Box</source>
         <translation>Панель виджетов</translation>
     </message>
     <message>
-        <location line="+293"/>
         <source>If you do not review your documents, all your changes will be lost.</source>
         <translation type="unfinished">Если не просматривать изменения, все изменения будут потеряны.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Discard Changes</source>
         <translation>Отменить изменения</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Review Changes</source>
         <translation>Показать изменения</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>Backup Information</source>
         <translation type="unfinished">Информация о резервированых копиях</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source>
         <translation>Последняя сессия Qt Designer не была завершена корректно. Остались резервные копии файлов. Желаете загрузить их?</translation>
     </message>
     <message>
-        <location line="+111"/>
         <source>The file &lt;b&gt;%1&lt;/b&gt; could not be opened.</source>
         <translation>Не удалось открыть файл &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>The file &lt;b&gt;%1&lt;/b&gt; is not a valid Designer UI file.</source>
         <translation>Файл &lt;b&gt;%1&lt;/b&gt; не является корректным UI файлом Qt Designer.</translation>
     </message>
@@ -2278,53 +1856,47 @@ Container pages should only be added by specifying them in XML returned by the d
 <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</extracomment>
+        <extracomment>Empty class name passed to widget factory method
+----------
+Empty class name passed to widget factory method
+----------
+Empty class name passed to widget factory method</extracomment>
         <translation>Методу %1 (объекта &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 не смог создать пользовательский виджет класса &apos;%1&apos;; был создан базовый класс &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 не смог создать пользовательский виджет класса &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>The layout type `%1&apos; is not supported.</source>
         <translation>Компоновка типа &apos;%1&apos; не поддерживается.</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>Не удалось прочитать свойство %1 множественного типа.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>The enumeration-type property %1 could not be read.</source>
         <translation>Не удалось прочитать свойство %1 перечисляемого типа.</translation>
     </message>
     <message>
-        <location line="+190"/>
         <source>Reading properties of the type %1 is not supported yet.</source>
         <translation>Чтение свойств типа %1 ещё не поддерживается.</translation>
     </message>
     <message>
-        <location line="+266"/>
         <source>The property %1 could not be written. The type %2 is not supported yet.</source>
         <translation>Не удалось записать свойство %1. Тип %2 ещё не поддерживается.</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>Значение &apos;%1&apos; перечисляемого типа некорректно. Будет использовано значение по умолчанию &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>The flag-value &apos;%1&apos; is invalid. Zero will be used instead.</source>
         <translation>Значение флага &apos;%1&apos; перечисляемого типа некорректно. Будет использовано значение &apos;0&apos; (нуль).</translation>
     </message>
@@ -2332,48 +1904,38 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QStackedWidgetEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="+194"/>
         <source>Previous Page</source>
         <translation>Предыдущая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Next Page</source>
         <translation>Следующая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Перед текущей страницей</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>После текущей страницы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Page Order...</source>
         <translation>Изменить порядок страниц...</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Change Page Order</source>
         <translation>Изменить порядок страниц</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Page %1 of %2</source>
         <translation>Страница %1 из %2</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+4"/>
         <source>Insert Page</source>
         <translation>Вставить страницу</translation>
     </message>
@@ -2381,12 +1943,10 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QStackedWidgetPreviewEventFilter</name>
     <message>
-        <location line="-153"/>
         <source>Go to previous page of %1 &apos;%2&apos; (%3/%4).</source>
         <translation>Перейти к предыдущей странице из %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>Перейти к следующей странице из %1 &apos;%2&apos; (%3/%4).</translation>
     </message>
@@ -2394,28 +1954,22 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QTabWidgetEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="+89"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Перед текущей страницей</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>После текущей страницы</translation>
     </message>
     <message>
-        <location line="+283"/>
         <source>Page %1 of %2</source>
         <translation>Страница %1 из %2</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+4"/>
         <source>Insert Page</source>
         <translation>Вставить страницу</translation>
     </message>
@@ -2423,37 +1977,30 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QToolBoxHelper</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="+64"/>
         <source>Delete Page</source>
         <translation>Удалить страницу</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Перед текущей страницей</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>После текущей страницы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Page Order...</source>
         <translation>Изменить порядок страниц...</translation>
     </message>
     <message>
-        <location line="+116"/>
         <source>Change Page Order</source>
         <translation>Изменить порядок страниц</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Page %1 of %2</source>
         <translation>Страница %1 из %2</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Insert Page</source>
         <translation>Вставить страницу</translation>
     </message>
@@ -2461,15 +2008,10 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtBoolEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+255"/>
-        <location line="+10"/>
-        <location line="+25"/>
         <source>True</source>
         <translation>Вкл.</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+25"/>
         <source>False</source>
         <translation>Выкл.</translation>
     </message>
@@ -2477,12 +2019,10 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtBoolPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+1507"/>
         <source>True</source>
         <translation>Вкл.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>False</source>
         <translation>Выкл.</translation>
     </message>
@@ -2490,7 +2030,6 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtCharEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1584"/>
         <source>Clear Char</source>
         <translation>Стереть символ</translation>
     </message>
@@ -2498,7 +2037,6 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtColorEditWidget</name>
     <message>
-        <location line="+605"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2506,22 +2044,18 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtColorPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4718"/>
         <source>Red</source>
         <translation>Красный</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Green</source>
         <translation>Зелёный</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Blue</source>
         <translation>Синий</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Alpha</source>
         <translation>Альфа</translation>
     </message>
@@ -2529,97 +2063,78 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtCursorDatabase</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-234"/>
         <source>Arrow</source>
         <translation>Arrow</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Up Arrow</source>
         <translation>Up Arrow</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cross</source>
         <translation>Cross</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Wait</source>
         <translation>Wait</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>IBeam</source>
         <translation>IBeam</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Vertical</source>
         <translation>Size Vertical</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Horizontal</source>
         <translation>Size Horizontal</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Backslash</source>
         <translation>Size Backslash</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Slash</source>
         <translation>Size Slash</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size All</source>
         <translation>Size All</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Blank</source>
         <translation>Blank</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Split Vertical</source>
         <translation>Split Vertical</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Split Horizontal</source>
         <translation>Split Horizontal</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pointing Hand</source>
         <translation>Pointing Hand</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Forbidden</source>
         <translation>Forbidden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Open Hand</source>
         <translation>Open Hand</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Closed Hand</source>
         <translation>Closed Hand</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>What&apos;s This</source>
         <translation>What&apos;s This</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Busy</source>
         <translation>Busy</translation>
     </message>
@@ -2627,12 +2142,10 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>Выбрать шрифт</translation>
     </message>
@@ -2640,37 +2153,30 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtFontPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-351"/>
         <source>Family</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Point Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Bold</source>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Underline</source>
         <translation>Подчёркнутый</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Strikeout</source>
         <translation>Зачёркнутый</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Kerning</source>
         <translation>Интервал</translation>
     </message>
@@ -2678,7 +2184,6 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtGradientDialog</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientdialog.ui"/>
         <source>Edit Gradient</source>
         <translation>Правка градиента</translation>
     </message>
@@ -2686,304 +2191,242 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtGradientEditor</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="+431"/>
         <source>Start X</source>
         <translation>X начала</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Start Y</source>
         <translation>Y начала</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Final X</source>
         <translation>X конца</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Final Y</source>
         <translation>Y конца</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+24"/>
         <source>Central X</source>
         <translation>X центра</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+24"/>
         <source>Central Y</source>
         <translation>Y центра</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>Focal X</source>
         <translation>X фокуса</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Focal Y</source>
         <translation>Y фокуса</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Radius</source>
         <translation>Радиус</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Angle</source>
         <translation>Угол</translation>
     </message>
     <message>
-        <location line="+288"/>
         <source>Linear</source>
         <translation type="unfinished">Линейный</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Radial</source>
         <translation type="unfinished">Радиальный</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Conical</source>
         <translation type="unfinished">Конический</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Pad</source>
         <translation type="unfinished">Равномерная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Repeat</source>
         <translation type="unfinished">Цикличная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reflect</source>
         <translation type="unfinished">Зеркальная</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient Editor</source>
         <translation>Редактор градиента</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>Эта область отображает предварительный вариант настраиваемого градиента. Также она позволяет менять с помощью перетаскивания характерные для градиента параметры, такие как: начальная и конечная точки, радиус и пр.</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>Редактор опорных точек градиента</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>Эта область позволяет редактировать опорные точки градиента. Двойной щелчок на существующей точке создаст её копию. Двойной клик вне существующей точки создаст новую. Точки можно перемещать путем удерживания левой кнопки. По правой кнопке можно получить контекстное меню дополнительных действий.</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location/>
         <source>Reset Zoom</source>
         <translation>100%</translation>
     </message>
     <message>
-        <location/>
         <source>Position</source>
         <translation>Положение</translation>
     </message>
     <message>
-        <location/>
         <source>Hue</source>
         <translation>Оттенок</translation>
     </message>
     <message>
-        <location/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
-        <location/>
         <source>Saturation</source>
         <translation>Насыщенность</translation>
     </message>
     <message>
-        <location/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location/>
         <source>Sat</source>
         <translation>Насыщение</translation>
     </message>
     <message>
-        <location/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
-        <location/>
         <source>Val</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location/>
         <source>Alpha</source>
         <translation>Альфа</translation>
     </message>
     <message>
-        <location/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location/>
         <source>Spread</source>
         <translation>Заливка</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location/>
         <source>Current stop&apos;s color</source>
         <translation>Цвет текущей точки</translation>
     </message>
     <message>
-        <location/>
         <source>Show HSV specification</source>
         <translation>Настройки в виде HSV</translation>
     </message>
     <message>
-        <location/>
         <source>HSV</source>
         <translation>HSV</translation>
     </message>
     <message>
-        <location/>
         <source>Show RGB specification</source>
         <translation>Настройки в виде RGB</translation>
     </message>
     <message>
-        <location/>
         <source>RGB</source>
         <translation>RGB</translation>
     </message>
     <message>
-        <location/>
         <source>Current stop&apos;s position</source>
         <translation>Положение текущей точки</translation>
     </message>
     <message>
-        <location/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom In</source>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom Out</source>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle details extension</source>
         <translation>Показать/скрыть детальные настройки</translation>
     </message>
     <message>
-        <location/>
         <source>&gt;</source>
         <translation>&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Linear Type</source>
         <translation>Линейный тип</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Radial Type</source>
         <translation>Радиальный тип</translation>
     </message>
     <message>
-        <location/>
         <source>Conical Type</source>
         <translation>Конический тип</translation>
     </message>
     <message>
-        <location/>
         <source>Pad Spread</source>
         <translation>Равномерная заливка</translation>
     </message>
     <message>
-        <location/>
         <source>Repeat Spread</source>
         <translation>Цикличная заливка</translation>
     </message>
     <message>
-        <location/>
         <source>Reflect Spread</source>
         <translation>Зеркальная заливка</translation>
     </message>
@@ -2991,37 +2434,30 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtGradientStopsWidget</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="+947"/>
         <source>New Stop</source>
         <translation>Новая точка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Flip All</source>
         <translation>Отобразить зеркально</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom In</source>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom Out</source>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset Zoom</source>
         <translation>Сбросить масштаб</translation>
     </message>
@@ -3029,46 +2465,34 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtGradientView</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+107"/>
         <source>Grad</source>
         <translation>Градиент</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Remove Gradient</source>
         <translation>Удалить градиент</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Are you sure you want to remove the selected gradient?</source>
         <translation>Вы действительно желаете удалить выбранный градиент?</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui"/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+74"/>
         <source>New...</source>
         <translation>Новый...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Edit...</source>
         <translation>Правка...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient View</source>
         <translation>Просмотр градиента</translation>
     </message>
@@ -3076,8 +2500,6 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>Выбрать градиент</translation>
     </message>
@@ -3085,7 +2507,6 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QtKeySequenceEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+249"/>
         <source>Clear Shortcut</source>
         <translation>Удалить комбинацию горячих клавиш</translation>
     </message>
@@ -3093,17 +2514,14 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>Язык</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Country</source>
         <translation>Страна</translation>
     </message>
@@ -3111,17 +2529,14 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>
@@ -3129,17 +2544,14 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>
@@ -3147,12 +2559,10 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>
@@ -3160,27 +2570,22 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>Ширина</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Height</source>
         <translation>Высота</translation>
     </message>
@@ -3188,27 +2593,22 @@ Container pages should only be added by specifying them in XML returned by the d
 <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>Ширина</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Height</source>
         <translation>Высота</translation>
     </message>
@@ -3216,128 +2616,98 @@ Container pages should only be added by specifying them in XML returned by the d
 <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 уже существует.
 Хотите заменить его?</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>Похоже, файл не является файлом ресурсов, так как вместо элемента &apos;%2&apos; стоит &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+902"/>
         <source>%1 [read-only]</source>
         <translation>%1 [только для чтения]</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+198"/>
         <source>%1 [missing]</source>
         <translation>%1 [отсутствует]</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&lt;no prefix&gt;</source>
         <translation>&lt;без префикса&gt;</translation>
     </message>
     <message>
-        <location line="+320"/>
-        <location line="+566"/>
         <source>New Resource File</source>
         <translation>Новый файл ресурсов</translation>
     </message>
     <message>
-        <location line="-564"/>
-        <location line="+25"/>
         <source>Resource files (*.qrc)</source>
         <translation>Файл ресурсов (*.qrc)</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Import Resource File</source>
         <translation>Импортировать файл ресурсов</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>newPrefix</source>
         <translation type="unfinished">newPrefix</translation>
     </message>
     <message>
-        <location line="+16"/>
         <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;Предупреждение:&lt;/b&gt; Файл&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;находится за пределами каталога текущего файла ресурсов.&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;Для решения нажмите:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Копировать&lt;/th&gt;&lt;td&gt;, чтобы скопировать в каталог файла ресурсов.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Копировать как...&lt;/th&gt;&lt;td&gt;, чтобы скопировать в подкаталог каталога файла ресурсов.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Оставить&lt;/th&gt;&lt;td&gt;, чтобы использовать текущее размещение.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Add Files</source>
         <translation>Добавить файлы</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Incorrect Path</source>
         <translation>Неверный путь</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+19"/>
-        <location line="+212"/>
-        <location line="+7"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location line="-236"/>
         <source>Copy As...</source>
         <translation>Копировать как...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Keep</source>
         <translation>Оставить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Skip</source>
         <translation>Пропустить</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>Clone Prefix</source>
         <translation>Приставка при клонировании</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>Введите окончание, которое нужно добавлять к именам клонируемых файлов.
 Это может быть, например, языковое расширение, вроде &quot;_ru&quot;.</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+4"/>
         <source>Copy As</source>
         <translation>Копировать как</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;Выбранный файл:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;находится вне каталога текущего файла ресурсов:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Пожалуйста, выберите путь внутри этого каталога.&lt;p&gt;</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Could not overwrite %1.</source>
         <translation>Не удалось перезаписать %1.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Could not copy
 %1
 to
@@ -3348,153 +2718,120 @@ to
 %2</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>A parse error occurred at line %1, column %2 of %3:
 %4</source>
         <translation>Возникла ошибка разбора в строке %1 позиции %2 из %3:
 %4</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Save Resource File</source>
         <translation>Сохранение файла ресурсов</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Could not write %1: %2</source>
         <translation>Не удалось записать %1: %2</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Edit Resources</source>
         <translation>Правка ресурсов</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>New...</source>
         <translation>Новый...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Open...</source>
         <translation>Открыть...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open Resource File</source>
         <translation>Открыть файл ресурсов</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+11"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
         <source>Move Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
         <source>Move Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <location line="+1"/>
         <source>Add Prefix</source>
         <translation>Добавить приставку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Files...</source>
         <translation>Добавить файлы...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Prefix</source>
         <translation>Сменить приставку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Language</source>
         <translation>Сменить язык</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Alias</source>
         <translation>Сменить псевдоним</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clone Prefix...</source>
         <translation>Приставка при клонировании...</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Prefix / Path</source>
         <translation>Приставка / Путь</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Language / Alias</source>
         <translation>Язык / Псевдоним</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;Предупреждение:&lt;/b&gt; Возникли проблемы при перезагрузке ресурсов:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Resource Warning</source>
         <translation type="unfinished">Предупреждение</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location/>
         <source>New File</source>
         <translation>Новый файл</translation>
     </message>
     <message>
-        <location/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location/>
         <source>Remove File</source>
         <translation>Удалить файл</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>Новый ресурс</translation>
     </message>
     <message>
-        <location/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location/>
         <source>Remove Resource or File</source>
         <translation>Удалить ресурс или файл</translation>
     </message>
@@ -3502,24 +2839,20 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="+567"/>
         <source>Size: %1 x %2
 %3</source>
         <translation>Размер: %1 x %2
 %3</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Edit Resources...</source>
         <translation>Изменить ресурсы...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Reload</source>
         <translation>Перезагрузить</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy Path</source>
         <translation>Скопировать путь</translation>
     </message>
@@ -3527,7 +2860,6 @@ to
 <context>
     <name>QtResourceViewDialog</name>
     <message>
-        <location line="+252"/>
         <source>Select Resource</source>
         <translation>Выбрать ресурс</translation>
     </message>
@@ -3535,17 +2867,14 @@ to
 <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>Ширина</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Height</source>
         <translation>Высота</translation>
     </message>
@@ -3553,33 +2882,26 @@ to
 <context>
     <name>QtSizePolicyPropertyManager</name>
     <message>
-        <location line="+1709"/>
-        <location line="+1"/>
         <source>&lt;Invalid&gt;</source>
         <translation>&lt;Неверный&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>Горизонтальная политика</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Vertical Policy</source>
         <translation>Вертикальная политика</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Horizontal Stretch</source>
         <translation>Горизонтальное растяжение</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Vertical Stretch</source>
         <translation>Вертикальное растяжение</translation>
     </message>
@@ -3587,17 +2909,14 @@ to
 <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>Ширина</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Height</source>
         <translation>Высота</translation>
     </message>
@@ -3605,107 +2924,86 @@ to
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="+1240"/>
         <source>Custom Toolbar</source>
         <translation>Пользовательская панель инструментов</translation>
     </message>
     <message>
-        <location line="+544"/>
         <source>&lt; S E P A R A T O R &gt;</source>
         <translation>&lt; Р А З Д Е Л И Т Е Л Ь &gt;</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui"/>
         <source>Customize Toolbars</source>
         <translation>Настройка панелей инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
-        <location/>
         <source>Toolbars</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>Add new toolbar</source>
         <translation>Добавить новую панель инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location/>
         <source>Remove selected toolbar</source>
         <translation>Удалить выбранную панель инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Rename toolbar</source>
         <translation>Переименовать панель инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location/>
         <source>Move action up</source>
         <translation>Переместить действие вверх</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
-        <location/>
         <source>Remove action from toolbar</source>
         <translation>Удалить действие из панели инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;-</source>
         <translation>&lt;-</translation>
     </message>
     <message>
-        <location/>
         <source>Add action to toolbar</source>
         <translation>Добавить действие на панель инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>-&gt;</source>
         <translation>-&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Move action down</source>
         <translation>Переместить действие вниз</translation>
     </message>
     <message>
-        <location/>
         <source>Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
-        <location/>
         <source>Current Toolbar Actions</source>
         <translation>Текущие действия панели инструментов</translation>
     </message>
@@ -3713,12 +3011,10 @@ to
 <context>
     <name>QtTreePropertyBrowser</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp" line="+442"/>
         <source>Property</source>
         <translation>Свойство</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
@@ -3726,64 +3022,52 @@ to
 <context>
     <name>SaveFormAsTemplate</name>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="+72"/>
         <source>Add path...</source>
         <translation>Добавить путь...</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Template Exists</source>
         <translation>Шаблон существует</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A template with the name %1 already exists.
 Do you want overwrite the template?</source>
         <translation>Шаблон с именем %1 уже существует.
 Желаете заменить шаблон?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Overwrite Template</source>
         <translation>Заменить шаблон</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Open Error</source>
         <translation>Ошибка открытия</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There was an error opening template %1 for writing. Reason: %2</source>
         <translation>Возникла ошибка открытия шаблона %1 для записи. Причина: %2</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Write Error</source>
         <translation>Ошибка записи</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There was an error writing the template %1 to disk. Reason: %2</source>
         <translation>Возникла ошибка записи шаблона %1 на диск. Причина: %2</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Pick a directory to save templates in</source>
         <translation>Выберите каталог для сохранения шаблонов</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.ui"/>
         <source>Save Form As Template</source>
         <translation>Сохранить форму как шаблон</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Category:</source>
         <translation>&amp;Категория:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Имя:</translation>
     </message>
@@ -3791,7 +3075,6 @@ Do you want overwrite the template?</source>
 <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>При выполнения сценариев для &quot;%1&quot; возникла ошибка:
@@ -3801,22 +3084,18 @@ Do you want overwrite the template?</source>
 <context>
     <name>SelectSignalDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui"/>
         <source>Go to slot</source>
         <translation>Переход к слоту</translation>
     </message>
     <message>
-        <location/>
         <source>Select signal</source>
         <translation>Выбор сигнала</translation>
     </message>
     <message>
-        <location/>
         <source>signal</source>
         <translation>сигнал</translation>
     </message>
     <message>
-        <location/>
         <source>class</source>
         <translation>класс</translation>
     </message>
@@ -3824,7 +3103,6 @@ Do you want overwrite the template?</source>
 <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>ОТПРАВИТЕЛЬ(%1), СИГНАЛ(%2), ПОЛУЧАТЕЛЬ(%3), СЛОТ(%4)</translation>
     </message>
@@ -3832,32 +3110,26 @@ Do you want overwrite the template?</source>
 <context>
     <name>SignalSlotDialogClass</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui"/>
         <source>Signals and slots</source>
         <translation>Сигналы и слоты</translation>
     </message>
     <message>
-        <location/>
         <source>Slots</source>
         <translation>Слоты</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Signals</source>
         <translation>Сигналы</translation>
     </message>
@@ -3865,12 +3137,10 @@ Do you want overwrite the template?</source>
 <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>Горизонтальный разделитель &apos;%1&apos;, %2 x %3</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Vertical Spacer &apos;%1&apos;, %2 x %3</source>
         <translation>Вертикальный разделитель &apos;%1&apos;, %2 x %3</translation>
     </message>
@@ -3878,7 +3148,6 @@ Do you want overwrite the template?</source>
 <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>
         <translatorcomment>Слово &quot;пути&quot; опустил, т.к. с другими вкладками не перепутать, а длинная вкладка не смотрится.</translatorcomment>
@@ -3888,52 +3157,42 @@ Do you want overwrite the template?</source>
 <context>
     <name>ToolBarManager</name>
     <message>
-        <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+89"/>
         <source>Configure Toolbars...</source>
         <translation>Настройка панелей инструментов...</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Window</source>
         <translation>Окно</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock views</source>
         <translation type="unfinished">Прикрепляемые панели</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File</source>
         <translation type="unfinished">Файл</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Edit</source>
         <translation type="unfinished">Правка</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Tools</source>
         <translation type="unfinished">Инструменты</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Form</source>
         <translation type="unfinished">Форма</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Toolbars</source>
         <translation>Панели инструментов</translation>
     </message>
@@ -3941,30 +3200,64 @@ Do you want overwrite the template?</source>
 <context>
     <name>VersionDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+170"/>
         <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;Версия %2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <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 - дизайнер графического интерфейса пользователя для Qt-приложений.&lt;br/&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation>%1&lt;br/&gt;Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения.</translation>
     </message>
 </context>
 <context>
+    <name>VideoPlayerTaskMenu</name>
+    <message>
+        <source>Available Mime Types</source>
+        <translation type="unfinished">Доступные типы данных</translation>
+    </message>
+    <message>
+        <source>Display supported mime types...</source>
+        <translation type="unfinished">Показывать поддерживаемые типы данных...</translation>
+    </message>
+    <message>
+        <source>Load...</source>
+        <translation>Загрузить...</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Воспроизвести</translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Остановить</translation>
+    </message>
+    <message>
+        <source>Choose Video Player Media Source</source>
+        <translation>Выберите источник медиа-данных</translation>
+    </message>
+    <message>
+        <source>An error has occurred in &apos;%1&apos;: %2</source>
+        <translation>В &quot;%1&quot; произошла ошибка: %2</translation>
+    </message>
+    <message>
+        <source>Video Player Error</source>
+        <translation>Ошибка видеоплеера</translation>
+    </message>
+</context>
+<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>Файл содержит пользовательский виджет &apos;%1&apos;, базовый класс (%2) которого отличается от текущей записи в базе виджетов (%3). База виджетов оставлена без изменений.</translation>
     </message>
@@ -3972,87 +3265,70 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="+123"/>
         <source>New...</source>
         <translation>Новое...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit...</source>
         <translation>Правка...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go to slot...</source>
         <translation>Перейти к слоту...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select all</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Configure Action Editor</source>
         <translation>Настроить редактор действий</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Icon View</source>
         <translation type="unfinished">Значки</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Detailed View</source>
         <translation type="unfinished">Подробно</translation>
     </message>
     <message>
-        <location line="+246"/>
         <source>New action</source>
         <translation>Новое действие</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>Edit action</source>
         <translation>Правка действия</translation>
     </message>
     <message>
-        <location line="+69"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Удалить действие &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Remove actions</source>
         <translation>Удаление дествий</translation>
     </message>
     <message>
-        <location line="+186"/>
         <source>Used In</source>
         <translation>Используется в</translation>
     </message>
@@ -4060,32 +3336,26 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="+89"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Used</source>
         <translation>Используется</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Shortcut</source>
         <translation>Горячая клавиша</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Checkable</source>
         <translation>Триггерное</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ToolTip</source>
         <translation>Подсказка</translation>
     </message>
@@ -4093,27 +3363,22 @@ Do you want overwrite the template?</source>
 <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>У элемента &apos;%1&apos; отсутствует необходимый атрибут &apos;%2&apos;.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Empty brush name encountered.</source>
         <translation>Обнаружено пустое название кисти.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>An unexpected element &apos;%1&apos; was encountered.</source>
         <translation>Обнаружен неожиданный элемент &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>При чтении файла описания кистей &apos;%1&apos; возникла ошибка разбора строки %2 в позиции %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>При чтении файла ресурсов &apos;%1&apos; возникла ошибка разбора строки %2 в позиции %3: %4</translation>
     </message>
@@ -4121,17 +3386,14 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::BuddyEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="+261"/>
         <source>Add buddy</source>
         <translation>Добавить партнёра</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Remove buddies</source>
         <translation>Удалить партнёров</translation>
     </message>
     <message numerus="yes">
-        <location line="+24"/>
         <source>Remove %n buddies</source>
         <translation>
             <numerusform>Удалить %n партнёра</numerusform>
@@ -4140,7 +3402,6 @@ Do you want overwrite the template?</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+51"/>
         <source>Add %n buddies</source>
         <translation>
             <numerusform>Добавить %n партнёра</numerusform>
@@ -4149,7 +3410,6 @@ Do you want overwrite the template?</source>
         </translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Set automatically</source>
         <translation>Установить автоматически</translation>
     </message>
@@ -4157,7 +3417,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::BuddyEditorPlugin</name>
     <message>
-        <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp" line="+73"/>
         <source>Edit Buddies</source>
         <translation>Изменение партнёров</translation>
     </message>
@@ -4165,7 +3424,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::BuddyEditorTool</name>
     <message>
-        <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp" line="+56"/>
         <source>Edit Buddies</source>
         <translation>Изменение партнёров</translation>
     </message>
@@ -4173,12 +3431,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ButtonGroupMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+7"/>
         <source>Select members</source>
         <translation>Выбрать элементы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Break</source>
         <translation>Разделить</translation>
     </message>
@@ -4186,32 +3442,26 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ButtonTaskMenu</name>
     <message>
-        <location line="+121"/>
         <source>Assign to button group</source>
         <translation>Назначить группу кнопок</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Button group</source>
         <translation>Группа кнопок</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>New button group</source>
         <translation>Новая группа кнопок</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change text...</source>
         <translation>Изменить текст...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Button group &apos;%1&apos;</source>
         <translation>Группа кнопок &apos;%1&apos;</translation>
     </message>
@@ -4219,57 +3469,46 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::CodeDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="+95"/>
         <source>Save...</source>
         <translation>Сохранить...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy All</source>
         <translation>Копировать всё</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Find in Text...</source>
         <translation>&amp;Найти в тексте...</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>A temporary form file could not be created in %1.</source>
         <translation>Не удалось создать временный файл формы в %1.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary form file %1 could not be written.</source>
         <translation>Не удалось записать временный файл формы %1.</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>%1 - [Code]</source>
         <translation>%1 - [код]</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Save Code</source>
         <translation>Сохранить код</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Header Files (*.%1)</source>
         <translation>Заголовочные файлы (*.%1)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The file %1 could not be opened: %2</source>
         <translation>Не удалось открыть файл %1: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The file %1 could not be written: %2</source>
         <translation>Не удалось записать файл %1: %2</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>%1 - Error</source>
         <translation>%1 - Ошибка</translation>
     </message>
@@ -4277,7 +3516,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ColorAction</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+246"/>
         <source>Text Color</source>
         <translation>Цвет текста</translation>
     </message>
@@ -4285,12 +3523,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ComboBoxTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/combobox_taskmenu.cpp" line="+68"/>
         <source>Edit Items...</source>
         <translation>Изменить элементы...</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Change Combobox Contents</source>
         <translation>Изменено содержимое Combobox</translation>
     </message>
@@ -4298,7 +3534,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::CommandLinkButtonTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+156"/>
         <source>Change description...</source>
         <translation>Изменить описание...</translation>
     </message>
@@ -4306,17 +3541,14 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ConnectionEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+1313"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Deselect All</source>
         <translation>Снять выделение</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -4324,52 +3556,42 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ConnectionModel</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="-465"/>
         <source>Sender</source>
         <translation>Отправитель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Signal</source>
         <translation>Сигнал</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Receiver</source>
         <translation>Получатель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Slot</source>
         <translation>Слот</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>&lt;sender&gt;</source>
         <translation>&lt;отправитель&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;signal&gt;</source>
         <translation>&lt;сигнал&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;receiver&gt;</source>
         <translation>&lt;получатель&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;slot&gt;</source>
         <translation>&lt;слот&gt;</translation>
     </message>
     <message>
-        <location line="+108"/>
         <source>The connection already exists!&lt;br&gt;%1</source>
         <translation>Подключение уже существует!&lt;br&gt;%1</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Signal and Slot Editor</source>
         <translation>Радактор сигналов и слотов</translation>
     </message>
@@ -4377,42 +3599,34 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="+79"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Insert</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert Page Before Current Page</source>
         <translation>Вставить страницу перед текущей</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Page After Current Page</source>
         <translation>Вставить страницу после текущей</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Add Subwindow</source>
         <translation>Добавить дочернее окно</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Subwindow</source>
         <translation>Дочернее окно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Page</source>
         <translation>Страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page %1 of %2</source>
         <translation>Страница %1 из %2</translation>
     </message>
@@ -4420,18 +3634,15 @@ Do you want overwrite the template?</source>
 <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>Системное (%1 x %2)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>User defined</source>
         <translation>Пользовательское</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source> x </source>
         <extracomment>DPI X/Y separator</extracomment>
         <translation> x </translation>
@@ -4440,49 +3651,38 @@ Do you want overwrite the template?</source>
 <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></translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>AlignHCenter</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AlignRight</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AlignJustify</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>AlignTop</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+4"/>
         <source>AlignVCenter</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>AlignBottom</source>
         <translation></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>Настроено (%n роль)</numerusform>
@@ -4491,75 +3691,58 @@ Do you want overwrite the template?</source>
         </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Inherited</source>
         <translation>Унаследованная</translation>
     </message>
     <message>
-        <location line="+566"/>
         <source>Horizontal</source>
         <translation>Горизонтальное</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Vertical</source>
         <translation>Вертикальное</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Normal Off</source>
         <translation type="unfinished">Нормальный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Normal On</source>
         <translation type="unfinished">Нормальный, вкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled Off</source>
         <translation type="unfinished">Выключенный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled On</source>
         <translation type="unfinished">Выключенный, вкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active Off</source>
         <translation type="unfinished">Активный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active On</source>
         <translation type="unfinished">Активный, вкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected Off</source>
         <translation type="unfinished">Выбранный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected On</source>
         <translation type="unfinished">Выбранный, вкл</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+21"/>
         <source>translatable</source>
         <translation>переводимый</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+21"/>
         <source>disambiguation</source>
         <translation>уточнение</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+21"/>
         <source>comment</source>
         <translation>примечание</translation>
     </message>
@@ -4567,48 +3750,38 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::DeviceProfileDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="+63"/>
         <source>Device Profiles (*.%1)</source>
         <translation>Профили устройства (*.%1)</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Save Profile</source>
         <translation>Сохранение профиля</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Save Profile - Error</source>
         <translation>Ошибка сохранения профиля</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Unable to open the file &apos;%1&apos; for writing: %2</source>
         <translation>Не удалось открыть файл &apos;%1&apos; для записи: %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Open profile</source>
         <translation>Открытие профиля</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+6"/>
         <source>Open Profile - Error</source>
         <translation>Ошибка отрытия профиля</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Unable to open the file &apos;%1&apos; for reading: %2</source>
         <translation>Не удалось открыть файл &apos;%1&apos; для чтения: %2</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&apos;%1&apos; is not a valid profile: %2</source>
         <translation>&apos;%1&apos; не является корректным профилем: %2</translation>
     </message>
@@ -4616,57 +3789,46 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::Dialog</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location/>
         <source>StringList</source>
         <translation>Список строк</translation>
     </message>
     <message>
-        <location/>
         <source>New String</source>
         <translation>Новая строка</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Новая</translation>
     </message>
     <message>
-        <location/>
         <source>Delete String</source>
         <translation>Удалить строку</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Value:</source>
         <translation>&amp;Значение:</translation>
     </message>
     <message>
-        <location/>
         <source>Move String Up</source>
         <translation>Переместить строку вверх</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
-        <location/>
         <source>Move String Down</source>
         <translation>Переместить строку вниз</translation>
     </message>
     <message>
-        <location/>
         <source>Down</source>
         <translation> Вниз </translation>
     </message>
@@ -4674,52 +3836,42 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::EmbeddedOptionsControl</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="-260"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Add a profile</source>
         <translation>Добавить профиль</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Edit the selected profile</source>
         <translation>Изменить выбранный профиль</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Delete the selected profile</source>
         <translation>Удалить выбранный профиль</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Add Profile</source>
         <translation>Добавление профиля</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>New profile</source>
         <translation>Новый профиль</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Edit Profile</source>
         <translation>Изменение профиля</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Delete Profile</source>
         <translation>Удаление профиля</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Would you like to delete the profile &apos;%1&apos;?</source>
         <translation>Желаете удалить профиль &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
@@ -4727,12 +3879,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::FilterWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/filterwidget.cpp" line="+163"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Clear text</source>
         <translation>Очистить текст</translation>
     </message>
@@ -4740,12 +3890,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::FormEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formeditor.cpp" line="+190"/>
         <source>Resource File Changed</source>
         <translation>Файл ресурсов был изменён</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The file &quot;%1&quot; has changed outside Designer. Do you want to reload it?</source>
         <translation>Файл &quot;%1&quot; был изменён вне Qt Designer. Желаете перезагрузить его?</translation>
     </message>
@@ -4753,7 +3901,6 @@ Do you want overwrite the template?</source>
 <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>Добавить строку компоновщика формы...</translation>
     </message>
@@ -4761,37 +3908,30 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::FormWindow</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="-1322"/>
         <source>Edit contents</source>
         <translation>Изменить содержимое</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>F2</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+775"/>
         <source>Insert widget &apos;%1&apos;</source>
         <translation>Вставить виджет &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Resize</source>
         <translation>Изменение размера</translation>
     </message>
     <message>
-        <location line="+248"/>
         <source>Key Move</source>
         <translation type="unfinished">Перемещение клавишей</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Key Resize</source>
         <translation type="unfinished">Изменение размера клавишей</translation>
     </message>
     <message numerus="yes">
-        <location line="+252"/>
         <source>Paste %n action(s)</source>
         <translation type="unfinished">
             <numerusform>Вставлено %n действие</numerusform>
@@ -4800,7 +3940,6 @@ Do you want overwrite the template?</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+2"/>
         <source>Paste %n widget(s)</source>
         <translation type="unfinished">
             <numerusform>Вставлен %n виджет</numerusform>
@@ -4809,53 +3948,42 @@ Do you want overwrite the template?</source>
         </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste (%1 widgets, %2 actions)</source>
         <translation type="unfinished">Вставлено (%1 виджетов, %2 действий)</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
         <translation type="unfinished">Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов.</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>Удалите компоновщик из контейнера, в который желаете вставить виджеты, выберите его и повторите вставку.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste error</source>
         <translation>Ошибка вставки</translation>
     </message>
     <message>
-        <location line="+181"/>
         <source>Raise widgets</source>
         <translation>Поднятие виджетов</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Lower widgets</source>
         <translation>Опускание виджетов</translation>
     </message>
     <message>
-        <location line="+204"/>
         <source>Select Ancestor</source>
         <translation>Выбрать предка</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Lay out</source>
         <translation>Компоновка</translation>
     </message>
     <message>
-        <location line="+485"/>
-        <location line="+55"/>
         <source>Drop widget</source>
         <translation type="unfinished">Вставка виджета</translation>
     </message>
     <message>
-        <location line="-13"/>
         <source>A QMainWindow-based form does not contain a central widget.</source>
         <translation>Форма, основанная на QMainWindow, не содержит центрального виджета.</translation>
     </message>
@@ -4863,12 +3991,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formwindowbase.cpp" line="+404"/>
         <source>Delete &apos;%1&apos;</source>
         <translation>Удалить &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -4876,200 +4002,159 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::FormWindowManager</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+365"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cuts the selected widgets and puts them on the clipboard</source>
         <translation>Вырезает выбранные виджеты и помещает их в буфер обмена</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Copies the selected widgets to the clipboard</source>
         <translation>Копирует выбранные виджеты в буфер обмена</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Paste</source>
         <translation>В&amp;ставить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Pastes the clipboard&apos;s contents</source>
         <translation>Вставляет содержимое буфера обмена</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Deletes the selected widgets</source>
         <translation>Удаляет выбранные виджеты</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>&amp;Выделить все</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Selects all widgets</source>
         <translation>Выделяет все виджеты</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Bring to &amp;Front</source>
         <translation>Переместить &amp;вперед</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>Raises the selected widgets</source>
         <translation>Поднимает выбранные виджеты на передний план</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Send to &amp;Back</source>
         <translation>Переместить &amp;назад</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>Lowers the selected widgets</source>
         <translation>Опускает выбранные виджеты на задний план</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Adjust &amp;Size</source>
         <translation>Подогнать &amp;размер</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Adjusts the size of the selected widget</source>
         <translation>Подгоняет размер выбранного виджета</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Lay Out &amp;Horizontally</source>
         <translation>Скомпоновать по &amp;горизонтали</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets horizontally</source>
         <translation>Компонует выделенные виджеты по горизонтали (QHBoxLayout)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Lay Out &amp;Vertically</source>
         <translation>Скомпоновать по &amp;вертикали</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets vertically</source>
         <translation>Компонует выделенные виджеты по вертикали (QVBoxLayout)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out in a &amp;Form Layout</source>
         <translation>Скомпоновать в &amp;две колонки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets in a form layout</source>
         <translation>Компонует выделенные виджеты в две колонки (QFormLayout)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out in a &amp;Grid</source>
         <translation>Скомпоновать по &amp;сетке</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets in a grid</source>
         <translation>Компонует выделенные виджеты по сетке (QGridLayout)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out Horizontally in S&amp;plitter</source>
         <translation>Скомпоновать по г&amp;оризонтали с разделителем</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets horizontally in a splitter</source>
         <translation>Компонует выделенные виджеты по горизонтали (QSplitter)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out Vertically in Sp&amp;litter</source>
         <translation>Скомпоновать по в&amp;ертикали с разделителем</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets vertically in a splitter</source>
         <translation>Компонует выделенные виджеты по вертикали (QSplitter)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>&amp;Break Layout</source>
         <translation>&amp;Удалить компоновщик</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Breaks the selected layout</source>
         <translation>Удаляет выбранный компоновщик</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Si&amp;mplify Grid Layout</source>
         <translation>Упрост&amp;ить компоновку по сетке</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Removes empty columns and rows</source>
         <translation>Удаляет пустые колонки и строки в QGridLayout</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Preview...</source>
         <translation>&amp;Предпросмотр...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Preview current form</source>
         <translation>Предпросмотр формы</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Form &amp;Settings...</source>
         <translation>&amp;Настройки формы...</translation>
     </message>
     <message>
-        <location line="+94"/>
         <source>Break Layout</source>
         <translation>Удалить компоновщик</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Adjust Size</source>
         <translation>Подогнать размер</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Could not create form preview</source>
         <comment>Title of warning message box</comment>
         <translation>Не удалось создать предпросмотр формы</translation>
     </message>
     <message>
-        <location line="+341"/>
         <source>Form Settings - %1</source>
         <translation>Настройки формы - %1</translation>
     </message>
@@ -5077,12 +4162,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::FormWindowSettings</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowsettings.cpp" line="+193"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Profile: %1</source>
         <translation>Профиль устройства: %1</translation>
     </message>
@@ -5090,37 +4173,30 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::GridPanel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/gridpanel.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Grid</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location/>
         <source>Visible</source>
         <translation>Видимая</translation>
     </message>
     <message>
-        <location/>
         <source>Grid &amp;X</source>
         <translation>Сетка &amp;X</translation>
     </message>
     <message>
-        <location/>
         <source>Snap</source>
         <translation>Прилипать</translation>
     </message>
     <message>
-        <location/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location/>
         <source>Grid &amp;Y</source>
         <translation>Сетка &amp;Y</translation>
     </message>
@@ -5128,7 +4204,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::GroupBoxTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp" line="+82"/>
         <source>Change title...</source>
         <translation>Изменить заголовок...</translation>
     </message>
@@ -5136,7 +4211,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::HtmlTextEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="-58"/>
         <source>Insert HTML entity</source>
         <translation>Вставить элемент HTML</translation>
     </message>
@@ -5144,92 +4218,74 @@ Do you want overwrite the template?</source>
 <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>Невозможно прочитать файл растрового изображения &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
         <translation>Файл &apos;%1&apos; не похож на корректный файл растрового изображения: %2</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The file &apos;%1&apos; could not be read: %2</source>
         <translation>Не удалось прочитать файл %1: %2</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Choose a Pixmap</source>
         <translation>Выбор растрового изображения</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Pixmap Read Error</source>
         <translation>Ошибка чтения растрового изображения</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Normal Off</source>
         <translation type="unfinished">Нормальный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Normal On</source>
         <translation type="unfinished">Нормальный, вкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled Off</source>
         <translation type="unfinished">Выключенный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled On</source>
         <translation type="unfinished">Выключенный, вкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active Off</source>
         <translation type="unfinished">Активный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active On</source>
         <translation type="unfinished">Активный, вкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected Off</source>
         <translation type="unfinished">Выбранный, выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected On</source>
         <translation type="unfinished">Выбранный, вкл</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Choose Resource...</source>
         <translation>Выбрать ресурс...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Выбрать файл...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset All</source>
         <translation>Сбросить всё</translation>
     </message>
@@ -5237,58 +4293,46 @@ Do you want overwrite the template?</source>
 <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>Свойства &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>Свойства &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Items List</source>
         <translation>Список элементов</translation>
     </message>
     <message>
-        <location/>
         <source>New Item</source>
         <translation>Новый элемент</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Новый</translation>
     </message>
     <message>
-        <location/>
         <source>Delete Item</source>
         <translation>Удалить элемент</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Up</source>
         <translation>Переместить элемент вверх</translation>
     </message>
     <message>
-        <location/>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Down</source>
         <translation>Переместить элемент вниз</translation>
     </message>
     <message>
-        <location/>
         <source>D</source>
         <translation>D</translation>
     </message>
@@ -5296,12 +4340,10 @@ Do you want overwrite the template?</source>
 <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>Изменить форматированный текст...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change plain text...</source>
         <translation>Изменить обычный текст...</translation>
     </message>
@@ -5309,7 +4351,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::LanguageResourceDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="-343"/>
         <source>Choose Resource</source>
         <translation>Выбор ресурса</translation>
     </message>
@@ -5317,7 +4358,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::LineEditTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp" line="+80"/>
         <source>Change text...</source>
         <translation>Изменить текст...</translation>
     </message>
@@ -5325,17 +4365,14 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ListWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="+69"/>
         <source>New Item</source>
         <translation>Новый элемент</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Edit List Widget</source>
         <translation>Изменение виджета List</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Edit Combobox</source>
         <translation>Изменение виджета ComboBox</translation>
     </message>
@@ -5343,12 +4380,10 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::ListWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp" line="+67"/>
         <source>Edit Items...</source>
         <translation>Изменить элементы...</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Change List Contents</source>
         <translation>Изменение содержимого списка</translation>
     </message>
@@ -5356,22 +4391,18 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::MdiContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="+118"/>
         <source>Next Subwindow</source>
         <translation>Следующее дочернее докно</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous Subwindow</source>
         <translation>Предыдущее дочернее докно</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tile</source>
         <translation>Замостить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cascade</source>
         <translation>Каскадом</translation>
     </message>
@@ -5379,7 +4410,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::MenuTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/menutaskmenu.cpp" line="+56"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
@@ -5387,7 +4417,6 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::MorphMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="+264"/>
         <source>Morph into</source>
         <translation>Преобразовать в</translation>
     </message>
@@ -5395,42 +4424,34 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::NewActionDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newactiondialog.ui"/>
         <source>New Action...</source>
         <translation>Новое действие...</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Text:</source>
         <translation>&amp;Текст:</translation>
     </message>
     <message>
-        <location/>
         <source>Object &amp;name:</source>
         <translation>&amp;Имя объекта:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Icon:</source>
         <translation>&amp;Значок:</translation>
     </message>
     <message>
-        <location/>
         <source>Shortcut:</source>
         <translation>Горячая клавиша:</translation>
     </message>
     <message>
-        <location/>
         <source>Checkable:</source>
         <translation>Триггерное:</translation>
     </message>
     <message>
-        <location/>
         <source>ToolTip:</source>
         <translation>Подсказка:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -5438,41 +4459,34 @@ Do you want overwrite the template?</source>
 <context>
     <name>qdesigner_internal::NewDynamicPropertyDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="+134"/>
         <source>Set Property Name</source>
         <translation>Установка имени свойства</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>Объект уже содержит свойство с именем &apos;%1&apos;.
 Укажите другое имя.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The &apos;_q_&apos; prefix is reserved for the Qt library.
 Please select another name.</source>
         <translation>Приставка &apos;_q_&apos; зарезервирована для целей библиотеки Qt.
 Укажите другое имя.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui"/>
         <source>Create Dynamic Property</source>
         <translation>Создание динамического свойства</translation>
     </message>
     <message>
-        <location/>
         <source>Property Name</source>
         <translation>Имя свойства</translation>
     </message>
     <message>
-        <location/>
         <source>horizontalSpacer</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Property Type</source>
         <translation>Тип свойства</translation>
     </message>
@@ -5480,83 +4494,67 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::NewFormWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="+104"/>
         <source>Default size</source>
         <translation>Размер по умолчанию</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>QVGA portrait (240x320)</source>
         <translation>QVGA книжная (240x320)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>QVGA landscape (320x240)</source>
         <translation>QVGA альбомная (320x240)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>VGA portrait (480x640)</source>
         <translation>VGA книжная (480x640)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>VGA landscape (640x480)</source>
         <translation>VGA альбомная (640x480)</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>Widgets</source>
         <extracomment>New Form Dialog Categories</extracomment>
         <translation>Виджеты</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Custom Widgets</source>
         <translation>Пользовательские виджеты</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Error loading form</source>
         <translation>Ошибка загрузки формы</translation>
     </message>
     <message>
-        <location line="+244"/>
         <source>Unable to open the form template file &apos;%1&apos;: %2</source>
         <translation>Невозможно открыть файл шаблона формы &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Internal error: No template selected.</source>
         <translation>Внутренняя ошибка: Шаблон не выбран.</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>Выберите шаблон для предпросмотра</translation>
     </message>
     <message>
-        <location/>
         <source>Embedded Design</source>
         <translation type="unfinished">Оформление портативных устройств</translation>
     </message>
     <message>
-        <location/>
         <source>Device:</source>
         <translation>Устройство:</translation>
     </message>
     <message>
-        <location/>
         <source>Screen Size:</source>
         <translation>Размер экрана:</translation>
     </message>
@@ -5564,37 +4562,30 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::NewPromotedClassPanel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="+92"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>New Promoted Class</source>
         <translation type="unfinished">Новый преобразованный класс</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Base class name:</source>
         <translation>Имя базового класса:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promoted class name:</source>
         <translation type="unfinished">Имя преобразованного класса:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Header file:</source>
         <translation>Заголовочный файл:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Global include</source>
         <translation type="unfinished">Глобальное включение</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Reset</source>
         <translation>Восстановить</translation>
     </message>
@@ -5602,12 +4593,10 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::ObjectInspector</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="+754"/>
         <source>&amp;Find in Text...</source>
         <translation>&amp;Найти в тексте...</translation>
     </message>
     <message>
-        <location line="-438"/>
         <source>Change Current Page</source>
         <translation>Смена текущей страницы</translation>
     </message>
@@ -5615,32 +4604,26 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::OrderDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="+109"/>
         <source>Index %1 (%2)</source>
         <translation>Индекс %1 (%2)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/orderdialog.ui"/>
         <source>Change Page Order</source>
         <translation>Изменение порядка страниц</translation>
     </message>
     <message>
-        <location/>
         <source>Page Order</source>
         <translation>Порядок страниц</translation>
     </message>
     <message>
-        <location/>
         <source>Move page up</source>
         <translation>Переместить страницу выше</translation>
     </message>
     <message>
-        <location/>
         <source>Move page down</source>
         <translation>Переместить страницу ниже</translation>
     </message>
@@ -5648,47 +4631,38 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PaletteEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui"/>
         <source>Edit Palette</source>
         <translation>Правка палитры</translation>
     </message>
     <message>
-        <location/>
         <source>Tune Palette</source>
         <translation>Настройка палитры</translation>
     </message>
     <message>
-        <location/>
         <source>Show Details</source>
         <translation type="unfinished">Показывать детали</translation>
     </message>
     <message>
-        <location/>
         <source>Compute Details</source>
         <translation type="unfinished">Расчитывать детали</translation>
     </message>
     <message>
-        <location/>
         <source>Quick</source>
         <translation type="unfinished">Быстрый</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
     <message>
-        <location/>
         <source>Disabled</source>
         <translation>Выключенная</translation>
     </message>
     <message>
-        <location/>
         <source>Inactive</source>
         <translation>Неактивная</translation>
     </message>
     <message>
-        <location/>
         <source>Active</source>
         <translation>Активная</translation>
     </message>
@@ -5696,7 +4670,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PaletteEditorButton</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp" line="+57"/>
         <source>Change Palette</source>
         <translation type="unfinished">Изменить палитру</translation>
     </message>
@@ -5704,22 +4677,18 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PaletteModel</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="+374"/>
         <source>Color Role</source>
         <translation>Роль цвета</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Активный</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inactive</source>
         <translation>Неактивный</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disabled</source>
         <translation>Выключенный</translation>
     </message>
@@ -5727,28 +4696,22 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PixmapEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-1541"/>
         <source>Choose Resource...</source>
         <translation>Выбрать ресурс...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Выбрать файл...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy Path</source>
         <translation>Скопировать путь</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste Path</source>
         <translation>Вставить путь</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+16"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -5756,7 +4719,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PlainTextEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plaintexteditor.cpp" line="+65"/>
         <source>Edit text</source>
         <translation>Правка текста</translation>
     </message>
@@ -5764,37 +4726,30 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PluginDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="+72"/>
         <source>Components</source>
         <translation>Компоненты</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Plugin Information</source>
         <translation>Информация о модуле</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scan for newly installed custom widget plugins.</source>
         <translation>Поиск вновь установленных модулей пользовательских виджетов.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Qt Designer couldn&apos;t find any plugins</source>
         <translation>Qt Designer не может найти ни одного модуля</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Qt Designer found the following plugins</source>
         <translation>Qt Designer нашёл следующие модули</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>New custom widget plugins have been found.</source>
         <translation>Найдены новые модули пользовательских виджетов.</translation>
     </message>
@@ -5802,7 +4757,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewActionGroup</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/previewactiongroup.cpp" line="+95"/>
         <source>%1 Style</source>
         <translation>Стиль %1</translation>
     </message>
@@ -5810,47 +4764,38 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewConfigurationWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="+139"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
     <message>
-        <location line="+118"/>
         <source>Load Custom Device Skin</source>
         <translation>Загрузить особую обложку устройства</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>All QVFB Skins (*.%1)</source>
         <translation>Все обложки QVFB (*.%1)</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 - Duplicate Skin</source>
         <translation>%1 - Повторяющаяся обложка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The skin &apos;%1&apos; already exists.</source>
         <translation>Обложка &apos;%1&apos; уже существует.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>%1 - Error</source>
         <translation>%1 - Ошибка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 is not a valid skin directory:
 %2</source>
         <translation>%1 не является корректным каталогом обложек:
@@ -5860,24 +4805,20 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewDeviceSkin</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="+259"/>
         <source>&amp;Portrait</source>
         <translation>&amp;Книжная</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Landscape (&amp;CCW)</source>
         <extracomment>Rotate form preview counter-clockwise</extracomment>
         <translation>Альбомная (&amp;против ЧС)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Landscape (CW)</source>
         <extracomment>Rotate form preview clockwise</extracomment>
         <translation>&amp;Альбомная (по ЧС)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
@@ -5885,7 +4826,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewManager</name>
     <message>
-        <location line="+426"/>
         <source>%1 - [Preview]</source>
         <translation>%1 - [Предпросмотр]</translation>
     </message>
@@ -5893,7 +4833,6 @@ Please select another name.</source>
 <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>
@@ -5903,57 +4842,46 @@ ate the goose who was loose.</source>
 <context>
     <name>qdesigner_internal::PreviewWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui"/>
         <source>Preview Window</source>
         <translation>Окно предпросмотра</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>
@@ -5961,22 +4889,18 @@ ate the goose who was loose.</source>
 <context>
     <name>qdesigner_internal::PromotionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="+17"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Header file</source>
         <translation>Заголовочный файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Global include</source>
         <translation>Глобальное включение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Usage</source>
         <translation>Использование</translation>
     </message>
@@ -5984,27 +4908,22 @@ ate the goose who was loose.</source>
 <context>
     <name>qdesigner_internal::PromotionTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="+85"/>
         <source>Promoted widgets...</source>
         <translation type="unfinished">Преобразованные виджеты...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promote to ...</source>
         <translation type="unfinished">Преобразовать в ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change signals/slots...</source>
         <translation>Изменить сигналы/слоты...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promote to</source>
         <translation type="unfinished">Преобразовать в</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Demote to %1</source>
         <translation type="unfinished">Преобразовать в %1</translation>
     </message>
@@ -6012,57 +4931,46 @@ ate the goose who was loose.</source>
 <context>
     <name>qdesigner_internal::PropertyEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="+231"/>
         <source>Add Dynamic Property...</source>
         <translation>Добавить динамическое свойство...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Remove Dynamic Property</source>
         <translation>Удалить динамическое свойство</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sorting</source>
         <translation>Сортировка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Color Groups</source>
         <translation type="unfinished">Цветовые группы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tree View</source>
         <translation>Древовидный список</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Drop Down Button View</source>
         <translation type="unfinished">Вид выпадающего списка</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>String...</source>
         <translation>Строка...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bool...</source>
         <translation>Булево...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Other...</source>
         <translation>Другое...</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Configure Property Editor</source>
         <translation>Настроить радактор свойств</translation>
     </message>
     <message>
-        <location line="+539"/>
         <source>Object: %1
 Class: %2</source>
         <translation>Объект: %1
@@ -6072,7 +4980,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::PropertyLineEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/propertylineedit.cpp" line="+88"/>
         <source>Insert line break</source>
         <translation>Вставить разрыв строки</translation>
     </message>
@@ -6080,27 +4987,22 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::QDesignerPromotionDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="+85"/>
         <source>Promoted Widgets</source>
         <translation type="unfinished">Преобразованные виджеты</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Promoted Classes</source>
         <translation type="unfinished">Преобразованные классы</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>Promote</source>
         <translation type="unfinished">Преобразовать</translation>
     </message>
     <message>
-        <location line="+152"/>
         <source>Change signals/slots...</source>
         <translation>Изменить сигналы/слоты...</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>%1 - Error</source>
         <translation>%1 - Ошибка</translation>
     </message>
@@ -6108,22 +5010,18 @@ Class: %2</source>
 <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>Загрузка файла 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>Не удалось найти указанный файл qrc &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Желаете обновить его расположение?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>New location for %1</source>
         <translation>Новое расположение %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Resource files (*.qrc)</source>
         <translation>Файл ресурсов (*.qrc)</translation>
     </message>
@@ -6131,112 +5029,90 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::QDesignerTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+68"/>
         <source>Change objectName...</source>
         <translation>Изменить objectName...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change toolTip...</source>
         <translation>Изменить toolTip...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change whatsThis...</source>
         <translation>Изменить whatsThis...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change styleSheet...</source>
         <translation>Изменить styleSheet...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create Menu Bar</source>
         <translation>Создать панель меню</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Tool Bar</source>
         <translation>Добавить панель инструментов</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Create Status Bar</source>
         <translation>Создать строку состояния</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Remove Status Bar</source>
         <translation>Удалить строку состояния</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change script...</source>
         <translation>Изменить сценарий...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change signals/slots...</source>
         <translation>Изменить сигналы/слоты...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go to slot...</source>
         <translation>Перейти к слоту...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Size Constraints</source>
         <translation>Ограничения размера</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Width</source>
         <translation>Установить минимальную ширину</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Height</source>
         <translation>Установить минимальную высоту</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Size</source>
         <translation>Установить минимальный размер</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Set Maximum Width</source>
         <translation>Установить максимальную ширину</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Maximum Height</source>
         <translation>Установить максимальную высоту</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Maximum Size</source>
         <translation>Установить максимальный размер</translation>
     </message>
     <message>
-        <location line="+235"/>
         <source>Edit ToolTip</source>
         <translation>Правка текста всплывающей подсказки</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Edit WhatsThis</source>
         <translation>Правка текста подсказки режима &quot;Что это?&quot;</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>no signals available</source>
         <translation>Нет доступных сигналов</translation>
     </message>
     <message numerus="yes">
-        <location line="+67"/>
         <source>Set size constraint on %n widget(s)</source>
         <translation>
             <numerusform>Установка ограничений размера для %n виджета</numerusform>
@@ -6248,42 +5124,34 @@ Class: %2</source>
 <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>Неожиданный элемент &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>Возникла ошибка разбора в строке %1 позиции %2 кода XML, определённого для виджета %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>Код XML, определённый для виджета %1, не содержит каких-либо элементов виджетов.
 %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>Обнаружена ошибка в строке %1 из %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>Обнаружен неожиданный элемент &lt;%1&gt; вместо &lt;widget&gt; или &lt;ui&gt;</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unexpected end of file encountered when parsing widgets.</source>
         <translation>Файл неожиданно закончился при разборе виджетов.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>A widget element could not be found.</source>
         <translation>Не удалось обнаружить элемент виджета.</translation>
     </message>
@@ -6291,73 +5159,58 @@ Class: %2</source>
 <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>Оттенок</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Sat</source>
         <translation>Насыщ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val</source>
         <translation>Знач</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Saturation</source>
         <translation>Насыщенность</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
         <translation>Значение</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>Красный</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Green</source>
         <translation>Зелёный</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Blue</source>
         <translation>Синий</translation>
     </message>
@@ -6365,27 +5218,22 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::RichTextEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+436"/>
         <source>Edit text</source>
         <translation>Правка текста</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Rich Text</source>
         <translation>Форматированный текст</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Source</source>
         <translation type="unfinished">Исходник</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
@@ -6393,72 +5241,58 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::RichTextEditorToolBar</name>
     <message>
-        <location line="-302"/>
         <source>Bold</source>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+B</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+I</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Underline</source>
         <translation>Подчёркнутый</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+U</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Left Align</source>
         <translation>По левому краю</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Center</source>
         <translation>По центру</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Right Align</source>
         <translation>По правому краю</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Justify</source>
         <translation>По ширине</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Superscript</source>
         <translation>Верхний индекс</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Subscript</source>
         <translation>Нижний индекс</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Insert &amp;Link</source>
         <translation>Вставить &amp;ссылку</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Insert &amp;Image</source>
         <translation>Вставить &amp;изображение</translation>
     </message>
@@ -6466,17 +5300,14 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ScriptDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="+66"/>
         <source>Edit script</source>
         <translation>Правка сценария</translation>
     </message>
     <message>
-        <location line="+5"/>
         <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;Укажите сценарий Qt, который должен выполняться при загрузке формы.&lt;br&gt;Виджет и его дочерние виджеты доступны через переменные &lt;i&gt;widget&lt;/i&gt; и &lt;i&gt;childWidgets&lt;/i&gt;.</translation>
     </message>
     <message>
-        <location line="+51"/>
         <source>Syntax error</source>
         <translation>Синтаксическая ошибка</translation>
     </message>
@@ -6484,7 +5315,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ScriptErrorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="+27"/>
         <source>Script errors</source>
         <translation>Ошибки сценария</translation>
     </message>
@@ -6492,23 +5322,18 @@ Class: %2</source>
 <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>Уже есть слот с сигнатурой &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>There is already a signal with the signature &apos;%1&apos;.</source>
         <translation>Уже есть сигнал с сигнатурой &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 - Duplicate Signature</source>
         <translation>%1 - Повторяющаяся сигнатура</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <location line="+76"/>
         <source>Signals/Slots of %1</source>
         <translation>Сигналы/слоты %1</translation>
     </message>
@@ -6516,12 +5341,10 @@ Class: %2</source>
 <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>Изменение сигналов/слотов</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F4</source>
         <translation></translation>
     </message>
@@ -6529,7 +5352,6 @@ Class: %2</source>
 <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>Изменение сигналов/слотов</translation>
     </message>
@@ -6537,7 +5359,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::StatusBarTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp" line="+81"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
@@ -6545,7 +5366,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::StringListEditorButton</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp" line="+56"/>
         <source>Change String List</source>
         <translation>Изменить список строк</translation>
     </message>
@@ -6553,38 +5373,30 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::StyleSheetEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="+90"/>
-        <location line="+280"/>
         <source>Valid Style Sheet</source>
         <translation>Корректная таблица стилей</translation>
     </message>
     <message>
-        <location line="-278"/>
         <source>Add Resource...</source>
         <translation>Добавить ресурс...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Gradient...</source>
         <translation>Добавить градиент...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Color...</source>
         <translation>Добавить цвет...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Font...</source>
         <translation>Добавить шрифт...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Edit Style Sheet</source>
         <translation>Правка таблицы стилей</translation>
     </message>
     <message>
-        <location line="+276"/>
         <source>Invalid Style Sheet</source>
         <translation>Некорректная таблица стилей</translation>
     </message>
@@ -6592,27 +5404,22 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="+363"/>
         <source>Start from Here</source>
         <translation>Начать отсюда</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restart</source>
         <translation>Перезапустить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Tab Order List...</source>
         <translation>Список порядка переключений...</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Tab Order List</source>
         <translation>Список порядка переключений</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tab Order</source>
         <translation>Порядок переключений</translation>
     </message>
@@ -6620,7 +5427,6 @@ Class: %2</source>
 <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>Изменение порядка переключений</translation>
     </message>
@@ -6628,7 +5434,6 @@ Class: %2</source>
 <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>Изменить порядок переключений</translation>
     </message>
@@ -6636,48 +5441,38 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TableWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui"/>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="+218"/>
         <source>Properties &amp;&gt;&gt;</source>
         <translation>Свойства &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Edit Table Widget</source>
         <translation>Правка табличного виджета</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Items</source>
         <translation>&amp;Элементы</translation>
     </message>
     <message>
-        <location/>
         <source>Table Items</source>
         <translation>Элементы таблицы</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="-151"/>
         <source>New Column</source>
         <translation>Новый столбец</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>New Row</source>
         <translation>Новая строка</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Columns</source>
         <translation>С&amp;толбцы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Rows</source>
         <translation>&amp;Строки</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Свойства &amp;&lt;&lt;</translation>
     </message>
@@ -6685,7 +5480,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TableWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp" line="+64"/>
         <source>Edit Items...</source>
         <translation>Изменить элементы...</translation>
     </message>
@@ -6693,22 +5487,18 @@ Class: %2</source>
 <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>Выберите каталог для сохранения шаблонов</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Additional Template Paths</source>
         <translation>Дополнительные пути к шаблонам</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6716,22 +5506,18 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TextEditTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="+58"/>
         <source>Edit HTML</source>
         <translation>Правка HTML</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change HTML...</source>
         <translation>Изменить HTML...</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Edit Text</source>
         <translation>Правка текста</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Plain Text...</source>
         <translation>Правка обычного текста...</translation>
     </message>
@@ -6739,22 +5525,18 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TextEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-204"/>
         <source>Choose Resource...</source>
         <translation>Выбрать ресурс...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Выбрать файл...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="+118"/>
         <source>Choose a File</source>
         <translation>Выбор файла</translation>
     </message>
@@ -6762,27 +5544,22 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="+148"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation>Вставить разделитель перед &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Append Separator</source>
         <translation>Добавить разделитель</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Удалить действие &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Remove Toolbar &apos;%1&apos;</source>
         <translation>Удалить панель инструментов &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Insert Separator</source>
         <translation>Вставить разделитель</translation>
     </message>
@@ -6790,125 +5567,98 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TreeWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+68"/>
         <source>New Column</source>
         <translation>Новый столбец</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Columns</source>
         <translation>С&amp;толбцы</translation>
     </message>
     <message>
-        <location line="+69"/>
         <source>Per column properties</source>
         <translation>Свойства столбца</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Common properties</source>
         <translation>Общие свойства</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>Новый элемент</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+19"/>
         <source>New Subitem</source>
         <translation>Новый дочерний элемент</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+175"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Свойства &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>Свойства &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Edit Tree Widget</source>
         <translation type="unfinished">Изменение виджета Дерево</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Items</source>
         <translation>&amp;Элементы</translation>
     </message>
     <message>
-        <location/>
         <source>Tree Items</source>
         <translation>Элементы дерева</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Новый</translation>
     </message>
     <message>
-        <location/>
         <source>New &amp;Subitem</source>
         <translation>Новый &amp;дочерний элемент</translation>
     </message>
     <message>
-        <location/>
         <source>Delete Item</source>
         <translation>Удалить элемент</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Left (before Parent Item)</source>
         <translation>Переместить элемент влево (перед родительским)</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>Переместить элемент вправо (сделать первым дочерним элементом соседнего элемента)</translation>
     </message>
     <message>
-        <location/>
         <source>R</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Up</source>
         <translation>Переместить элемент вверх</translation>
     </message>
     <message>
-        <location/>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Down</source>
         <translation>Переместить элемент вниз</translation>
     </message>
     <message>
-        <location/>
         <source>D</source>
         <translation>D</translation>
     </message>
@@ -6916,7 +5666,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TreeWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp" line="+63"/>
         <source>Edit Items...</source>
         <translation>Изменить элементы...</translation>
     </message>
@@ -6924,7 +5673,6 @@ Class: %2</source>
 <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>Предупреждение: Не удалось создать виджет. Это могло произойти из-за некорректного XML пользовательского виджета.</translation>
     </message>
@@ -6932,42 +5680,34 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetBoxTreeWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="-268"/>
         <source>Scratchpad</source>
         <translation type="unfinished">Блокнот</translation>
     </message>
     <message>
-        <location line="+370"/>
         <source>Custom Widgets</source>
         <translation>Пользовательские виджеты</translation>
     </message>
     <message>
-        <location line="+263"/>
         <source>Expand all</source>
         <translation>Развернуть всё</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Collapse all</source>
         <translation>Свернуть всё</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>List View</source>
         <translation>Список</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Icon View</source>
         <translation>Значки</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Edit name</source>
         <translation>Изменить имя</translation>
     </message>
@@ -6975,7 +5715,6 @@ Class: %2</source>
 <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>Обнаружен пользовательский модуль виджета, имя класса (%1) которого совпадает с уже имеющимся.</translation>
     </message>
@@ -6983,7 +5722,6 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetEditorTool</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/tool_widgeteditor.cpp" line="+67"/>
         <source>Edit Widgets</source>
         <translation>Изменение виджетов</translation>
     </message>
@@ -6991,34 +5729,28 @@ Class: %2</source>
 <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>Пользовательская фабрика виджетов, зарегистрированная для класса %1, вернула 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>Обнаружено несоответствие имени класса при создании виджета с использованием пользовательской фабрики виджетов, зарегистрированной для класса %1. Она вернула виджет класса %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>%1 Widget</source>
         <translation>Виджет %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 type="unfinished">При создании компоновщика не удалось определить текущую страницу контейнера &apos;%1&apos; (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для контейнерного виджета.</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>Попытка добавить компоновщик виджету &apos;%1&apos; (%2), у которого уже есть компоновщик типа %3.
 Это указывает на некорректность файла ui.</translation>
     </message>
     <message>
-        <location line="+211"/>
         <source>Cannot create style &apos;%1&apos;.</source>
         <translation>Не удалось создать стиль &apos;%1&apos;.</translation>
     </message>
@@ -7026,12 +5758,10 @@ This indicates an inconsistency in the ui-file.</source>
 <context>
     <name>qdesigner_internal::WizardContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="-49"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
@@ -7039,7 +5769,6 @@ This indicates an inconsistency in the ui-file.</source>
 <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>
@@ -7048,7 +5777,6 @@ This indicates an inconsistency in the ui-file.</source>
 <context>
     <name>qdesigner_internal::ZoomablePreviewDeviceSkin</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="-270"/>
         <source>&amp;Zoom</source>
         <translation>Мас&amp;штаб</translation>
     </message>
diff --git a/translations/designer_sl.ts b/translations/designer_sl.ts
index 9399022..8d2a161 100644
--- a/translations/designer_sl.ts
+++ b/translations/designer_sl.ts
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="sl_SI">
+    <extra-po-header-po_revision_date>2010-08-05 02:42+0200</extra-po-header-po_revision_date>
+    <extra-po-headers>MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator</extra-po-headers>
+    <extra-po-header-x_generator>Lokalize 1.1</extra-po-header-x_generator>
+    <extra-po-header-language_team>Slovenian &lt;lugos-slo@lugos.si&gt;</extra-po-header-language_team>
+    <extra-po-header-project_id_version></extra-po-header-project_id_version>
+    <extra-po-header_comment># Jure Repinc &lt;jlp@holodeck1.com&gt;, 2010.</extra-po-header_comment>
+    <extra-po-header-last_translator>Jure Repinc &lt;jlp@holodeck1.com&gt;</extra-po-header-last_translator>
 <context>
     <name>AbstractFindWidget</name>
     <message>
-        <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="+127"/>
         <source>&amp;Previous</source>
         <translation>&amp;Predhodni</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Next</source>
         <translation>&amp;Naslednji</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>&amp;Case sensitive</source>
         <translation>O&amp;bčutljiv na velikost črk</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Whole &amp;words</source>
         <translation>&amp;Cele besede</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;Iskanje se nadaljuje na drugem koncu</translation>
     </message>
@@ -32,17 +34,14 @@
 <context>
     <name>AddLinkDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/addlinkdialog.ui"/>
         <source>Insert Link</source>
         <translation>Vstavi povezavo</translation>
     </message>
     <message>
-        <location/>
         <source>Title:</source>
         <translation>Besedilo:</translation>
     </message>
     <message>
-        <location/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
@@ -50,7 +49,6 @@
 <context>
     <name>AppFontDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="+418"/>
         <source>Additional Fonts</source>
         <translation>Dodatne pisave</translation>
     </message>
@@ -58,37 +56,30 @@
 <context>
     <name>AppFontManager</name>
     <message>
-        <location line="-267"/>
         <source>&apos;%1&apos; is not a file.</source>
         <translation>»%1« ni datoteka.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The font file &apos;%1&apos; does not have read permissions.</source>
         <translation>Datoteka s pisavo »%1« nima dovoljenj za branje.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The font file &apos;%1&apos; is already loaded.</source>
         <translation>Datoteka s pisavo »%1« je že naložena.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The font file &apos;%1&apos; could not be loaded.</source>
         <translation>Datoteke s pisavo »%1« ni bilo moč naložiti.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&apos;%1&apos; is not a valid font id.</source>
         <translation>»%1« ni veljaven ID za pisavo.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>There is no loaded font matching the id &apos;%1&apos;.</source>
         <translation>Ni naložene pisave, ki bi se ujemala z ID-jem »%1«.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>The font &apos;%1&apos; (%2) could not be unloaded.</source>
         <translation>Pisave »%1« (%2) ni bilo moč odstraniti.</translation>
     </message>
@@ -96,52 +87,42 @@
 <context>
     <name>AppFontWidget</name>
     <message>
-        <location line="+26"/>
         <source>Fonts</source>
         <translation>Pisave</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Add font files</source>
         <translation>Dodaj datoteke s pisavami</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Remove current font file</source>
         <translation>Odstrani trenutno datoteko s pisavo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Remove all font files</source>
         <translation>Odstrani vse datoteke s pisavami</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Add Font Files</source>
         <translation>Dodaj datoteke s pisavami</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font files (*.ttf)</source>
         <translation>Datoteke s pisavami (*.ttf)</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Error Adding Fonts</source>
         <translation>Napaka pri dodajanju pisav</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Error Removing Fonts</source>
         <translation>Napaka pri odstranjevanju pisav</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Remove Fonts</source>
         <translation>Odstrani pisave</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Would you like to remove all fonts?</source>
         <translation>Ali želite odstraniti vse pisave?</translation>
     </message>
@@ -149,12 +130,10 @@
 <context>
     <name>AppearanceOptionsWidget</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>User Interface Mode</source>
         <translation>Način uporabniškega vmesnika</translation>
     </message>
@@ -162,17 +141,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>Ni moč poslati zahtevka: pomočnik se ne odziva.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>The binary &apos;%1&apos; does not exist.</source>
         <translation>Program »%1« ne obstaja.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unable to launch assistant (%1).</source>
         <translation>Ni moč zaganti pomočnika (%1).</translation>
     </message>
@@ -180,92 +156,74 @@
 <context>
     <name>BrushPropertyManager</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="+52"/>
         <source>No brush</source>
         <translation>Brez čopiča</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Solid</source>
         <translation>Enobarven</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 1</source>
         <translation>Gost 1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 2</source>
         <translation>Gost 2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 3</source>
         <translation>Gost 3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 4</source>
         <translation>Gost 4</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 5</source>
         <translation>Gost 5</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 6</source>
         <translation>Gost 6</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dense 7</source>
         <translation>Gost 7</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Horizontal</source>
         <translation>Vodoraven</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Vertical</source>
         <translation>Navpičen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cross</source>
         <translation>Križ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backward diagonal</source>
         <translation>Poševen nazaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Forward diagonal</source>
         <translation>Poševen naprej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Crossing diagonal</source>
         <translation>Poševen prekrižan</translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Style</source>
         <translation>Slog</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>[%1, %2]</source>
         <translation>[%1, %2]</translation>
     </message>
@@ -273,360 +231,280 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="+208"/>
-        <location line="+258"/>
         <source>Change signal</source>
         <translation>Spremeni signal</translation>
     </message>
     <message>
-        <location line="-256"/>
-        <location line="+268"/>
         <source>Change slot</source>
         <translation>Spremeni režo</translation>
     </message>
     <message>
-        <location line="-220"/>
         <source>Change signal-slot connection</source>
         <translation>Spremeni povezavo signal-reža</translation>
     </message>
     <message>
-        <location line="+234"/>
         <source>Change sender</source>
         <translation>Spremeni pošiljatelja</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Change receiver</source>
         <translation>Spremeni prejemnika</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+143"/>
         <source>Add connection</source>
         <translation>Dodaj povezavo</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Adjust connection</source>
         <translation>Prilagodi povezavo</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Delete connections</source>
         <translation>Zbriši povezave</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Change source</source>
         <translation>Spremeni izvor</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Change target</source>
         <translation>Spremeni cilj</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="+149"/>
         <source>Insert &apos;%1&apos;</source>
         <translation>Vstavi »%1«</translation>
     </message>
     <message>
-        <location line="+167"/>
         <source>Raise &apos;%1&apos;</source>
         <translation>Dvigni »%1«</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Lower &apos;%1&apos;</source>
         <translation>Spusti »%1«</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Delete &apos;%1&apos;</source>
         <translation>Zbriši »%1«</translation>
     </message>
     <message>
-        <location line="+119"/>
         <source>Reparent &apos;%1&apos;</source>
         <translation>Spremeni starša od »%1«</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Promote to custom widget</source>
         <translation>Povišaj v gradnik po meri</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Demote from custom widget</source>
         <translation>Ponižaj iz gradnika po meri</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Lay out using grid</source>
         <translation>Razporedi z uporabo mreže</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lay out vertically</source>
         <translation>Razporedi navpično</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lay out horizontally</source>
         <translation>Razporedi vodoravno</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Break layout</source>
         <translation>Razbij razporeditev</translation>
     </message>
     <message>
-        <location line="+240"/>
-        <location line="+235"/>
-        <location line="+78"/>
         <source>Move Page</source>
         <translation>Premakni stran</translation>
     </message>
     <message>
-        <location line="-279"/>
-        <location line="+123"/>
-        <location line="+188"/>
-        <location line="+666"/>
         <source>Delete Page</source>
         <translation>Zbriši stran</translation>
     </message>
     <message>
-        <location line="-939"/>
-        <location line="+123"/>
         <source>Page</source>
         <translation>Stran</translation>
     </message>
     <message>
-        <location line="+860"/>
         <source>page</source>
         <translation>stran</translation>
     </message>
     <message>
-        <location line="-978"/>
-        <location line="+123"/>
-        <location line="+186"/>
-        <location line="+667"/>
         <source>Insert Page</source>
         <translation>Vstavi stran</translation>
     </message>
     <message>
-        <location line="-647"/>
         <source>Change Tab order</source>
         <translation>Spremeni vrstni red tabulatorke</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Create Menu Bar</source>
         <translation>Ustvari menijsko vrstico</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Delete Menu Bar</source>
         <translation>Zbriši menijsko vrstico</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Create Status Bar</source>
         <translation>Ustvari vrstico stanja</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Delete Status Bar</source>
         <translation>Zbriši vrstico stanja</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Add Tool Bar</source>
         <translation>Dodaj orodjarno</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Add Dock Window</source>
         <translation>Dodaj podokno</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Adjust Size of &apos;%1&apos;</source>
         <translation>Prilagodi velikost za »%1«</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Change Form Layout Item Geometry</source>
         <translation>Spremeni geometrijo razporeditve na obrazcu</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>Change Layout Item Geometry</source>
         <translation>Spremeni geometrijo razporeda</translation>
     </message>
     <message>
-        <location line="+576"/>
         <source>Change Table Contents</source>
         <translation>Spremeni vsebino tabele</translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Change Tree Contents</source>
         <translation>Spremeni vsebino drevesa</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location line="+146"/>
         <source>Add action</source>
         <translation>Dodaj dejanje</translation>
     </message>
     <message>
-        <location line="-120"/>
-        <location line="+126"/>
         <source>Remove action</source>
         <translation>Odstrani dejanje</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Add menu</source>
         <translation>Dodaj meni</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Remove menu</source>
         <translation>Odstrani meni</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Create submenu</source>
         <translation>Ustvari podmeni</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Delete Tool Bar</source>
         <translation>Zbriši orodjarno</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="+1195"/>
         <source>Set action text</source>
         <translation>Nastavi besedilo dejanja</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert action</source>
         <translation>Vstavi dejanje</translation>
     </message>
     <message>
-        <location line="+89"/>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+907"/>
         <source>Move action</source>
         <translation>Premakni dejanje</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-424"/>
         <source>Change Title</source>
         <translation>Spremeni naslov</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Insert Menu</source>
         <translation>Vstavi meni</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="+202"/>
         <source>Change signals/slots</source>
         <translation>Spremeni signale/reže</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="-867"/>
         <source>Delete Subwindow</source>
         <translation>Zbriši podokno</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Insert Subwindow</source>
         <translation>Vstavi 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>Spremeni vrstni red v smeri Z od »%1«</translation>
     </message>
     <message>
-        <location line="+625"/>
         <source>Simplify Grid Layout</source>
         <translation>Poenostavi razporeditev v mrežo</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+221"/>
         <source>Create button group</source>
         <translation>Ustvari skupino gumbov</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Break button group</source>
         <translation>Razbij skupino gumbov</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Break button group &apos;%1&apos;</source>
         <translation>Razbij skupino gumbov »%1«</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Add buttons to group</source>
         <translation>Dodaj gumbe v skupino</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="+458"/>
         <source>Add &apos;%1&apos; to &apos;%2&apos;</source>
-        <extracomment>Command description for adding buttons to a QButtonGroup</extracomment>
+        <extracomment>Command description for adding buttons to a QButtonGroup
+</extracomment>
         <translation>Dodaj »%1« v »%2«</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Remove buttons from group</source>
         <translation>Odstrani gumbe iz te skupine</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>
+        <extracomment>Command description for removing buttons from a QButtonGroup
+</extracomment>
         <translation>Odstrani »%1« iz »%2«</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>
+        <extracomment>MorphWidgetCommand description
+</extracomment>
         <translation>Pretvori %1/»%2« v %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>Spremeni razpored od »%1« iz %2 v %3</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/scriptcommand.cpp" line="+55"/>
         <source>Change script</source>
         <translation>Spremeni skript</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="+1213"/>
         <source>Changed &apos;%1&apos; of &apos;%2&apos;</source>
         <translation>Spremenil »%1« od »%2«</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Changed &apos;%1&apos; of %n objects</source>
         <translation>
             <numerusform>Spremenil »%1« od %n objekta</numerusform>
@@ -636,12 +514,10 @@
         </translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Reset &apos;%1&apos; of &apos;%2&apos;</source>
         <translation>Ponastavi »%1« od »%2«</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Reset &apos;%1&apos; of %n objects</source>
         <translation>
             <numerusform>Ponastavi »%1« od %n objekta</numerusform>
@@ -651,12 +527,10 @@
         </translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Add dynamic property &apos;%1&apos; to &apos;%2&apos;</source>
         <translation>Dodaj dinamično lastnost »%1« k »%2«</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Add dynamic property &apos;%1&apos; to %n objects</source>
         <translation>
             <numerusform>Dodaj dinamično lastnost »%1« k %n objektu</numerusform>
@@ -666,12 +540,10 @@
         </translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Remove dynamic property &apos;%1&apos; from &apos;%2&apos;</source>
         <translation>Odstrani dinamično lastnost »%1« od »%2«</translation>
     </message>
     <message numerus="yes">
-        <location line="+3"/>
         <source>Remove dynamic property &apos;%1&apos; from %n objects</source>
         <translation>
             <numerusform>Odstrani dinamično lastnost »%1« od %n objekta</numerusform>
@@ -684,22 +556,18 @@
 <context>
     <name>ConnectDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui"/>
         <source>Configure Connection</source>
         <translation>Nastavi povezavo</translation>
     </message>
     <message>
-        <location/>
         <source>GroupBox</source>
         <translation>Skupina</translation>
     </message>
     <message>
-        <location/>
         <source>Edit...</source>
         <translation>Urejanje ...</translation>
     </message>
     <message>
-        <location/>
         <source>Show signals and slots inherited from QWidget</source>
         <translation>Prikaži signale in reže podedovane od QWidget</translation>
     </message>
@@ -707,17 +575,14 @@
 <context>
     <name>ConnectionDelegate</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="+643"/>
         <source>&lt;object&gt;</source>
         <translation>&lt;objekt&gt;</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>&lt;signal&gt;</source>
         <translation>&lt;signal&gt;</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&lt;slot&gt;</source>
         <translation>&lt;reža&gt;</translation>
     </message>
@@ -725,110 +590,93 @@
 <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>
+        <extracomment>Embedded device standard screen resolution
+</extracomment>
         <translation>Običajna (96 × 96)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Greenphone (179 x 185)</source>
-        <extracomment>Embedded device screen resolution</extracomment>
+        <extracomment>Embedded device screen resolution
+</extracomment>
         <translation>Greenphone (179 × 185)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>High (192 x 192)</source>
-        <extracomment>Embedded device high definition screen resolution</extracomment>
+        <extracomment>Embedded device high definition screen resolution
+</extracomment>
         <translation>Visoka (192 × 192)</translation>
     </message>
 </context>
 <context>
     <name>Designer</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+10"/>
         <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>Ta datoteka vsebuje praznine, ki so na vrhu.&lt;br&gt;&lt;b&gt;Niso&lt;/b&gt; bile shranjene v ta obrazec.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Perhaps you forgot to create a layout?</source>
         <translation>Morda ste pozabili ustvariti razpored?</translation>
     </message>
     <message>
-        <location line="+173"/>
         <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
         <translation>Neveljavna datoteka UI: manjka vrhnji element &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>Prišlo je do napake med branjem datoteke UI v vrstici %1, stolpcu %2: %3</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>This file cannot be read because it was created using %1.</source>
         <translation>Te datoteke ni moč prebrati, ker je bila ustvarjena z %1.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>This file was created using Designer from Qt-%1 and cannot be read.</source>
         <translation>Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in je ni moč prebrati.</translation>
     </message>
     <message>
-        <location line="+82"/>
         <source>This file cannot be read because the extra info extension failed to load.</source>
         <translation>Te datoteke ni moč prebrati, ker je spodletelo nalaganje razširitve za dodatne podatke.</translation>
     </message>
     <message>
-        <location line="-52"/>
         <source>The converted file could not be read.</source>
         <translation>Pretvorjene datoteke ni bilo moč prebrati.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer.</source>
         <translation>Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in bo pretvorjena v novo obliko.</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>Stara oblika ni bila spremenjena, vendar boste novo obliko morali shraniti pod novim imenom.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>This file was created using Designer from Qt-%1 and could not be read:
 %2</source>
         <translation>Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in je ni bilo moč prebrati:
 %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>Poženite jo skozi &lt;b&gt;uic3&amp;nbsp;-convert&lt;/b&gt; in jo tako pretvorite v zapis UI za Qt 4.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qsimpleresource.cpp" line="+339"/>
         <source>Custom Widgets</source>
         <translation>Gradniki po meri</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Promoted Widgets</source>
         <translation>Povišani gradniki</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="+682"/>
         <source>Unable to launch %1.</source>
         <translation>Ni moč zagnati %1.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 timed out.</source>
         <translation>Čas za %1 je potekel.</translation>
     </message>
@@ -836,12 +684,10 @@
 <context>
     <name>DesignerMetaEnum</name>
     <message>
-        <location line="-513"/>
         <source>%1 is not a valid enumeration value of &apos;%2&apos;.</source>
         <translation>%1 ni veljavna vrednost številčenja od »%2«.</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>»%1« ne more biti pretvorjeno v vrednost številčenja vrste »%2«.</translation>
     </message>
@@ -849,7 +695,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>»%1« ne more biti pretvorjeno v vrednost zastavice vrste »%2«.</translation>
     </message>
@@ -857,13 +702,12 @@
 <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>
+        <extracomment>Reading a number for an embedded device profile
+</extracomment>
         <translation>»%1« ni številka.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>An invalid tag &lt;%1&gt; was encountered.</source>
         <translation>Dosežena je bila neveljavna oznaka &lt;%1&gt;.</translation>
     </message>
@@ -871,27 +715,22 @@
 <context>
     <name>DeviceProfileDialog</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui"/>
         <source>&amp;Family</source>
         <translation>&amp;Družina</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Point Size</source>
         <translation>&amp;Velikost točke</translation>
     </message>
     <message>
-        <location/>
         <source>Style</source>
         <translation>Slog</translation>
     </message>
     <message>
-        <location/>
         <source>Device DPI</source>
         <translation>Ločljivost (točk/palec)</translation>
     </message>
     <message>
-        <location/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
@@ -899,57 +738,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>Slikovne datoteke »%1« ni bilo moč naložiti.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
         <translation>Mapa s temo »%1« ne vsebuje nastavitvene datoteke.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
         <translation>Nastavitvene datoteke za temo »%1« ni bilo moč odpreti.</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Syntax error: %1</source>
         <translation>Skladenjska napaka: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>The skin cursor image file &apos;%1&apos; does not exist.</source>
         <translation>Slikovna datoteka s kazalcem za temo »%1« ne obstaja.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Syntax error in area definition: %1</source>
         <translation>Skladenjska napaka pri določitvi območja: %1</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Mismatch in number of areas, expected %1, got %2.</source>
         <translation>Neujemanje v številu območij, pričakovano %1, dobljeno %2.</translation>
     </message>
     <message>
-        <location line="-187"/>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
         <translation>Nastavitvene datoteke za temo »%1« ni bilo moč prebrati: %2</translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>The skin &quot;up&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Datoteka slike »up« teme »%1« ne obstaja.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The skin &quot;down&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Datoteka slike »down« teme »%1« ne obstaja.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The skin &quot;closed&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Datoteka slike »closed« teme »%1« ne obstaja.</translation>
     </message>
@@ -957,51 +785,46 @@
 <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>
+        <extracomment>Format embedded device profile description
+</extracomment>
         <translation>&lt;html&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Pisava&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;Slog&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;Ločljivost&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%4 × %5&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
     <name>EmbeddedOptionsPage</name>
     <message>
-        <location line="+103"/>
         <source>Embedded Design</source>
-        <extracomment>Tab in preferences dialog</extracomment>
+        <extracomment>Tab in preferences dialog
+</extracomment>
         <translation>Vgrajena zasnova</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Device Profiles</source>
-        <extracomment>EmbeddedOptionsControl group box&quot;</extracomment>
+        <extracomment>EmbeddedOptionsControl group box&quot;
+</extracomment>
         <translation>Profili naprav</translation>
     </message>
 </context>
 <context>
     <name>FontPanel</name>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Writing system</source>
         <translation>S&amp;istem pisanja</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Family</source>
         <translation>&amp;Družina</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Style</source>
         <translation>&amp;Slog</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Point size</source>
         <translation>&amp;Velikost točke</translation>
     </message>
@@ -1009,22 +832,18 @@
 <context>
     <name>FontPropertyManager</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="+62"/>
         <source>PreferDefault</source>
         <translation>Prednost ima privzeto</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>NoAntialias</source>
         <translation>Brez glajenja robov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PreferAntialias</source>
         <translation>Prednost ima glajenje robov</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>Antialiasing</source>
         <translation>Glajenje robov</translation>
     </message>
@@ -1032,43 +851,47 @@
 <context>
     <name>FormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+359"/>
         <source>Invalid stretch value for &apos;%1&apos;: &apos;%2&apos;</source>
-        <extracomment>Parsing layout stretch values</extracomment>
+        <extracomment>Parsing layout stretch values
+----------
+Parsing layout stretch values
+----------
+Parsing layout stretch values
+</extracomment>
         <translation>Neveljavna vrednost razširjanja za »%1«: »%2«</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</extracomment>
+        <extracomment>Parsing grid layout minimum size values
+----------
+Parsing grid layout minimum size values
+----------
+Parsing grid layout minimum size values
+</extracomment>
         <translation>Neveljavna najmanjša velikost za »%1«: »%2«</translation>
     </message>
 </context>
 <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>Povečava ogleda</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Default Zoom</source>
         <translation>Privzeta povečava</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Forms</source>
-        <extracomment>Tab in preferences dialog</extracomment>
+        <extracomment>Tab in preferences dialog
+</extracomment>
         <translation>Obrazci</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Default Grid</source>
         <translation>Privzeta mreža</translation>
     </message>
@@ -1076,37 +899,30 @@
 <context>
     <name>FormLayoutRowDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui"/>
         <source>Add Form Layout Row</source>
         <translation>Dodaj vrstico razporeditve na obrazcu</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Label text:</source>
         <translation>&amp;Besedilo oznake:</translation>
     </message>
     <message>
-        <location/>
         <source>Field &amp;type:</source>
         <translation>&amp;Vrsta polja:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Field name:</source>
         <translation>&amp;Ime polja:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Buddy:</source>
         <translation>&amp;Kolega:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Row:</source>
         <translation>&amp;Vrstica:</translation>
     </message>
     <message>
-        <location/>
         <source>Label &amp;name:</source>
         <translation>&amp;Ime oznake:</translation>
     </message>
@@ -1114,12 +930,10 @@
 <context>
     <name>FormWindow</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="+1701"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Nepričakovan element &lt;%1&gt;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error while pasting clipboard contents at line %1, column %2: %3</source>
         <translation>Napaka pri lepljenju vsebine odložišča v vrstici %1, stolpcu %2: %3</translation>
     </message>
@@ -1127,62 +941,50 @@
 <context>
     <name>FormWindowSettings</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui"/>
         <source>Form Settings</source>
         <translation>Nastavitve obrazca</translation>
     </message>
     <message>
-        <location/>
         <source>Layout &amp;Default</source>
         <translation>&amp;Privzeto za razpored</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Spacing:</source>
         <translation>&amp;Razmik:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Margin:</source>
         <translation>&amp;Rob:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Layout Function</source>
         <translation>&amp;Funkcija za razpored</translation>
     </message>
     <message>
-        <location/>
         <source>Ma&amp;rgin:</source>
         <translation>R&amp;ob:</translation>
     </message>
     <message>
-        <location/>
         <source>Spa&amp;cing:</source>
         <translation>R&amp;azmik:</translation>
     </message>
     <message>
-        <location/>
         <source>Embedded Design</source>
         <translation>Vgrajena zasnova</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Author</source>
         <translation>&amp;Avtor</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Include Hints</source>
         <translation>Namigi za &amp;vključevanje</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Pixmap Function</source>
         <translation>F&amp;unkcija za sličico</translation>
     </message>
     <message>
-        <location/>
         <source>Grid</source>
         <translation>Mreža</translation>
     </message>
@@ -1190,7 +992,6 @@
 <context>
     <name>IconSelector</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="+352"/>
         <source>All Pixmaps (</source>
         <translation>Vse sličice (</translation>
     </message>
@@ -1198,42 +999,37 @@
 <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>
+        <extracomment>Sample string to determinate the width for the first column of the list item property browser
+</extracomment>
         <translation>XX Ikona Izbrano izklopljeno</translation>
     </message>
 </context>
 <context>
     <name>MainWindowBase</name>
     <message>
-        <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+119"/>
         <source>Main</source>
-        <extracomment>Not currently used (main tool bar)</extracomment>
+        <extracomment>Not currently used (main tool bar)
+</extracomment>
         <translation>Glavna</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit</source>
         <translation>Urejanje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tools</source>
         <translation>Orodja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
@@ -1241,52 +1037,42 @@
 <context>
     <name>NewForm</name>
     <message>
-        <location filename="../tools/designer/src/designer/newform.cpp" line="+79"/>
         <source>C&amp;reate</source>
         <translation>&amp;Ustvari</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Recent</source>
         <translation>Nedavno</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>&amp;Close</source>
         <translation>&amp;Zapri</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Open...</source>
         <translation>&amp;Odpri ...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Recent Forms</source>
         <translation>&amp;Nedavni obrazci</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>Read error</source>
         <translation>Napaka pri branju</translation>
     </message>
     <message>
-        <location line="-100"/>
         <source>New Form</source>
         <translation>Nov obrazec</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Show this Dialog on Startup</source>
         <translation>Prikaži to pogovorno okno ob zagonu</translation>
     </message>
     <message>
-        <location line="+128"/>
         <source>A temporary form file could not be created in %1.</source>
         <translation>Začasne datoteke obrazca v %1 ni bilo moč ustvariti.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary form file %1 could not be written.</source>
         <translation>V začasno datoteko obrazca %1 ni bilo moč pisati.</translation>
     </message>
@@ -1294,22 +1080,18 @@
 <context>
     <name>ObjectInspectorModel</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="+360"/>
         <source>Object</source>
         <translation>Objekt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Class</source>
         <translation>Razred</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>separator</source>
         <translation>ločitelj</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>&lt;noname&gt;</source>
         <translation>&lt;neimenovano&gt;</translation>
     </message>
@@ -1317,12 +1099,10 @@
 <context>
     <name>ObjectNameDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+158"/>
         <source>Change Object Name</source>
         <translation>Spremeni ime objekta</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Object Name</source>
         <translation>Ime objekta</translation>
     </message>
@@ -1330,12 +1110,10 @@
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plugindialog.ui"/>
         <source>Plugin Information</source>
         <translation>Podatki o vstavkih</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -1343,7 +1121,6 @@
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/preferencesdialog.ui"/>
         <source>Preferences</source>
         <translation>Nastavitve</translation>
     </message>
@@ -1351,32 +1128,26 @@
 <context>
     <name>PreviewConfigurationWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Print/Preview Configuration</source>
         <translation>Nastavitev tiskanja/ogleda</translation>
     </message>
     <message>
-        <location/>
         <source>Style</source>
         <translation>Slog</translation>
     </message>
     <message>
-        <location/>
         <source>Style sheet</source>
         <translation>Slogovna predloga</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Device skin</source>
         <translation>Tema naprave</translation>
     </message>
@@ -1384,17 +1155,15 @@
 <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>
+        <extracomment>Usage of promoted widgets
+</extracomment>
         <translation>Ni uporabljeno</translation>
     </message>
 </context>
 <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>Stran</translation>
     </message>
@@ -1402,59 +1171,48 @@
 <context>
     <name>QAbstractFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="+206"/>
         <source>Unexpected element &lt;%1&gt;</source>
         <translation>Nepričakovan 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>Prišlo je do napake med branjem datoteke UI v vrstici %1, stolpcu %2: %3</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
         <translation>Neveljavna datoteka UI: manjka vrhnji element &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+119"/>
         <source>The creation of a widget of the class &apos;%1&apos; failed.</source>
         <translation>Ustvarjanje gradnika razreda »%1« ni uspelo.</translation>
     </message>
     <message>
-        <location line="+296"/>
         <source>Attempt to add child that is not of class QWizardPage to QWizard.</source>
         <translation>Poskus dodajanja podgradnika, ki ni razreda QWizardPage ali 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>Poskus dodajanja razporeda gradniku »%1« (%2), ki že ima razpored ne-okvirne vrste %3.
 To nakazuje na neskladnost v datoteki *.ui.</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Empty widget item in %1 &apos;%2&apos;.</source>
         <translation>Prazna postavka gradnika v %1 »%2«.</translation>
     </message>
     <message>
-        <location line="+680"/>
         <source>Flags property are not supported yet.</source>
         <translation>Lastnosti z zastavicami še niso podprte.</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>While applying tab stops: The widget &apos;%1&apos; could not be found.</source>
         <translation>Med uveljavljanjem postankov tabulatorke: gradnika »%1« ni bilo moč najti.</translation>
     </message>
     <message>
-        <location line="+908"/>
         <source>Invalid QButtonGroup reference &apos;%1&apos; referenced by &apos;%2&apos;.</source>
         <translation>Neveljavna referenca »%1« na QButtonGroup od »%2«.</translation>
     </message>
     <message>
-        <location line="+511"/>
         <source>This version of the uitools library is linked without script support.</source>
         <translation>Ta različica knjižnice uitools nima podpore za skripte.</translation>
     </message>
@@ -1462,12 +1220,10 @@ To nakazuje na neskladnost v datoteki *.ui.</translation>
 <context>
     <name>QAxWidgetPlugin</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp" line="+75"/>
         <source>ActiveX control</source>
         <translation>Kontrolnik ActiveX</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>ActiveX control widget</source>
         <translation>Gradnik kontrolnika ActiveX</translation>
     </message>
@@ -1475,22 +1231,18 @@ To nakazuje na neskladnost v datoteki *.ui.</translation>
 <context>
     <name>QAxWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="+119"/>
         <source>Set Control</source>
         <translation>Nastavi kontrolnik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset Control</source>
         <translation>Ponastavi kontrolnik</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Licensed Control</source>
         <translation>Licenciran kontrolnik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The control requires a design-time license</source>
         <translation>Kontrolnik potrebuje licenco za čas snovanja</translation>
     </message>
@@ -1498,67 +1250,54 @@ To nakazuje na neskladnost v datoteki *.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 ni povišan razred.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>The base class %1 is invalid.</source>
         <translation>Osnovni razred %1 ni veljaven.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The class %1 already exists.</source>
         <translation>Razred %1 že obstaja.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Promoted Widgets</source>
         <translation>Povišani gradniki</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>The class %1 cannot be removed</source>
         <translation>Razreda %1 ni moč odstraniti</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The class %1 cannot be removed because it is still referenced.</source>
         <translation>Razreda %1 ni moč odstraniti, ker se nanj še vedno nanašajo reference.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The class %1 cannot be renamed</source>
         <translation>Razreda %1 ni moč preimenovati</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The class %1 cannot be renamed to an empty name.</source>
         <translation>Razreda %1 ni moč preimenovati s praznim imenom.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>There is already a class named %1.</source>
         <translation>Razred z imenom %1 že obstaja.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Cannot set an empty include file.</source>
         <translation>Ni moč nastaviti prazne vključene datoteke.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="+88"/>
         <source>Exception at line %1: %2</source>
         <translation>Izjema v vrstici %1: %2</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>An error occurred while running the script for %1: %2
 Script: %3</source>
         <translation>Prišlo je do napake pri zaganjanju skripta za %1: %2
@@ -1568,17 +1307,14 @@ Skript: %3</translation>
 <context>
     <name>QDesigner</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner.cpp" line="+141"/>
         <source>%1 - warning</source>
         <translation>%1 - opozorilo</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>Programa ni moč uporabiti za konzolno izdajo Qt</translation>
     </message>
@@ -1586,186 +1322,146 @@ Skript: %3</translation>
 <context>
     <name>QDesignerActions</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="+178"/>
         <source>Edit Widgets</source>
         <translation>Urejanje gradnikov</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Quit</source>
         <translation>Konča&amp;j</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Minimize</source>
         <translation>Po&amp;manjšaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bring All to Front</source>
         <translation>Prinesi vse v ospredje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Preferences...</source>
         <translation>Nastavitve ...</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Clear &amp;Menu</source>
         <translation>Počisti &amp;meni</translation>
     </message>
     <message>
-        <location line="-233"/>
         <source>CTRL+SHIFT+S</source>
         <translation>CTRL+SHIFT+S</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>CTRL+R</source>
         <translation>CTRL+R</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>CTRL+M</source>
         <translation>CTRL+M</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Qt Designer &amp;Help</source>
         <translation>P&amp;riročnik za Qt Designer</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Current Widget Help</source>
         <translation>Pomoč za trenutni gradnik</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>What&apos;s New in Qt Designer?</source>
         <translation>Kaj je novega v Qt Designerju?</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>About Plugins</source>
         <translation>O vstavkih</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+601"/>
         <source>About Qt Designer</source>
         <translation>O Qt Designer</translation>
     </message>
     <message>
-        <location line="-595"/>
         <source>About Qt</source>
         <translation>O Qt</translation>
     </message>
     <message>
-        <location line="+121"/>
-        <location line="+197"/>
         <source>Open Form</source>
         <translation>Odpri obrazec</translation>
     </message>
     <message>
-        <location line="-196"/>
-        <location line="+37"/>
-        <location line="+160"/>
         <source>Designer UI files (*.%1);;All Files (*)</source>
         <translation>Designerjeve datoteke UI (*.%1);;Vse datoteke (*)</translation>
     </message>
     <message>
-        <location line="-620"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 že obstaja.
 Ali jo želite nadomestiti?</translation>
     </message>
     <message>
-        <location line="-26"/>
         <source>Saved %1.</source>
         <translation>Shranil %1.</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Additional Fonts...</source>
         <translation>Dodatne pisave ...</translation>
     </message>
     <message>
-        <location line="+303"/>
         <source>&amp;Recent Forms</source>
         <translation>N&amp;edavni obrazci</translation>
     </message>
     <message>
-        <location line="+202"/>
         <source>Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Feature not implemented yet!</source>
         <translation>Zmožnost še ni izdelana.</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Read error</source>
         <translation>Napaka pri branju</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1
 Do you want to update the file location or generate a new form?</source>
         <translation>%1
 Ali želite posodobiti lokacijo datoteke ali ustvariti nov obrazec?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Update</source>
         <translation>&amp;Posodobi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;New Form</source>
         <translation>&amp;Nov obrazec</translation>
     </message>
     <message>
-        <location line="+77"/>
-        <location line="+40"/>
         <source>Save Form?</source>
         <translation>Shranim obrazec?</translation>
     </message>
     <message>
-        <location line="-39"/>
         <source>Could not open file</source>
         <translation>Ni bilo moč odpreti datoteke</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Select New File</source>
         <translation>Izberite novo datoteko</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Could not write file</source>
         <translation>Ni bilo moč zapisati datoteke</translation>
     </message>
     <message>
-        <location line="+201"/>
         <source>&amp;Close Preview</source>
         <translation>&amp;Zapri ogled</translation>
     </message>
     <message>
-        <location line="-898"/>
         <source>Save &amp;Image...</source>
         <translation>S&amp;hrani sliko ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Print...</source>
         <translation>&amp;Natisni ...</translation>
     </message>
     <message>
-        <location line="+660"/>
         <source>The file %1 could not be opened.
 Reason: %2
 Would you like to retry or select a different file?</source>
@@ -1774,7 +1470,6 @@ Razlog: %2
 Ali žalite poskusiti znova ali izbrati drugo datoteko?</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>It was not possible to write the entire file %1 to disk.
 Reason:%2
 Would you like to retry?</source>
@@ -1783,117 +1478,90 @@ Razlog: %2
 Ali želite poskusiti znova?</translation>
     </message>
     <message>
-        <location line="+239"/>
-        <location line="+23"/>
         <source>The backup file %1 could not be written.</source>
         <translation>Varnostne kopije datoteke %1 ni bilo moč zapisati.</translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>The backup directory %1 could not be created.</source>
         <translation>Mape %1 za varnostne kopije ni bilo moč ustvariti.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary backup directory %1 could not be created.</source>
         <translation>Začasne mape %1 za varnostne kopije ni bilo moč ustvariti.</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Image files (*.%1)</source>
         <translation>Slikovne datoteke (*.%1)</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location line="+17"/>
         <source>Save Image</source>
         <translation>Shrani sliko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The file %1 could not be written.</source>
         <translation>Datoteke %1 ni bilo moč zapisati.</translation>
     </message>
     <message>
-        <location line="-1163"/>
         <source>&amp;New...</source>
         <translation>&amp;Nova ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Open...</source>
         <translation>&amp;Odpri ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Save</source>
         <translation>&amp;Shrani</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save &amp;As...</source>
         <translation>Shrani &amp;kot ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save A&amp;ll</source>
         <translation>Shrani &amp;vse</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save As &amp;Template...</source>
         <translation>Shrani kot &amp;predlogo ...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+901"/>
         <source>&amp;Close</source>
         <translation>&amp;Zapri</translation>
     </message>
     <message>
-        <location line="-896"/>
         <source>View &amp;Code...</source>
         <translation>Prikaži &amp;kodo ...</translation>
     </message>
     <message>
-        <location line="+424"/>
-        <location line="+248"/>
         <source>Save Form As</source>
         <translation>Shrani obrazec kot</translation>
     </message>
     <message>
-        <location line="+429"/>
         <source>Preview failed</source>
         <translation>Ogled ni uspel</translation>
     </message>
     <message>
-        <location line="-575"/>
         <source>Code generation failed</source>
         <translation>Ustvarjanje kode ni uspelo</translation>
     </message>
     <message>
-        <location line="+328"/>
-        <location line="+34"/>
         <source>Assistant</source>
         <translation>Pomočnik</translation>
     </message>
     <message>
-        <location line="+259"/>
         <source>Saved image %1.</source>
         <translation>Shranil sliko %1.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Please close all forms to enable the loading of additional fonts.</source>
         <translation>Da bi omogočili nalaganje dodatnih pisav zaprite vse obrazce.</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Printed %1.</source>
         <translation>Natisnil %1.</translation>
     </message>
     <message>
-        <location line="-1149"/>
         <source>ALT+CTRL+S</source>
         <translation>ALT+CTRL+S</translation>
     </message>
@@ -1901,26 +1569,23 @@ Ali želite poskusiti znova?</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>
+        <extracomment>Tab in preferences dialog
+</extracomment>
         <translation>Videz</translation>
     </message>
 </context>
 <context>
     <name>QDesignerAppearanceOptionsWidget</name>
     <message>
-        <location line="-53"/>
         <source>Docked Window</source>
         <translation>Zasidrana okna</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Multiple Top-Level Windows</source>
         <translation>Več ločenih oken</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Toolwindow Font</source>
         <translation>Pisava oken z orodji</translation>
     </message>
@@ -1928,22 +1593,18 @@ Ali želite poskusiti znova?</translation>
 <context>
     <name>QDesignerAxWidget</name>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="-71"/>
         <source>Reset control</source>
         <translation>Ponastavi kontrolnik</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Set control</source>
         <translation>Nastavi kontrolnik</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp" line="+179"/>
         <source>Control loaded</source>
         <translation>Kontrolnik je naložen</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>med izvajanjem meta-klica vrste %1 je prišlo do izjeme COM, indeks %2 od »%3«.</translation>
     </message>
@@ -1951,17 +1612,14 @@ Ali želite poskusiti znova?</translation>
 <context>
     <name>QDesignerFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="+89"/>
         <source>Script errors occurred:</source>
         <translation>Prišlo je do napak v skriptu:</translation>
     </message>
     <message>
-        <location line="+307"/>
         <source>The preview failed to build.</source>
         <translation>Grajenje ogleda ni uspelo.</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Designer</source>
         <translation>Qt Designer</translation>
     </message>
@@ -1969,22 +1627,18 @@ Ali želite poskusiti znova?</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>Shranim obrazec?</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Do you want to save the changes to this document before closing?</source>
         <translation>Ali želite pred zaprtjem shraniti spremembe v tem dokumentu?</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>If you don&apos;t save, your changes will be lost.</source>
         <translation>Če ne shranite, bodo spremembe izgubljene.</translation>
     </message>
@@ -1992,38 +1646,30 @@ Ali želite poskusiti znova?</translation>
 <context>
     <name>QDesignerMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="-1181"/>
         <source>Type Here</source>
         <translation>Pišite sem</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Add Separator</source>
         <translation>Dodaj ločnico</translation>
     </message>
     <message>
-        <location line="+371"/>
         <source>Insert separator</source>
         <translation>Vstavi ločnico</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Remove separator</source>
         <translation>Odstrani ločnico</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Odstrani dejanje »%1«</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <location line="+650"/>
         <source>Add separator</source>
         <translation>Dodaj ločnico</translation>
     </message>
     <message>
-        <location line="-348"/>
         <source>Insert action</source>
         <translation>Vstavi dejanje</translation>
     </message>
@@ -2031,22 +1677,18 @@ Ali želite poskusiti znova?</translation>
 <context>
     <name>QDesignerMenuBar</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-375"/>
         <source>Type Here</source>
         <translation>Pišite sem</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Remove Menu &apos;%1&apos;</source>
         <translation>Odstrani meni »%1«</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Remove Menu Bar</source>
         <translation>Odstrani menijsko vrstico</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Menu</source>
         <translation>Meni</translation>
     </message>
@@ -2054,37 +1696,30 @@ Ali želite poskusiti znova?</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>Med razčlenjevanjem datoteke XML gradnika po meri %1 je prišlo do napake XML: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>A required attribute (&apos;%1&apos;) is missing.</source>
         <translation>Manjka obvezna lastnost (»%1«).</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>An invalid property specification (&apos;%1&apos;) was encountered. Supported types: %2</source>
         <translation>Dosežena je bila neveljavna specifikacija lastnosti (»%1«). Podprte vrste: %2</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>&apos;%1&apos; is not a valid string property specification.</source>
         <translation>»%1« ni veljavna specifikacija lastnosti z nizom.</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>XML gradnika po meri »%1« ne vsebuje niti elementa &lt;widget&gt; niti &lt;ui&gt;.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The class attribute for the class %1 is missing.</source>
         <translation>Manjka razredna lastnost za razred %1.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>The class attribute for the class %1 does not match the class name %2.</source>
         <translation>Razredna lastnost za razred %1 se ne ujema z razredovim imenom %2.</translation>
     </message>
@@ -2092,7 +1727,6 @@ Ali želite poskusiti znova?</translation>
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_propertysheet.cpp" line="+754"/>
         <source>Dynamic Properties</source>
         <translation>Dinamične lastnosti</translation>
     </message>
@@ -2100,45 +1734,41 @@ Ali želite poskusiti znova?</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>Vrsta razpored »%1« ni podprta, preklapljam na mrežo.</translation>
     </message>
     <message>
-        <location line="+243"/>
         <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>Ko je bila povprašana po strani št. %5, je razširitev vsebnika gradnika »%1« (%2) vrnila gradnik, s katerim ne upravlja Qt Designer »%3« (%4).
 Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml() gradnika po meri.</translation>
     </message>
     <message>
-        <location line="+599"/>
         <source>Unexpected element &lt;%1&gt;</source>
-        <extracomment>Parsing clipboard contents</extracomment>
+        <extracomment>Parsing clipboard contents
+</extracomment>
         <translation>Nepričakovan 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>
+        <extracomment>Parsing clipboard contents
+</extracomment>
         <translation>Napaka pri lepljenju vsebine odložišča v vrstici %1, stolpcu %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>
+        <extracomment>Parsing clipboard contents
+</extracomment>
         <translation>Napaka pri lepljenju vsebine odložišča: manjka vrhnji element &lt;ui&gt;.</translation>
     </message>
 </context>
 <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>Poti %1 za predlogo ni bilo moč ustvariti.</translation>
     </message>
     <message>
-        <location line="+184"/>
         <source>An error has been encountered while parsing device profile XML: %1</source>
         <translation>Med razčlenjevanjem XML-a profila naprave je prišlo do napake: %1</translation>
     </message>
@@ -2146,32 +1776,26 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QDesignerToolWindow</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="+190"/>
         <source>Property Editor</source>
         <translation>Urejevalnik lastnosti</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Action Editor</source>
         <translation>Urejevalnik dejanj</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Object Inspector</source>
         <translation>Preiskovalnik objektov</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Resource Browser</source>
         <translation>Brskalnik po virih</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Signal/Slot Editor</source>
         <translation>Urejevalnik signalov/rež</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Widget Box</source>
         <translation>Podokno z gradniki</translation>
     </message>
@@ -2179,97 +1803,78 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QDesignerWorkbench</name>
     <message>
-        <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="+199"/>
         <source>&amp;File</source>
         <translation>&amp;Datoteka</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>F&amp;orm</source>
         <translation>&amp;Obrazec</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Preview in</source>
         <translation>Ogled v</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Window</source>
         <translation>O&amp;kno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>Edit</source>
         <translation>Urejanje</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Toolbars</source>
         <translation>Orodjarne</translation>
     </message>
     <message>
-        <location line="+465"/>
         <source>Save Forms?</source>
         <translation>Shranim obrazce?</translation>
     </message>
     <message>
-        <location line="-494"/>
         <source>&amp;View</source>
         <translation>&amp;Videz</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavitve</translation>
     </message>
     <message>
-        <location line="+204"/>
         <source>Widget Box</source>
         <translation>Podokno z gradniki</translation>
     </message>
     <message>
-        <location line="+292"/>
         <source>If you do not review your documents, all your changes will be lost.</source>
         <translation>Če ne pregledate svojih dokumentov, bodo vse spremembe izgubljene.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Discard Changes</source>
         <translation>Zavrzi spremembe</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Review Changes</source>
         <translation>Pregled sprememb</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>Backup Information</source>
         <translation>Podatki o varnostnih kopijah</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source>
         <translation>Zadnja seja Qt Designerja ni bila končana pravilno. Na disku so ostale varnostne kopije datotek. Ali jih želite naložiti?</translation>
     </message>
     <message>
-        <location line="+111"/>
         <source>The file &lt;b&gt;%1&lt;/b&gt; could not be opened.</source>
         <translation>Datoteke &lt;b&gt;%1&lt;/b&gt; ni bilo moč odpreti.</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>The file &lt;b&gt;%1&lt;/b&gt; is not a valid Designer UI file.</source>
         <translation>Datoteka &lt;b&gt;%1&lt;/b&gt; ni veljavna Designerjeva datoteka UI.</translation>
     </message>
     <message numerus="yes">
-        <location line="-259"/>
         <source>There are %n forms with unsaved changes. Do you want to review these changes before quitting?</source>
         <translation>
             <numerusform>Odprt je %n obrazec z neshranjenimi spremembami. Ali želite pred zaprtjem pregledati te spremembe?</numerusform>
@@ -2282,92 +1887,87 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+163"/>
         <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</extracomment>
+        <extracomment>Empty class name passed to widget factory method
+----------
+Empty class name passed to widget factory method
+----------
+Empty class name passed to widget factory method
+</extracomment>
         <translation>Prazno ime razreda je bilo posredovano do %1 (ime objekta: »%2«).</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 ni mogel ustvariti gradnika po meri razreda »%1«; uporabljen je bil osnovni razred »%2«.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>QFormBuilder was unable to create a widget of the class &apos;%1&apos;.</source>
         <translation>QFormBuilder ni mogel ustvariti gradnika razreda »%1«.</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>The layout type `%1&apos; is not supported.</source>
         <translation>Vrsta razporeda »%1« ni podprta.</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>Lastnosti %1 z vrsto množice ni bilo moč prebrati.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>The enumeration-type property %1 could not be read.</source>
         <translation>Lastnosti %1 z vrsto naštevanja ni bilo moč prebrati.</translation>
     </message>
     <message>
-        <location line="+190"/>
         <source>Reading properties of the type %1 is not supported yet.</source>
         <translation>Branje lastnosti vrste %1 še ni podprto.</translation>
     </message>
     <message>
-        <location line="+266"/>
         <source>The property %1 could not be written. The type %2 is not supported yet.</source>
         <translation>Lastnosti %1 ni bilo moč zapisati. Vrsta %2 še ni podprta.</translation>
     </message>
+    <message>
+        <source>The enumeration-value &apos;%1&apos; is invalid. The default value &apos;%2&apos; will be used instead.</source>
+        <translation>Vrednost oštevilčenja »%1« ni veljavna. Namesto nje bo uporabljena privzeta vrednost »%2«.</translation>
+    </message>
+    <message>
+        <source>The flag-value &apos;%1&apos; is invalid. Zero will be used instead.</source>
+        <translation>Vrednost zastavice »%1« ni veljavna. Namesto nje bo uporabljena ničla.</translation>
+    </message>
 </context>
 <context>
     <name>QStackedWidgetEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="+194"/>
         <source>Previous Page</source>
         <translation>Predhodna stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Next Page</source>
         <translation>Naslednja stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Pred trenutno stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>Za trenutno stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Page Order...</source>
         <translation>Spremeni vrstni red strani ...</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Change Page Order</source>
         <translation>Spremeni vrstni red strani</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Page %1 of %2</source>
         <translation>Stran %1 od %2</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+4"/>
         <source>Insert Page</source>
         <translation>Vstavi stran</translation>
     </message>
@@ -2375,12 +1975,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QStackedWidgetPreviewEventFilter</name>
     <message>
-        <location line="-153"/>
         <source>Go to previous page of %1 &apos;%2&apos; (%3/%4).</source>
         <translation>Pojdi na predhodno stran od %1 »%2« (%3/%4).</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Go to next page of %1 &apos;%2&apos; (%3/%4).</source>
         <translation>Pojdi na naslednjo stran od %1 »%2« (%3/%4).</translation>
     </message>
@@ -2388,28 +1986,22 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QTabWidgetEventFilter</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="+89"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Pred trenutno stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>Za trenutno stran</translation>
     </message>
     <message>
-        <location line="+283"/>
         <source>Page %1 of %2</source>
         <translation>Stran %1 od %2</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+4"/>
         <source>Insert Page</source>
         <translation>Vstavi stran</translation>
     </message>
@@ -2417,37 +2009,30 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QToolBoxHelper</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="+64"/>
         <source>Delete Page</source>
         <translation>Zbriši stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Before Current Page</source>
         <translation>Pred trenutno stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>After Current Page</source>
         <translation>Za trenutno stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Page Order...</source>
         <translation>Spremeni vrsti red strani ...</translation>
     </message>
     <message>
-        <location line="+116"/>
         <source>Change Page Order</source>
         <translation>Spremeni vrstni red strani</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Page %1 of %2</source>
         <translation>Stran %1 od %2</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Insert Page</source>
         <translation>Vstavi stran</translation>
     </message>
@@ -2455,15 +2040,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtBoolEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+226"/>
-        <location line="+10"/>
-        <location line="+25"/>
         <source>True</source>
         <translation>Pravilno</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+25"/>
         <source>False</source>
         <translation>Napačno</translation>
     </message>
@@ -2471,12 +2051,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtBoolPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+1469"/>
         <source>True</source>
         <translation>Pravilno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>False</source>
         <translation>Napačno</translation>
     </message>
@@ -2484,7 +2062,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtCharEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1581"/>
         <source>Clear Char</source>
         <translation>Počisti znak</translation>
     </message>
@@ -2492,7 +2069,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtColorEditWidget</name>
     <message>
-        <location line="+605"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2500,22 +2076,18 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtColorPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4743"/>
         <source>Red</source>
         <translation>Rdeča</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Green</source>
         <translation>Zelena</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Blue</source>
         <translation>Modra</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Alpha</source>
         <translation>Alfa</translation>
     </message>
@@ -2523,97 +2095,78 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtCursorDatabase</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-206"/>
         <source>Arrow</source>
         <translation>Puščica</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Up Arrow</source>
         <translation>Puščica navzgor</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cross</source>
         <translation>Križec</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Wait</source>
         <translation>Čakanje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>IBeam</source>
         <translation>Črtica |</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Vertical</source>
         <translation>Velikost navpično</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Horizontal</source>
         <translation>Velikost vodoravno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Backslash</source>
         <translation>Velikost poševno nazaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size Slash</source>
         <translation>Velikost poševno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size All</source>
         <translation>Velikost v vse smeri</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Blank</source>
         <translation>Prazno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Split Vertical</source>
         <translation>Razdelitev navpično</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Split Horizontal</source>
         <translation>Razdelitev vodoravno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pointing Hand</source>
         <translation>Roka, ki kaže</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Forbidden</source>
         <translation>Prepovedano</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Open Hand</source>
         <translation>Odprta dlan</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Closed Hand</source>
         <translation>Zaprta dlan</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>What&apos;s This</source>
         <translation>Kaj je to</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Busy</source>
         <translation>Zasedeno</translation>
     </message>
@@ -2621,12 +2174,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <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>Izberite pisavo</translation>
     </message>
@@ -2634,37 +2185,30 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtFontPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-351"/>
         <source>Family</source>
         <translation>Družina</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Point Size</source>
         <translation>Velikost točke</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Bold</source>
         <translation>Polkrepko</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Italic</source>
         <translation>Ležeče</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Underline</source>
         <translation>Podčrtano</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Strikeout</source>
         <translation>Prečrtano</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Kerning</source>
         <translation>Spodsekavanje</translation>
     </message>
@@ -2672,7 +2216,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtGradientDialog</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientdialog.ui"/>
         <source>Edit Gradient</source>
         <translation>Uredi preliv</translation>
     </message>
@@ -2680,304 +2223,242 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtGradientEditor</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="+431"/>
         <source>Start X</source>
         <translation>Začetni X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Start Y</source>
         <translation>Začetni Y</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Final X</source>
         <translation>Končni X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Final Y</source>
         <translation>Končni Y</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+24"/>
         <source>Central X</source>
         <translation>Središčni X</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+24"/>
         <source>Central Y</source>
         <translation>Središčni Y</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>Focal X</source>
         <translation>Žariščni X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Focal Y</source>
         <translation>Žariščni Y</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Radius</source>
         <translation>Polmer</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Angle</source>
         <translation>Kot</translation>
     </message>
     <message>
-        <location line="+288"/>
         <source>Linear</source>
         <translation>Linearen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Radial</source>
         <translation>Radialen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Conical</source>
         <translation>Stožčast</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Pad</source>
         <translation>Zapolni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Repeat</source>
         <translation>Ponovi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reflect</source>
         <translation>Odbij</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient Editor</source>
         <translation>Urejevalnik preliva</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>Urejevalnik postankov preliva</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>To območje vam omogoča urejanje postankov preliva. Da podvojite obstoječo ročko postanka dvokliknite nanjo. Za ustvaritev novega postanka dvokliknite izven obstoječih ročic postankov. Da spremenite položaj postanka povlecite in spustite njegovo ročko. Če kliknete z desnim gumbom miške, se bo pojavil priročni meni z dodatnimi dejanji.</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom</source>
         <translation>Povečava</translation>
     </message>
     <message>
-        <location/>
         <source>Position</source>
         <translation>Položaj</translation>
     </message>
     <message>
-        <location/>
         <source>Hue</source>
         <translation>Odtenek</translation>
     </message>
     <message>
-        <location/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
-        <location/>
         <source>Saturation</source>
         <translation>Zasičenost</translation>
     </message>
     <message>
-        <location/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location/>
         <source>Sat</source>
         <translation>Zas.</translation>
     </message>
     <message>
-        <location/>
         <source>Value</source>
         <translation>Vrednost</translation>
     </message>
     <message>
-        <location/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
-        <location/>
         <source>Val</source>
         <translation>Vre.</translation>
     </message>
     <message>
-        <location/>
         <source>Alpha</source>
         <translation>Alfa</translation>
     </message>
     <message>
-        <location/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location/>
         <source>Spread</source>
         <translation>Razširitev</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location/>
         <source>Current stop&apos;s color</source>
         <translation>Barva trenutnega postanka</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>Položaj trenutnega postanka</translation>
     </message>
     <message>
-        <location/>
         <source>%</source>
         <translation> %</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom In</source>
         <translation>Povečaj</translation>
     </message>
     <message>
-        <location/>
         <source>Zoom Out</source>
         <translation>Zmanjšaj</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle details extension</source>
         <translation>Preklopi prikaz podrobnosti</translation>
     </message>
     <message>
-        <location/>
         <source>&gt;</source>
         <translation>&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Linear Type</source>
         <translation>Linearna vrsta</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Radial Type</source>
         <translation>Radialna vrsta</translation>
     </message>
     <message>
-        <location/>
         <source>Conical Type</source>
         <translation>Stožčasta vrsta</translation>
     </message>
     <message>
-        <location/>
         <source>Pad Spread</source>
         <translation>Razširitev z zapolnitvijo</translation>
     </message>
     <message>
-        <location/>
         <source>Repeat Spread</source>
         <translation>Razširitev s ponovitvijo</translation>
     </message>
     <message>
-        <location/>
         <source>Reflect Spread</source>
         <translation>Razširitev z odbojem</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>To območje prikazuje ogled urejevanega preliva. Omogoča vam tudi urejanje parametrov, ki so specifični za vrsto preliva, na primer začetna in končna točka, polmer in podobno. Za to uporabite vlečenje in spuščanje.</translation>
     </message>
     <message>
-        <location/>
         <source>Show HSV specification</source>
         <translation>Prikaži specifikacijo HSV</translation>
     </message>
     <message>
-        <location/>
         <source>Show RGB specification</source>
         <translation>Prikaži specifikacijo RGB</translation>
     </message>
     <message>
-        <location/>
         <source>Reset Zoom</source>
         <translation>Ponastavi povečavo</translation>
     </message>
@@ -2985,37 +2466,30 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtGradientStopsWidget</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="+947"/>
         <source>New Stop</source>
         <translation>Nov postanek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Flip All</source>
         <translation>Obrni vse</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom In</source>
         <translation>Povečaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom Out</source>
         <translation>Zmanjšaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset Zoom</source>
         <translation>Ponastavi povečavo</translation>
     </message>
@@ -3023,46 +2497,34 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtGradientView</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+107"/>
         <source>Grad</source>
         <translation>Preliv</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Remove Gradient</source>
         <translation>Odstrani preliv</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Are you sure you want to remove the selected gradient?</source>
         <translation>Ali res želite odstraniti izbrani preliv?</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui"/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+74"/>
         <source>New...</source>
         <translation>Nov ...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Edit...</source>
         <translation>Urejanje ...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location/>
         <source>Gradient View</source>
         <translation>Prikaz preliva</translation>
     </message>
@@ -3070,7 +2532,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtGradientViewDialog</name>
     <message>
-        <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.ui"/>
         <source>Select Gradient</source>
         <translation>Izberite preliv</translation>
     </message>
@@ -3078,7 +2539,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtKeySequenceEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+221"/>
         <source>Clear Shortcut</source>
         <translation>Počisti bližnjico</translation>
     </message>
@@ -3086,17 +2546,14 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <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>Jezik</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Country</source>
         <translation>Država</translation>
     </message>
@@ -3104,17 +2561,14 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <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>
@@ -3122,17 +2576,14 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <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>
@@ -3140,12 +2591,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtPropertyBrowserUtils</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-136"/>
         <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>
@@ -3153,27 +2602,22 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <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 × %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>Širina</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Height</source>
         <translation>Višina</translation>
     </message>
@@ -3181,27 +2625,22 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <context>
     <name>QtRectPropertyManager</name>
     <message>
-        <location line="-612"/>
         <source>[(%1, %2), %3 x %4]</source>
         <translation>[(%1, %2), %3 × %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>Širina</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Height</source>
         <translation>Višina</translation>
     </message>
@@ -3209,128 +2648,98 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml(
 <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 že obstaja.
 Ali jo želite nadomestiti?</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>Kot kaže datoteka ni datoteka z viri. Najden je bil element »%1«, pričakovan pa element »%2«.</translation>
     </message>
     <message>
-        <location line="+902"/>
         <source>%1 [read-only]</source>
         <translation>%1 [samo za branje]</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+198"/>
         <source>%1 [missing]</source>
         <translation>%1 [manjka]</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>&lt;no prefix&gt;</source>
         <translation>&lt;brez predpone&gt;</translation>
     </message>
     <message>
-        <location line="+320"/>
-        <location line="+566"/>
         <source>New Resource File</source>
         <translation>Nova datoteka z viri</translation>
     </message>
     <message>
-        <location line="-564"/>
-        <location line="+25"/>
         <source>Resource files (*.qrc)</source>
         <translation>Datoteke z viri (*.qrc)</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Import Resource File</source>
         <translation>Uvozi datoteko z viri</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>newPrefix</source>
         <translation>novaPredpona</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Add Files</source>
         <translation>Dodaj datoteke</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Incorrect Path</source>
         <translation>Nepravilna pot</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+19"/>
-        <location line="+212"/>
-        <location line="+7"/>
         <source>Copy</source>
         <translation>Skopiraj</translation>
     </message>
     <message>
-        <location line="-236"/>
         <source>Copy As...</source>
         <translation>Skopiraj kot ...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Keep</source>
         <translation>Obdrži</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Skip</source>
         <translation>Preskoči</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>Clone Prefix</source>
         <translation>Kloniraj predpono</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>Vnesite pripono, ki jo želite dodati imenom kloniranih datotek.
 To bi, na primer, lahko bila pripona jezika kot je »_sl«.</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <location line="+4"/>
         <source>Copy As</source>
         <translation>Skopiraj kot</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;Izbrana datoteka:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;je izven mape trenutne datoteke z viri:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Izberite drugo pot znotraj te mape.&lt;p&gt;</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Could not overwrite %1.</source>
         <translation>Ni bilo moč nadomestiti %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;Opozorilo:&lt;/b&gt; Datoteka&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;je izven matične mape trenutne datoteke z viri.&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;Da razrešite težavo, kliknite:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Skopiraj&lt;/th&gt;&lt;td&gt;da skopirate datoteko v matično mapo datoteke z viri&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Skopiraj kot ...&lt;/th&gt;&lt;td&gt;da skopirate datoteko v podmapo matične mape datoteke z viri&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Obdrži&lt;/th&gt;&lt;td&gt;da uporabite trenutno lokacijo&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location line="+288"/>
         <source>Could not copy
 %1
 to
@@ -3341,153 +2750,120 @@ v
 %2</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>A parse error occurred at line %1, column %2 of %3:
 %4</source>
         <translation>Prišlo je do napake razčlenjevanja v vrstici %1, stolpcu %2 v %3:
 %4</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Save Resource File</source>
         <translation>Shrani datoteko z viri</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Edit Resources</source>
         <translation>Urejanje virov</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>New...</source>
         <translation>Nova ...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Open...</source>
         <translation>Odpri ...</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+11"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
         <source>Move Up</source>
         <translation>Premakni gor</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+11"/>
         <source>Move Down</source>
         <translation>Pomakni dol</translation>
     </message>
     <message>
-        <location line="-9"/>
-        <location line="+1"/>
         <source>Add Prefix</source>
         <translation>Dodaj predpono</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Files...</source>
         <translation>Dodaj datoteke ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Prefix</source>
         <translation>Spremeni predpono</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Language</source>
         <translation>Spremeni jezik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Alias</source>
         <translation>Spremeni drugo ime</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clone Prefix...</source>
         <translation>Kloniraj predpono ...</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Prefix / Path</source>
         <translation>Predpona / pot</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Language / Alias</source>
         <translation>Jezik / drugo ime</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;Opozorilo:&lt;/b&gt; Med ponovnim nalaganjem virov je prišlo do težav:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Resource Warning</source>
         <translation>Opozorilo o virih</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui"/>
         <source>Dialog</source>
         <translation>Pogovorno okno</translation>
     </message>
     <message>
-        <location/>
         <source>New File</source>
         <translation>Nova datoteka</translation>
     </message>
     <message>
-        <location/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location/>
         <source>Remove File</source>
         <translation>Odstrani datoteko</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>Nov vir</translation>
     </message>
     <message>
-        <location/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location/>
         <source>Remove Resource or File</source>
         <translation>Odstrani vir ali datoteko</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="-239"/>
         <source>Could not write %1: %2</source>
         <translation>Ni moč zapisati %1: %2</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>Open Resource File</source>
         <translation>Odpri datoteko z viri</translation>
     </message>
@@ -3495,24 +2871,20 @@ v
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation>Velikost: %1 × %2
 %3</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Edit Resources...</source>
         <translation>Urejanje virov ...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Reload</source>
         <translation>Znova naloži</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy Path</source>
         <translation>Skopiraj pot</translation>
     </message>
@@ -3520,7 +2892,6 @@ v
 <context>
     <name>QtResourceViewDialog</name>
     <message>
-        <location line="+250"/>
         <source>Select Resource</source>
         <translation>Izberite vir</translation>
     </message>
@@ -3528,17 +2899,14 @@ v
 <context>
     <name>QtSizeFPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-535"/>
         <source>%1 x %2</source>
         <translation>%1 × %2</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>Width</source>
         <translation>Širina</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Height</source>
         <translation>Višina</translation>
     </message>
@@ -3546,33 +2914,26 @@ v
 <context>
     <name>QtSizePolicyPropertyManager</name>
     <message>
-        <location line="+1709"/>
-        <location line="+1"/>
         <source>&lt;Invalid&gt;</source>
         <translation>&lt;neveljavno&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>Vodoravna politika</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Vertical Policy</source>
         <translation>Navpična politika</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Horizontal Stretch</source>
         <translation>Vodoravna praznina</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Vertical Stretch</source>
         <translation>Navpična praznina</translation>
     </message>
@@ -3580,17 +2941,14 @@ v
 <context>
     <name>QtSizePropertyManager</name>
     <message>
-        <location line="-2286"/>
         <source>%1 x %2</source>
         <translation>%1 × %2</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Width</source>
         <translation>Širina</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Height</source>
         <translation>Višina</translation>
     </message>
@@ -3598,107 +2956,86 @@ v
 <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; L O Č I T E L J &gt;</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui"/>
         <source>Customize Toolbars</source>
         <translation>Prilagodi orodjarne</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>Actions</source>
         <translation>Dejanja</translation>
     </message>
     <message>
-        <location/>
         <source>Toolbars</source>
         <translation>Orodjarne</translation>
     </message>
     <message>
-        <location/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location/>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Gor</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>Dol</translation>
     </message>
     <message>
-        <location/>
         <source>Current Toolbar Actions</source>
         <translation>Trenutna dejanja v orodjarni</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="-544"/>
         <source>Custom Toolbar</source>
         <translation>Orodjarna po meri</translation>
     </message>
     <message>
-        <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui"/>
         <source>Add new toolbar</source>
         <translation>Dodaj novo orodjarno</translation>
     </message>
     <message>
-        <location/>
         <source>Remove selected toolbar</source>
         <translation>Odstrani izbrano orodjarno</translation>
     </message>
     <message>
-        <location/>
         <source>Rename toolbar</source>
         <translation>Preimenuj orodjarno</translation>
     </message>
     <message>
-        <location/>
         <source>Move action up</source>
         <translation>Premakni dejanje gor</translation>
     </message>
     <message>
-        <location/>
         <source>Remove action from toolbar</source>
         <translation>Odstrani dejanje iz orodjarne</translation>
     </message>
     <message>
-        <location/>
         <source>Add action to toolbar</source>
         <translation>Dodaj dejanje v orodjarno</translation>
     </message>
     <message>
-        <location/>
         <source>Move action down</source>
         <translation>Premakni dejanje dol</translation>
     </message>
@@ -3706,12 +3043,10 @@ v
 <context>
     <name>QtTreePropertyBrowser</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp" line="+442"/>
         <source>Property</source>
         <translation>Lastnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
         <translation>Vrednost</translation>
     </message>
@@ -3719,64 +3054,52 @@ v
 <context>
     <name>SaveFormAsTemplate</name>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="+72"/>
         <source>Add path...</source>
         <translation>Dodaj pot ...</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Template Exists</source>
         <translation>Predloga obstaja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A template with the name %1 already exists.
 Do you want overwrite the template?</source>
         <translation>Predloga z imenom %1 že obstaja.
 Ali želite nadomestiti predlogo?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Overwrite Template</source>
         <translation>Nadomesti predlogo</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Open Error</source>
         <translation>Napaka pri odpiranju</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There was an error opening template %1 for writing. Reason: %2</source>
         <translation>Prišlo je do napake pri odpiranju predloge %1 za pisanje. Razlog: %2</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Write Error</source>
         <translation>Napaka pri pisanju</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>There was an error writing the template %1 to disk. Reason: %2</source>
         <translation>Prišlo je do napake pri pisanju predloge %1 na disk. Razlog: %2</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Pick a directory to save templates in</source>
         <translation>Izberite mapo za shranjevanje predlog</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/designer/saveformastemplate.ui"/>
         <source>Save Form As Template</source>
         <translation>Shranjevanje obrazca kot predloge</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Category:</source>
         <translation>&amp;Kategorija:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Ime:</translation>
     </message>
@@ -3784,7 +3107,6 @@ Ali želite nadomestiti predlogo?</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>Prišlo je do napake med poganjanjem skriptov za »%1«:
@@ -3794,22 +3116,18 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>SelectSignalDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui"/>
         <source>Go to slot</source>
         <translation>Pojdi na režo</translation>
     </message>
     <message>
-        <location/>
         <source>Select signal</source>
         <translation>Izbiranje signala</translation>
     </message>
     <message>
-        <location/>
         <source>signal</source>
         <translation>signal</translation>
     </message>
     <message>
-        <location/>
         <source>class</source>
         <translation>razred</translation>
     </message>
@@ -3817,7 +3135,6 @@ Ali želite nadomestiti predlogo?</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>POŠILJATELJ(%1), SIGNAL(%2), PREJEMNIK (%3), REŽA(%4)</translation>
     </message>
@@ -3825,32 +3142,26 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>SignalSlotDialogClass</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui"/>
         <source>Signals and slots</source>
         <translation>Signali in reže</translation>
     </message>
     <message>
-        <location/>
         <source>Slots</source>
         <translation>Reže</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Signals</source>
         <translation>Signali</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
@@ -3858,12 +3169,10 @@ Ali želite nadomestiti predlogo?</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>Vodoravni ločitelj »%1«, %2 x %3</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Vertical Spacer &apos;%1&apos;, %2 x %3</source>
         <translation>Navpični ločitelj »%1«, %2 x %3</translation>
     </message>
@@ -3871,41 +3180,51 @@ Ali želite nadomestiti predlogo?</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>
+        <extracomment>Tab in preferences dialog
+</extracomment>
         <translation>Poti za predloge</translation>
     </message>
 </context>
 <context>
     <name>ToolBarManager</name>
     <message>
-        <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+89"/>
         <source>Configure Toolbars...</source>
         <translation>Nastavi orodjarne ...</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Window</source>
         <translation>Okno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Style</source>
         <translation>Slog</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock views</source>
         <translation>Podokna</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <source>File</source>
+        <translation>Datoteka</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Urejanje</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>Orodja</translation>
+    </message>
+    <message>
+        <source>Form</source>
+        <translation>Obrazec</translation>
+    </message>
+    <message>
         <source>Toolbars</source>
         <translation>Orodjarne</translation>
     </message>
@@ -3913,30 +3232,64 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>VersionDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+171"/>
         <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;Različica %2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Qt Designer</source>
         <translation>Qt Designer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <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 je snovalnik grafičnih uporabniških vmesnikov za Qt programe.&lt;br/&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation>%1&lt;br/&gt;Avtorske pravice © 2009 Nokia Corporation in/ali njene podružnice.</translation>
     </message>
 </context>
 <context>
+    <name>VideoPlayerTaskMenu</name>
+    <message>
+        <source>Available Mime Types</source>
+        <translation>Razpoložljive vrste MIME</translation>
+    </message>
+    <message>
+        <source>Display supported mime types...</source>
+        <translation>Prikaži podprte vrste MIME ...</translation>
+    </message>
+    <message>
+        <source>Load...</source>
+        <translation>Naloži ...</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Predvajaj</translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <translation>Premor</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Ustavi</translation>
+    </message>
+    <message>
+        <source>Choose Video Player Media Source</source>
+        <translation>Izberite večpredstavnostni vir za predvajalnik videa</translation>
+    </message>
+    <message>
+        <source>An error has occurred in &apos;%1&apos;: %2</source>
+        <translation>V »%1« je prišlo do napake: %2</translation>
+    </message>
+    <message>
+        <source>Video Player Error</source>
+        <translation>Napaka predvajalnika videa</translation>
+    </message>
+</context>
+<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>Datoteka vsebuje gradnik po meri »%1«, katerega osnovni razred (%2) se razlikuje od trenutnega vnosa v podatkovni zbirki gradnikov (%3). Podatkovna zbirka gradnikov je ostala nespremenjena.</translation>
     </message>
@@ -3944,87 +3297,70 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="+139"/>
         <source>Actions</source>
         <translation>Dejanja</translation>
     </message>
     <message>
-        <location line="-16"/>
         <source>New...</source>
         <translation>Novo ...</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
     <message>
-        <location line="+313"/>
         <source>New action</source>
         <translation>Novo dejanje</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>Edit action</source>
         <translation>Uredi dejanje</translation>
     </message>
     <message>
-        <location line="-417"/>
         <source>Edit...</source>
         <translation>Uredi ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go to slot...</source>
         <translation>Pojdi na režo ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
         <translation>Skopiraj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cut</source>
         <translation>Izreži</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select all</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Icon View</source>
         <translation>Prikaz ikon</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Detailed View</source>
         <translation>Prikaz podrobnosti</translation>
     </message>
     <message>
-        <location line="+413"/>
         <source>Remove actions</source>
         <translation>Odstrani dejanja</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Odstrani dejanje »%1«</translation>
     </message>
     <message>
-        <location line="+186"/>
         <source>Used In</source>
         <translation>Uporabljeno v</translation>
     </message>
     <message>
-        <location line="-608"/>
         <source>Configure Action Editor</source>
         <translation>Nastavi urejevalnik dejanj</translation>
     </message>
@@ -4032,32 +3368,26 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="+95"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Used</source>
         <translation>Uporabljeno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Shortcut</source>
         <translation>Bližnjica</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Checkable</source>
         <translation>Stikalo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ToolTip</source>
         <translation>Namig</translation>
     </message>
@@ -4065,27 +3395,22 @@ Ali želite nadomestiti predlogo?</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>Elementu »%1« manjka obvezna lastnost »%2«.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Empty brush name encountered.</source>
         <translation>Doseženo je bilo prazno ime čopiča.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>An unexpected element &apos;%1&apos; was encountered.</source>
         <translation>Dosežen je bil nepričakovan element »%1«.</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>Prišlo je do napake pri branju datoteke z definicijo čopiča »%1«, v vrstici %2 in stolpcu %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>Prišlo je do napake pri branju datoteke z viri »%1«, v vrstici %2 in stolpcu %3: %4</translation>
     </message>
@@ -4093,17 +3418,14 @@ Ali želite nadomestiti predlogo?</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 kolega</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Remove buddies</source>
         <translation>Odstrani kolege</translation>
     </message>
     <message numerus="yes">
-        <location line="+24"/>
         <source>Remove %n buddies</source>
         <translation>
             <numerusform>Odstrani %n kolega</numerusform>
@@ -4113,7 +3435,6 @@ Ali želite nadomestiti predlogo?</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+51"/>
         <source>Add %n buddies</source>
         <translation>
             <numerusform>Dodaj %n kolega</numerusform>
@@ -4123,7 +3444,6 @@ Ali želite nadomestiti predlogo?</translation>
         </translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Set automatically</source>
         <translation>Nastavi samodejno</translation>
     </message>
@@ -4131,7 +3451,6 @@ Ali želite nadomestiti predlogo?</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>Urejanje kolegov</translation>
     </message>
@@ -4139,7 +3458,6 @@ Ali želite nadomestiti predlogo?</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>Urejanje kolegov</translation>
     </message>
@@ -4147,12 +3465,10 @@ Ali želite nadomestiti predlogo?</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>Izberi člane</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Break</source>
         <translation>Razbij</translation>
     </message>
@@ -4160,32 +3476,26 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ButtonTaskMenu</name>
     <message>
-        <location line="+121"/>
         <source>Assign to button group</source>
         <translation>Dodeli skupini gumbov</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Button group</source>
         <translation>Skupina gumbov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>New button group</source>
         <translation>Novi skupini gumbov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change text...</source>
         <translation>Spremeni besedilo ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>None</source>
         <translation>Nobeni</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Button group &apos;%1&apos;</source>
         <translation>Skupina gumbov »%1«</translation>
     </message>
@@ -4193,57 +3503,46 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::CodeDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="+95"/>
         <source>Save...</source>
         <translation>Shrani ...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy All</source>
         <translation>Skopiraj vse</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Find in Text...</source>
         <translation>&amp;Najdi v besedilu ...</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>A temporary form file could not be created in %1.</source>
         <translation>Začasne datoteke obrazca v %1 ni bilo moč ustvariti.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The temporary form file %1 could not be written.</source>
         <translation>V začasno datoteko obrazca %1 ni bilo moč pisati.</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>%1 - [Code]</source>
         <translation>%1 - [koda]</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Save Code</source>
         <translation>Shrani kodo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Header Files (*.%1)</source>
         <translation>Datoteke z glavo (*.%1)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The file %1 could not be opened: %2</source>
         <translation>Datoteke »%1« ni bilo moč odpreti: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The file %1 could not be written: %2</source>
         <translation>Datoteke »%1« ni bilo moč zapisati: %2</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>%1 - Error</source>
         <translation>%1 - napaka</translation>
     </message>
@@ -4251,7 +3550,6 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ColorAction</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+246"/>
         <source>Text Color</source>
         <translation>Barva besedila</translation>
     </message>
@@ -4259,12 +3557,10 @@ Ali želite nadomestiti predlogo?</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>Uredi postavke ...</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Change Combobox Contents</source>
         <translation>Spreminjanje vsebine spustnega seznama</translation>
     </message>
@@ -4272,7 +3568,6 @@ Ali želite nadomestiti predlogo?</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>Spremeni opis ...</translation>
     </message>
@@ -4280,17 +3575,14 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ConnectionEdit</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+1313"/>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Deselect All</source>
         <translation>Odizberi vse</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
@@ -4298,52 +3590,42 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ConnectionModel</name>
     <message>
-        <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="-465"/>
         <source>Sender</source>
         <translation>Pošiljatelj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Signal</source>
         <translation>Signal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Receiver</source>
         <translation>Prejemnik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Slot</source>
         <translation>Reža</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>&lt;sender&gt;</source>
         <translation>&lt;pošiljatelj&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;signal&gt;</source>
         <translation>&lt;signal&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;receiver&gt;</source>
         <translation>&lt;prejemnik&gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;slot&gt;</source>
         <translation>&lt;reža&gt;</translation>
     </message>
     <message>
-        <location line="+110"/>
         <source>Signal and Slot Editor</source>
         <translation>Urejevalnik signalov in rež</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>The connection already exists!&lt;br&gt;%1</source>
         <translation>Povezava že obstaja!&lt;br&gt;%1</translation>
     </message>
@@ -4351,42 +3633,34 @@ Ali želite nadomestiti predlogo?</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>Vstavi stran pred trenutno stran</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Page After Current Page</source>
         <translation>Vstavi stran za trenutno stran</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Add Subwindow</source>
         <translation>Dodaj podokno</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Insert</source>
         <translation>Vstavi</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Subwindow</source>
         <translation>Podokno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Page</source>
         <translation>Stran %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page %1 of %2</source>
         <translation>Stran %1 od %2</translation>
     </message>
@@ -4394,69 +3668,57 @@ Ali želite nadomestiti predlogo?</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>
+        <extracomment>System resolution
+</extracomment>
         <translation>Sistemska (%1 x %2)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>User defined</source>
         <translation>Uporabniško določena</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source> x </source>
-        <extracomment>DPI X/Y separator</extracomment>
+        <extracomment>DPI X/Y separator
+</extracomment>
         <translation> x </translation>
     </message>
 </context>
 <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>Poravnaj levo</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>AlignHCenter</source>
         <translation>Poravnaj sredinsko (vodoravno)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AlignRight</source>
         <translation>Poravnaj desno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AlignJustify</source>
         <translation>Poravnaj obojestransko</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>AlignTop</source>
         <translation>Poravnaj na vrh</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+4"/>
         <source>AlignVCenter</source>
         <translation>Poravnaj sredinsko (navpično)</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>AlignBottom</source>
         <translation>Poravnaj na dno</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>Po meri (%n vloga)</numerusform>
@@ -4466,75 +3728,58 @@ Ali želite nadomestiti predlogo?</translation>
         </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Inherited</source>
         <translation>Podedovano</translation>
     </message>
     <message>
-        <location line="+566"/>
         <source>Horizontal</source>
         <translation>Vodoravno</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Vertical</source>
         <translation>Navpično</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Normal Off</source>
         <translation>Normalna in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Normal On</source>
         <translation>Normalna in vključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled Off</source>
         <translation>Onemogočena in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled On</source>
         <translation>Onemogočena in vključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active Off</source>
         <translation>Aktivna in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active On</source>
         <translation>Aktivna in vključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected Off</source>
         <translation>Izbrana in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected On</source>
         <translation>Izbrana in vključena</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+21"/>
         <source>translatable</source>
         <translation>prevedljivo</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+21"/>
         <source>disambiguation</source>
         <translation>razločitev</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+21"/>
         <source>comment</source>
         <translation>komentar</translation>
     </message>
@@ -4542,48 +3787,38 @@ Ali želite nadomestiti predlogo?</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>Profili naprav (*.%1)</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Default</source>
         <translation>Privzeti</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Save Profile</source>
         <translation>Shrani profil</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Save Profile - Error</source>
         <translation>Shranjevanje profila - napaka</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Unable to open the file &apos;%1&apos; for writing: %2</source>
         <translation>Datoteke »%1« ni moč odpreti za pisanje: %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Open profile</source>
         <translation>Odpri profil</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+6"/>
         <source>Open Profile - Error</source>
         <translation>Odpiranje profila - napaka</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Unable to open the file &apos;%1&apos; for reading: %2</source>
         <translation>Datoteke »%1« ni moč odpreti za branje: %2</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&apos;%1&apos; is not a valid profile: %2</source>
         <translation>»%1« ni veljaven profil: %2</translation>
     </message>
@@ -4591,57 +3826,46 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::Dialog</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui"/>
         <source>Dialog</source>
         <translation>PogovornoOkno</translation>
     </message>
     <message>
-        <location/>
         <source>StringList</source>
         <translation>SeznamNizov</translation>
     </message>
     <message>
-        <location/>
         <source>New String</source>
         <translation>Nov niz</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Nov</translation>
     </message>
     <message>
-        <location/>
         <source>Delete String</source>
         <translation>Z&amp;briši niz</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Zbriši</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Value:</source>
         <translation>&amp;Vrednost:</translation>
     </message>
     <message>
-        <location/>
         <source>Move String Up</source>
         <translation>Premakni niz gor</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
-        <location/>
         <source>Move String Down</source>
         <translation>Premakni niz dol</translation>
     </message>
     <message>
-        <location/>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
@@ -4649,52 +3873,42 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::EmbeddedOptionsControl</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="-260"/>
         <source>None</source>
         <translation>Noben</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>Uredi izbrani profil</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Delete the selected profile</source>
         <translation>Zbriši izbrani 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>Nov profil</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Edit Profile</source>
         <translation>Uredi profil</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Delete Profile</source>
         <translation>Zbriši profil</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Would you like to delete the profile &apos;%1&apos;?</source>
         <translation>Ali želite zbrisati profil »%1«?</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>Default</source>
         <translation>Privzeti</translation>
     </message>
@@ -4702,20 +3916,21 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::FilterWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/filterwidget.cpp" line="+185"/>
-        <source>&lt;Filter&gt;</source>
-        <translation>&lt;filter&gt;</translation>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <source>Clear text</source>
+        <translation>Počisti besedilo</translation>
     </message>
 </context>
 <context>
     <name>qdesigner_internal::FormEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formeditor.cpp" line="+190"/>
         <source>Resource File Changed</source>
         <translation>Datoteka z viri je bila spremenjena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The file &quot;%1&quot; has changed outside Designer. Do you want to reload it?</source>
         <translation>Datoteka »%1« je bila spremenjena izven Qt Designerja. Ali jo želite naložiti znova?</translation>
     </message>
@@ -4723,7 +3938,6 @@ Ali želite nadomestiti predlogo?</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 vrstico razporeditve na obrazcu ...</translation>
     </message>
@@ -4731,54 +3945,46 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::FormWindow</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="-1267"/>
         <source>Edit contents</source>
         <translation>Uredi vsebino</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location line="+841"/>
         <source>Resize</source>
         <translation>Spremeni velikost</translation>
     </message>
     <message>
-        <location line="+218"/>
-        <location line="+15"/>
         <source>Key Move</source>
         <translation>Premik s tipko</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <source>Key Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
         <translation>Ni moč prilepiti gradnikov. Qt Designer ni mogel najti vsebnika brez razporeditve, v katerega bi prilepil.</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>Razbijte razporeditev za vsebnik, v katerega želite prilepiti, nato izberite vsebnik in prilepite znova.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste error</source>
         <translation>Napaka prilepljanja</translation>
     </message>
     <message>
-        <location line="+445"/>
         <source>Lay out</source>
         <translation>Razporedi</translation>
     </message>
     <message>
-        <location line="+493"/>
-        <location line="+55"/>
         <source>Drop widget</source>
         <translation>Spusti gradnik</translation>
     </message>
     <message numerus="yes">
-        <location line="-1058"/>
         <source>Paste %n action(s)</source>
         <translation>
             <numerusform>Prilepi %n dejanje</numerusform>
@@ -4788,12 +3994,10 @@ Ali želite nadomestiti predlogo?</translation>
         </translation>
     </message>
     <message>
-        <location line="-511"/>
         <source>Insert widget &apos;%1&apos;</source>
         <translation>Vstavi gradnik »%1«</translation>
     </message>
     <message numerus="yes">
-        <location line="+513"/>
         <source>Paste %n widget(s)</source>
         <translation>
             <numerusform>Prilepi %n gradnik</numerusform>
@@ -4803,27 +4007,22 @@ Ali želite nadomestiti predlogo?</translation>
         </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste (%1 widgets, %2 actions)</source>
         <translation>Prilepi (gradnikov: %1, dejanj: %2)</translation>
     </message>
     <message>
-        <location line="+466"/>
         <source>Select Ancestor</source>
         <translation>Izberi predhodnika</translation>
     </message>
     <message>
-        <location line="+576"/>
         <source>A QMainWindow-based form does not contain a central widget.</source>
         <translation>Obrazec temelječ na QMainWindow ne vsebuje osrednjega gradnika.</translation>
     </message>
     <message>
-        <location line="-797"/>
         <source>Raise widgets</source>
         <translation>Dvigni gradnike</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Lower widgets</source>
         <translation>Spusti gradnike</translation>
     </message>
@@ -4831,12 +4030,10 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete</source>
         <translation>Zbriši</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Delete &apos;%1&apos;</source>
         <translation>Zbriši »%1«</translation>
     </message>
@@ -4844,200 +4041,159 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::FormWindowManager</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+364"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Izreži</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cuts the selected widgets and puts them on the clipboard</source>
         <translation>Izreže izbrane gradnike in jih odloži na odložišče</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiraj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Copies the selected widgets to the clipboard</source>
         <translation>Skopira izbrane gradnike na odložišče</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Paste</source>
         <translation>Pri&amp;lepi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Pastes the clipboard&apos;s contents</source>
         <translation>Prilepi vsebino odložišča</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Delete</source>
         <translation>&amp;Zbriši</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Deletes the selected widgets</source>
         <translation>Zbriše izbrane gradnike</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Izberi &amp;vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Selects all widgets</source>
         <translation>Izbere vse gradnike</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Bring to &amp;Front</source>
         <translation>Prinesi v o&amp;spredje</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>Raises the selected widgets</source>
         <translation>Dvigne izbrane gradnike</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Send to &amp;Back</source>
         <translation>Pošlji v &amp;ozadje</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>Lowers the selected widgets</source>
         <translation>Spusti izbrane gradnike</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Adjust &amp;Size</source>
         <translation>Prilagodi ve&amp;likost</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Adjusts the size of the selected widget</source>
         <translation>Prilagodi velikost izbranega gradnika</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Lay Out &amp;Horizontally</source>
         <translation>Razporedi &amp;vodoravno</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets horizontally</source>
         <translation>Izbrane gradnike razporedi vodoravno</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Lay Out &amp;Vertically</source>
         <translation>Razporedi &amp;navpično</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets vertically</source>
         <translation>Izbrane gradnike razporedi navpično</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Lay Out in a &amp;Grid</source>
         <translation>Razporedi v &amp;mrežo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets in a grid</source>
         <translation>Razporedi izbrane gradnike v mrežo</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out Horizontally in S&amp;plitter</source>
         <translation>Razporedi vodoravno v ra&amp;zdelilnik</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets horizontally in a splitter</source>
         <translation>Izbrane gradnike razporedi vodoravno v razdelilnik</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lay Out Vertically in Sp&amp;litter</source>
         <translation>Razporedi navpično v raz&amp;delilnik</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets vertically in a splitter</source>
         <translation>Izbrane gradnike razporedi navpično v razdelilnik</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>&amp;Break Layout</source>
         <translation>&amp;Razbij razporeditev</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Breaks the selected layout</source>
         <translation>Razbij izbrano razporeditev</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Preview...</source>
         <translation>Prikaži &amp;ogled ...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Preview current form</source>
         <translation>Prikaže ogled trenutnega obrazca</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Form &amp;Settings...</source>
         <translation>&amp;Nastavi obrazec ...</translation>
     </message>
     <message>
-        <location line="+92"/>
         <source>Break Layout</source>
         <translation>Razbij razporeditev</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Adjust Size</source>
         <translation>Prilagodi velikost</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Could not create form preview</source>
         <comment>Title of warning message box</comment>
         <translation>Ni bilo moč ustvariti ogleda obrazca</translation>
     </message>
     <message>
-        <location line="+341"/>
         <source>Form Settings - %1</source>
         <translation>Nastavitve obrazca - %1</translation>
     </message>
     <message>
-        <location line="-525"/>
         <source>Removes empty columns and rows</source>
         <translation>Odstrani prazne stolpce in vrstice</translation>
     </message>
     <message>
-        <location line="-50"/>
         <source>Lay Out in a &amp;Form Layout</source>
         <translation>Razporedi v razporeditev na &amp;obrazcu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lays out the selected widgets in a form layout</source>
         <translation>Razporedi izbrane gradnike v razporeditev na obrazcu</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Si&amp;mplify Grid Layout</source>
         <translation>Po&amp;enostavi razporeditev v mrežo</translation>
     </message>
@@ -5045,12 +4201,10 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::FormWindowSettings</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowsettings.cpp" line="+193"/>
         <source>None</source>
         <translation>Noben</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Profile: %1</source>
         <translation>Profil naprave: %1</translation>
     </message>
@@ -5058,37 +4212,30 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::GridPanel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/gridpanel.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Grid</source>
         <translation>Mreža</translation>
     </message>
     <message>
-        <location/>
         <source>Visible</source>
         <translation>Vidna</translation>
     </message>
     <message>
-        <location/>
         <source>Grid &amp;X</source>
         <translation>Mreža &amp;X</translation>
     </message>
     <message>
-        <location/>
         <source>Snap</source>
         <translation>Pripni</translation>
     </message>
     <message>
-        <location/>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <location/>
         <source>Grid &amp;Y</source>
         <translation>Mreža &amp;Y</translation>
     </message>
@@ -5096,7 +4243,6 @@ Ali želite nadomestiti predlogo?</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>Spremeni naslov ...</translation>
     </message>
@@ -5104,7 +4250,6 @@ Ali želite nadomestiti predlogo?</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>Vstavi entiteto HTML</translation>
     </message>
@@ -5112,92 +4257,74 @@ Ali želite nadomestiti predlogo?</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>Datoteke s sličico »%1« ni moč prebrati.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
         <translation>Kot kaže »%1« ni veljavna datoteka s sličico: %2</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The file &apos;%1&apos; could not be read: %2</source>
         <translation>Datoteke »%1« ni bilo moč prebrati: %2</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Pixmap Read Error</source>
         <translation>Napaka pri branju sličice</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Normal Off</source>
         <translation>Normalna in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Normal On</source>
         <translation>Normalna in vključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled Off</source>
         <translation>Onemogočena in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Disabled On</source>
         <translation>Onemogočena in vključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active Off</source>
         <translation>Aktivna in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Active On</source>
         <translation>Aktivna in vključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected Off</source>
         <translation>Izbrana in izključena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Selected On</source>
         <translation>Izbrana in vključena</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Choose Resource...</source>
         <translation>Izberi vir ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Izberi datoteko ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset All</source>
         <translation>Ponastavi vse</translation>
     </message>
     <message>
-        <location line="-85"/>
         <source>Choose a Pixmap</source>
         <translation>Izbiranje sličice</translation>
     </message>
@@ -5205,58 +4332,46 @@ Ali želite nadomestiti predlogo?</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>Lastnosti &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>Lastnosti &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Items List</source>
         <translation>Seznam postavk</translation>
     </message>
     <message>
-        <location/>
         <source>New Item</source>
         <translation>Nova postavka</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Nova</translation>
     </message>
     <message>
-        <location/>
         <source>Delete Item</source>
         <translation>Zbriši postavko</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Zbriši</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Up</source>
         <translation>Premakni postavko gor</translation>
     </message>
     <message>
-        <location/>
         <source>U</source>
         <translation>G</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Down</source>
         <translation>Premakni postavko dol</translation>
     </message>
     <message>
-        <location/>
         <source>D</source>
         <translation>D</translation>
     </message>
@@ -5264,12 +4379,10 @@ Ali želite nadomestiti predlogo?</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>Spremeni bogato besedilo ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change plain text...</source>
         <translation>Spremeni navadno besedilo ...</translation>
     </message>
@@ -5277,7 +4390,6 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::LanguageResourceDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="-258"/>
         <source>Choose Resource</source>
         <translation>Izberite vir</translation>
     </message>
@@ -5285,7 +4397,6 @@ Ali želite nadomestiti predlogo?</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>Spremeni besedilo ...</translation>
     </message>
@@ -5293,17 +4404,14 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::ListWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="+101"/>
         <source>Edit List Widget</source>
         <translation>Urejanje gradnika s seznamom</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Edit Combobox</source>
         <translation>Urejanje spustnega seznama</translation>
     </message>
     <message>
-        <location line="-51"/>
         <source>New Item</source>
         <translation>Nova postavka</translation>
     </message>
@@ -5311,12 +4419,10 @@ Ali želite nadomestiti predlogo?</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>Uredi postavke ...</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Change List Contents</source>
         <translation>Spreminjanje vsebine seznama</translation>
     </message>
@@ -5324,22 +4430,18 @@ Ali želite nadomestiti predlogo?</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>Naslednje podokno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous Subwindow</source>
         <translation>Predhodno podokno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tile</source>
         <translation>Tlakuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cascade</source>
         <translation>V kaskado</translation>
     </message>
@@ -5347,7 +4449,6 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::MenuTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/menutaskmenu.cpp" line="+56"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
@@ -5355,7 +4456,6 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::MorphMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="+264"/>
         <source>Morph into</source>
         <translation>Pretvori v</translation>
     </message>
@@ -5363,42 +4463,34 @@ Ali želite nadomestiti predlogo?</translation>
 <context>
     <name>qdesigner_internal::NewActionDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newactiondialog.ui"/>
         <source>New Action...</source>
         <translation>Novo dejanje ...</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Text:</source>
         <translation>&amp;Besedilo:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Icon:</source>
         <translation>&amp;Ikona:</translation>
     </message>
     <message>
-        <location/>
         <source>Shortcut:</source>
         <translation>Bližnjica:</translation>
     </message>
     <message>
-        <location/>
         <source>Checkable:</source>
         <translation>Stikalo:</translation>
     </message>
     <message>
-        <location/>
         <source>ToolTip:</source>
         <translation>Namig:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location/>
         <source>Object &amp;name:</source>
         <translation>&amp;Ime objekta:</translation>
     </message>
@@ -5406,39 +4498,32 @@ Ali želite nadomestiti predlogo?</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>Nastavi ime lastnosti</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>Trenutni objekt že ima lastnost z imenom »%1«.Izberite drugo, edinstveno ime</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui"/>
         <source>Create Dynamic Property</source>
         <translation>Ustvari dinamično lastnost</translation>
     </message>
     <message>
-        <location/>
         <source>Property Name</source>
         <translation>Ime lastnosti</translation>
     </message>
     <message>
-        <location/>
         <source>Property Type</source>
         <translation>Vrsta lastnosti</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>Predpona »_q_« je rezervirana za knjižnico Qt.Izberite drugo ime.</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui"/>
         <source>horizontalSpacer</source>
         <translation>vodoravnaPraznina</translation>
     </message>
@@ -5446,83 +4531,68 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::NewFormWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="+104"/>
         <source>Default size</source>
         <translation>Privzeta velikost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>QVGA portrait (240x320)</source>
         <translation>QVGA, pokončno (240x320)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>QVGA landscape (320x240)</source>
         <translation>QVGA, ležeče (320x240)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>VGA portrait (480x640)</source>
         <translation>VGA, pokončno (480x640)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>VGA landscape (640x480)</source>
         <translation>VGA, ležeče (640x480)</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>Widgets</source>
-        <extracomment>New Form Dialog Categories</extracomment>
+        <extracomment>New Form Dialog Categories
+</extracomment>
         <translation>Gradniki</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Custom Widgets</source>
         <translation>Gradniki po meri</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>None</source>
         <translation>Nobena</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Error loading form</source>
         <translation>Napaka pri nalaganju obrazca</translation>
     </message>
     <message>
-        <location line="+244"/>
         <source>Unable to open the form template file &apos;%1&apos;: %2</source>
         <translation>Ni moč odpreti datoteke s predlogo obrazca »%1«: %2</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Internal error: No template selected.</source>
         <translation>Notranja napaka: izbrane ni nobene predloge.</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>Izberite predlogo za ogled</translation>
     </message>
     <message>
-        <location/>
         <source>Embedded Design</source>
         <translation>Vgrajena zasnova</translation>
     </message>
     <message>
-        <location/>
         <source>Device:</source>
         <translation>Naprava:</translation>
     </message>
     <message>
-        <location/>
         <source>Screen Size:</source>
         <translation>Velikost zaslona</translation>
     </message>
@@ -5530,37 +4600,30 @@ Please select another name.</source>
 <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>Nov povišan razred</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Base class name:</source>
         <translation>Ime osnovnega razreda:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promoted class name:</source>
         <translation>Ime povišanega razreda:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Header file:</source>
         <translation>Datoteka z glavo:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Global include</source>
         <translation>Globalna vključitev</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
@@ -5568,48 +4631,37 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::ObjectInspector</name>
     <message>
-        <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="+754"/>
-        <source>&amp;Find in Text...</source>
-        <translation>&amp;Najdi v besedilu ...</translation>
+        <source>Change Current Page</source>
+        <translation type="unfinished">Spreminjanje trenutne strani</translation>
     </message>
-</context>
-<context>
-    <name>qdesigner_internal::ObjectInspector::ObjectInspectorPrivate</name>
     <message>
-        <location line="-438"/>
-        <source>Change Current Page</source>
-        <translation>Spreminjanje trenutne strani</translation>
+        <source>&amp;Find in Text...</source>
+        <translation>&amp;Najdi v besedilu ...</translation>
     </message>
 </context>
 <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>Spreminjanje vrstnega reda strani</translation>
     </message>
     <message>
-        <location/>
         <source>Page Order</source>
         <translation>Vrstni red strani</translation>
     </message>
     <message>
-        <location/>
         <source>Move page up</source>
         <translation>Premakni stran gor</translation>
     </message>
     <message>
-        <location/>
         <source>Move page down</source>
         <translation>Premakni stran dol</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="+3"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
@@ -5617,47 +4669,38 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PaletteEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui"/>
         <source>Edit Palette</source>
         <translation>Urejanje palete</translation>
     </message>
     <message>
-        <location/>
         <source>Tune Palette</source>
         <translation>Nastavitev palete</translation>
     </message>
     <message>
-        <location/>
         <source>Show Details</source>
         <translation>Prikaži podrobnosti</translation>
     </message>
     <message>
-        <location/>
         <source>Compute Details</source>
         <translation>izračunaj podrobnosti</translation>
     </message>
     <message>
-        <location/>
         <source>Quick</source>
         <translation>Hitro</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Ogled</translation>
     </message>
     <message>
-        <location/>
         <source>Disabled</source>
         <translation>Onemogočeno</translation>
     </message>
     <message>
-        <location/>
         <source>Inactive</source>
         <translation>Neaktivno</translation>
     </message>
     <message>
-        <location/>
         <source>Active</source>
         <translation>Aktivno</translation>
     </message>
@@ -5665,7 +4708,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PaletteEditorButton</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp" line="+57"/>
         <source>Change Palette</source>
         <translation>Spremeni paleto</translation>
     </message>
@@ -5673,22 +4715,18 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PaletteModel</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="+374"/>
         <source>Color Role</source>
         <translation>Vloga barve</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Aktivno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inactive</source>
         <translation>Neaktivno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disabled</source>
         <translation>Onemogočeno</translation>
     </message>
@@ -5696,28 +4734,22 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PixmapEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-1539"/>
         <source>Copy Path</source>
         <translation>Skopiraj pot</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste Path</source>
         <translation>Prilepi pot</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Choose Resource...</source>
         <translation>Izberi vir ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Izberi datoteko ...</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+16"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -5725,7 +4757,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PlainTextEditorDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plaintexteditor.cpp" line="+65"/>
         <source>Edit text</source>
         <translation>Uredi besedilo</translation>
     </message>
@@ -5733,37 +4764,30 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PluginDialog</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="+72"/>
         <source>Components</source>
         <translation>Komponente</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Plugin Information</source>
         <translation>Podatki o vstavkih</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Refresh</source>
         <translation>Osveži</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scan for newly installed custom widget plugins.</source>
         <translation>Preveri razpoložljivost na novo nameščenih vstavkov za gradnike po meri.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Qt Designer couldn&apos;t find any plugins</source>
         <translation>Qt Designer ni našel nobenega vstavka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Qt Designer found the following plugins</source>
         <translation>Qt Designer je našel naslednje vstavke</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>New custom widget plugins have been found.</source>
         <translation>Najdeni so bili vstavki za nove gradnike po meri.</translation>
     </message>
@@ -5771,7 +4795,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewActionGroup</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/previewactiongroup.cpp" line="+95"/>
         <source>%1 Style</source>
         <translation>Slog %1</translation>
     </message>
@@ -5779,50 +4802,38 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewConfigurationWidget</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="+139"/>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Browse...</source>
         <translation>Brskaj ...</translation>
     </message>
-</context>
-<context>
-    <name>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate</name>
     <message>
-        <location line="+118"/>
         <source>Load Custom Device Skin</source>
-        <translation>Naloži temo za napravo po meri</translation>
+        <translation type="unfinished">Naloži temo za napravo po meri</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>All QVFB Skins (*.%1)</source>
         <translation>Vse teme za QVFB (*.%1)</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 - Duplicate Skin</source>
         <translation>%1 - podvojena tema</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The skin &apos;%1&apos; already exists.</source>
         <translation>Tema »%1« že obstaja.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>%1 - Error</source>
         <translation>%1 - napaka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 is not a valid skin directory:
 %2</source>
         <translation>%1 ni veljavna mapa s temo:
@@ -5832,24 +4843,22 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewDeviceSkin</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="+259"/>
         <source>&amp;Portrait</source>
         <translation>&amp;Pokončno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Landscape (&amp;CCW)</source>
-        <extracomment>Rotate form preview counter-clockwise</extracomment>
+        <extracomment>Rotate form preview counter-clockwise
+</extracomment>
         <translation>L&amp;ežeče (v nasprotni smeri ure)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Landscape (CW)</source>
-        <extracomment>Rotate form preview clockwise</extracomment>
+        <extracomment>Rotate form preview clockwise
+</extracomment>
         <translation>&amp;Ležeče (v smeri ure)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Close</source>
         <translation>&amp;Zapri</translation>
     </message>
@@ -5857,7 +4866,6 @@ Please select another name.</source>
 <context>
     <name>qdesigner_internal::PreviewManager</name>
     <message>
-        <location line="+426"/>
         <source>%1 - [Preview]</source>
         <translation>%1 - [ogled]</translation>
     </message>
@@ -5865,10 +4873,10 @@ Please select another name.</source>
 <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>
+        <extracomment>Palette editor background
+</extracomment>
         <translation>Šerif bo za vajo spet
 skuhal domače žgance.</translation>
     </message>
@@ -5876,57 +4884,46 @@ skuhal domače žgance.</translation>
 <context>
     <name>qdesigner_internal::PreviewWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui"/>
         <source>Preview Window</source>
         <translation>Okno ogleda</translation>
     </message>
     <message>
-        <location/>
         <source>LineEdit</source>
         <translation>UrejevalnaVrstica</translation>
     </message>
     <message>
-        <location/>
         <source>ComboBox</source>
         <translation>SpustniSeznam</translation>
     </message>
     <message>
-        <location/>
         <source>PushButton</source>
         <translation>Gumb</translation>
     </message>
     <message>
-        <location/>
         <source>ButtonGroup2</source>
         <translation>SkupinaGumbov2</translation>
     </message>
     <message>
-        <location/>
         <source>CheckBox1</source>
         <translation>PotrditvenoPolje1</translation>
     </message>
     <message>
-        <location/>
         <source>CheckBox2</source>
         <translation>PotrditvenoPolje2</translation>
     </message>
     <message>
-        <location/>
         <source>ButtonGroup</source>
         <translation>SkupinaGumbov</translation>
     </message>
     <message>
-        <location/>
         <source>RadioButton1</source>
         <translation>IzbirniGumb1</translation>
     </message>
     <message>
-        <location/>
         <source>RadioButton2</source>
         <translation>IzbirniGumb2</translation>
     </message>
     <message>
-        <location/>
         <source>RadioButton3</source>
         <translation>IzbirniGumb3</translation>
     </message>
@@ -5934,22 +4931,18 @@ skuhal domače žgance.</translation>
 <context>
     <name>qdesigner_internal::PromotionModel</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="+17"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Header file</source>
         <translation>Datoteka z glavo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Global include</source>
         <translation>Globalna vključitev</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Usage</source>
         <translation>Uporaba</translation>
     </message>
@@ -5957,27 +4950,22 @@ skuhal domače žgance.</translation>
 <context>
     <name>qdesigner_internal::PromotionTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="+85"/>
         <source>Promoted widgets...</source>
         <translation>Povišani gradniki ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Promote to ...</source>
         <translation>Povišaj v ...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Promote to</source>
         <translation>Povišaj v</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Demote to %1</source>
         <translation>Ponižaj v %1</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Change signals/slots...</source>
         <translation>Spremeni signale/reže ...</translation>
     </message>
@@ -5985,59 +4973,48 @@ skuhal domače žgance.</translation>
 <context>
     <name>qdesigner_internal::PropertyEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="+183"/>
         <source>Add Dynamic Property...</source>
         <translation>Dodaj dinamično lastnost ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Remove Dynamic Property</source>
         <translation>Odstrani dinamično lastnost</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tree View</source>
         <translation>Drevesni prikaz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Drop Down Button View</source>
         <translation>Gumb s spustim seznamom za prikaz</translation>
     </message>
     <message>
-        <location line="+597"/>
         <source>Object: %1
 Class: %2</source>
         <translation>Objekt: %1
 Razred: %2</translation>
     </message>
     <message>
-        <location line="-600"/>
         <source>Sorting</source>
         <translation>Razvrsti</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Color Groups</source>
         <translation>Obarvaj skupine</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>Configure Property Editor</source>
         <translation>Nastavi urejevalnik lastnosti</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>String...</source>
         <translation>Niz ...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bool...</source>
         <translation>Bool ...</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Other...</source>
         <translation>Drugo ...</translation>
     </message>
@@ -6045,7 +5022,6 @@ Razred: %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>Vstavi prelom vrstice</translation>
     </message>
@@ -6053,27 +5029,22 @@ Razred: %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>Povišani gradniki</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Promoted Classes</source>
         <translation>Povišani razredi</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>Promote</source>
         <translation>Povišaj</translation>
     </message>
     <message>
-        <location line="+169"/>
         <source>%1 - Error</source>
         <translation>%1 - napaka</translation>
     </message>
     <message>
-        <location line="-17"/>
         <source>Change signals/slots...</source>
         <translation>Spremeni signale/reže ...</translation>
     </message>
@@ -6081,22 +5052,18 @@ Razred: %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>Nalaganje datoteke *.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>Podane datoteke *.qrc &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;ni bilo moč najti. Ali želite posodobiti lokacijo datoteke?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>New location for %1</source>
         <translation>Nova lokacija za %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Resource files (*.qrc)</source>
         <translation>Datoteke z viri (*.qrc)</translation>
     </message>
@@ -6104,7 +5071,6 @@ Razred: %2</translation>
 <context>
     <name>qdesigner_internal::QDesignerTaskMenu</name>
     <message numerus="yes">
-        <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+560"/>
         <source>Set size constraint on %n widget(s)</source>
         <translation>
             <numerusform>Nastavi omejitev velikosti za %n gradnik</numerusform>
@@ -6114,107 +5080,86 @@ Razred: %2</translation>
         </translation>
     </message>
     <message>
-        <location line="-492"/>
         <source>Change objectName...</source>
         <translation>Spremeni ime objekta ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change toolTip...</source>
         <translation>Spremeni namig ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change whatsThis...</source>
         <translation>Spremeni KajJeTo ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change styleSheet...</source>
         <translation>Spremeni slogovno predlogo ...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create Menu Bar</source>
         <translation>Ustvari menijsko vrstico</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Tool Bar</source>
         <translation>Dodaj orodjarno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Create Status Bar</source>
         <translation>Ustvari vrstico stanja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Remove Status Bar</source>
         <translation>Odstrani vrstico stanja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change script...</source>
         <translation>Spremeni skript ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change signals/slots...</source>
         <translation>Spremeni signale/reže ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go to slot...</source>
         <translation>Pojdi na režo ...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Size Constraints</source>
         <translation>Omejitve velikosti</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Width</source>
         <translation>Nastavi najmanjšo širino</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Height</source>
         <translation>Nastavi najmanjšo višino</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Minimum Size</source>
         <translation>Nastavi najmanjšo velikost</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Set Maximum Width</source>
         <translation>Nastavi največjo širino</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Maximum Height</source>
         <translation>Nastavi največjo višino</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Maximum Size</source>
         <translation>Nastavi največjo velikost</translation>
     </message>
     <message>
-        <location line="+235"/>
         <source>Edit ToolTip</source>
         <translation>Uredi namig</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Edit WhatsThis</source>
         <translation>Uredi KajJeTo</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>no signals available</source>
         <translation>na voljo ni nobenega signala</translation>
     </message>
@@ -6222,13 +5167,10 @@ Razred: %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>Nepričakovan 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>Prišlo je do napake razčlenjevanja v vrstici %1, stolpcu %2 kode XML za gradnik %3: %4
@@ -6236,29 +5178,24 @@ Razred: %2</translation>
 %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>Koda XML za gradnik %1 ne vsebuje nobenega elementa gradnika.
 %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>Prišlo je do napake v vrstici %1 v %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>Med razčlenjevanjem za &lt;widget&gt; ali &lt;ui&gt; je bil dosežen nepričakovan element &lt;%1&gt;.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unexpected end of file encountered when parsing widgets.</source>
         <translation>Med razčlenjevanjem gradnikov je bil dosežen nepričakovan konec datoteke.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>A widget element could not be found.</source>
         <translation>Ni bilo moč najti elementa gradnika.</translation>
     </message>
@@ -6266,73 +5203,58 @@ Razred: %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>Odtenek</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Sat</source>
         <translation>Zasičenost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val</source>
         <translation>Vrednost</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Saturation</source>
         <translation>Zasičenost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
         <translation>Vrednost</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>Rdeča</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Green</source>
         <translation>Zelena</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Blue</source>
         <translation>Modra</translation>
     </message>
@@ -6340,27 +5262,22 @@ Razred: %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>Uredi besedilo</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>&amp;OK</source>
         <translation>&amp;V redu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>Rich Text</source>
         <translation>Bogato besedilo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Source</source>
         <translation>Izvorna koda</translation>
     </message>
@@ -6368,72 +5285,58 @@ Razred: %2</translation>
 <context>
     <name>qdesigner_internal::RichTextEditorToolBar</name>
     <message>
-        <location line="-294"/>
         <source>Bold</source>
         <translation>Polkrepko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Italic</source>
         <translation>Ležeče</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+I</source>
         <translation>CTRL+I</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Underline</source>
         <translation>Podčrtano</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CTRL+U</source>
         <translation>CTRL+U</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Left Align</source>
         <translation>Poravnaj levo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Center</source>
         <translation>Na sredino</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Right Align</source>
         <translation>Poravnaj desno</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Justify</source>
         <translation>Obojestransko</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Superscript</source>
         <translation>Nadpisano</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Subscript</source>
         <translation>Podpisano</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Insert &amp;Link</source>
         <translation>Vstavi &amp;povezavo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Insert &amp;Image</source>
         <translation>Vstavi &amp;sliko</translation>
     </message>
@@ -6441,17 +5344,14 @@ Razred: %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>Uredi skript</translation>
     </message>
     <message>
-        <location line="+5"/>
         <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;Vnesite delček Qt Scripta, ki bo izveden med nalaganjem obrazca.&lt;br&gt;Gradnik in njegovi podgradniki so dostopni prek spremenljivk &lt;i&gt;widget&lt;/i&gt; in &lt;i&gt;childWidgets&lt;/i&gt;.</translation>
     </message>
     <message>
-        <location line="+51"/>
         <source>Syntax error</source>
         <translation>Skladenjska napaka</translation>
     </message>
@@ -6459,7 +5359,6 @@ Razred: %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>Napake v skriptu</translation>
     </message>
@@ -6467,23 +5366,18 @@ Razred: %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>Reža z odtisom »%1« že obstaja.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>There is already a signal with the signature &apos;%1&apos;.</source>
         <translation>Signal z odtisom »%1« že obstaja.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 - Duplicate Signature</source>
         <translation>%1 - podvojen odtis</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <location line="+76"/>
         <source>Signals/Slots of %1</source>
         <translation>Signali/reže od %1</translation>
     </message>
@@ -6491,12 +5385,10 @@ Razred: %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>Urejanje signalov/rež</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
@@ -6504,7 +5396,6 @@ Razred: %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>Urejanje signalov/rež</translation>
     </message>
@@ -6512,7 +5403,6 @@ Razred: %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>Odstrani</translation>
     </message>
@@ -6520,7 +5410,6 @@ Razred: %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>Spreminjanje seznama nizov</translation>
     </message>
@@ -6528,38 +5417,30 @@ Razred: %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>Urejanje slogovne predloge</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <location line="+280"/>
         <source>Valid Style Sheet</source>
         <translation>Veljavna slogovna predloga</translation>
     </message>
     <message>
-        <location line="-278"/>
         <source>Add Resource...</source>
         <translation>Dodaj vir ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Gradient...</source>
         <translation>Dodaj preliv ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Color...</source>
         <translation>Dodaj barvo ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Font...</source>
         <translation>Dodaj pisavo ...</translation>
     </message>
     <message>
-        <location line="+278"/>
         <source>Invalid Style Sheet</source>
         <translation>Neveljavna slogovna predloga</translation>
     </message>
@@ -6567,27 +5448,22 @@ Razred: %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>Začni od tu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restart</source>
         <translation>Začni znova</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Tab Order List...</source>
         <translation>Seznam vrstnega reda tabulatorke ...</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Tab Order List</source>
         <translation>Seznam vrstnega reda tabulatorke</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tab Order</source>
         <translation>Vrstni red tabulatorke</translation>
     </message>
@@ -6595,7 +5471,6 @@ Razred: %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>Urejanje vrstnega reda tabulatorke</translation>
     </message>
@@ -6603,7 +5478,6 @@ Razred: %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>Urejanja vrstnega reda tabulatorke</translation>
     </message>
@@ -6611,48 +5485,38 @@ Razred: %2</translation>
 <context>
     <name>qdesigner_internal::TableWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="+67"/>
         <source>New Column</source>
         <translation>Nov stolpec</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>New Row</source>
         <translation>Nova vrstica</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Columns</source>
         <translation>&amp;Stolpci</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Rows</source>
         <translation>&amp;Vrstice</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Lastnosti &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>Lastnosti &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Edit Table Widget</source>
         <translation>Urejanje gradnika s tabelo</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Items</source>
         <translation>&amp;Postavke</translation>
     </message>
     <message>
-        <location/>
         <source>Table Items</source>
         <translation>Postavke v tabeli</translation>
     </message>
@@ -6660,7 +5524,6 @@ Razred: %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>Uredi postavke ...</translation>
     </message>
@@ -6668,22 +5531,18 @@ Razred: %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>Izberite mapo za shranjevanje predlog</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Additional Template Paths</source>
         <translation>Dodatne poti za predloge</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6691,22 +5550,18 @@ Razred: %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>Spremeni HTML ...</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Edit HTML</source>
         <translation>Urejanje HTML-ja</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Edit Text</source>
         <translation>Urejanje besedila</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change Plain Text...</source>
         <translation>Spremeni navadno besedilo ...</translation>
     </message>
@@ -6714,22 +5569,18 @@ Razred: %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>Izberi vir ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Choose File...</source>
         <translation>Izberi datoteko ...</translation>
     </message>
     <message>
-        <location line="+123"/>
         <source>Choose a File</source>
         <translation>Izbiranje datoteke</translation>
     </message>
     <message>
-        <location line="-118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6737,27 +5588,22 @@ Razred: %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>Vstavi ločitelja</translation>
     </message>
     <message>
-        <location line="-65"/>
         <source>Remove action &apos;%1&apos;</source>
         <translation>Odstrani dejanje »%1«</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Remove Toolbar &apos;%1&apos;</source>
         <translation>Odstrani orodjarno »%1«</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation>Vstavi ločitelja pred »%1«</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Append Separator</source>
         <translation>Dodaj ločitelja</translation>
     </message>
@@ -6765,125 +5611,98 @@ Razred: %2</translation>
 <context>
     <name>qdesigner_internal::TreeWidgetEditor</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+76"/>
         <source>&amp;Columns</source>
         <translation>&amp;Stolpci</translation>
     </message>
     <message>
-        <location line="+69"/>
         <source>Per column properties</source>
         <translation>Lastnosti za stolpec</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Common properties</source>
         <translation>Skupne lastnosti</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>Nova postavka</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+194"/>
         <source>Properties &amp;&lt;&lt;</source>
         <translation>Lastnosti &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>Lastnosti &amp;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="-327"/>
         <source>New Column</source>
         <translation>Nov stolpec</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/>
         <source>Edit Tree Widget</source>
         <translation>Urejanje gradnika z drevesom</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Items</source>
         <translation>&amp;Postavke</translation>
     </message>
     <message>
-        <location/>
         <source>Tree Items</source>
         <translation>Postavke v drevesu</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+150"/>
         <source>New Subitem</source>
         <translation>Nova podpostavka</translation>
     </message>
     <message>
-        <location/>
         <source>New &amp;Subitem</source>
         <translation>Nova &amp;podpostavka</translation>
     </message>
     <message>
-        <location/>
         <source>Delete Item</source>
         <translation>Zbriši postavko</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Left (before Parent Item)</source>
         <translation>Premakni postavko levo (pred matično postavko)</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>Premakni postavko desno (kot prvo podpostavko sledeče postavke)</translation>
     </message>
     <message>
-        <location/>
         <source>R</source>
         <translation>E</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Up</source>
         <translation>Premakni postavko gor</translation>
     </message>
     <message>
-        <location/>
         <source>U</source>
         <translation>G</translation>
     </message>
     <message>
-        <location/>
         <source>Move Item Down</source>
         <translation>Premakni postavko dol</translation>
     </message>
     <message>
-        <location/>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New</source>
         <translation>&amp;Nova</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Delete</source>
         <translation>&amp;Zbriši</translation>
     </message>
@@ -6891,7 +5710,6 @@ Razred: %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>Uredi postavke ...</translation>
     </message>
@@ -6899,7 +5717,6 @@ Razred: %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>Opozorilo: ustvarjanje gradnika v podoknu z gradniki ni uspelo. Za to je morda kriv neveljaven XML gradnika po meri.</translation>
     </message>
@@ -6907,42 +5724,34 @@ Razred: %2</translation>
 <context>
     <name>qdesigner_internal::WidgetBoxTreeWidget</name>
     <message>
-        <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="-268"/>
         <source>Scratchpad</source>
         <translation>Beležnica</translation>
     </message>
     <message>
-        <location line="+370"/>
         <source>Custom Widgets</source>
         <translation>Gradniki po meri</translation>
     </message>
     <message>
-        <location line="+263"/>
         <source>Expand all</source>
         <translation>Razširi vse</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Collapse all</source>
         <translation>Skrči vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>List View</source>
         <translation>Prikaz seznama</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Icon View</source>
         <translation>Prikaz ikon</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Edit name</source>
         <translation>Urejanje imena</translation>
     </message>
@@ -6950,7 +5759,6 @@ Razred: %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>Najden je bil vstavek gradnika po meri, katerega ime (%1) je enako imenu obstoječega razreda.</translation>
     </message>
@@ -6958,7 +5766,6 @@ Razred: %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>Urejanje gradnikov</translation>
     </message>
@@ -6966,34 +5773,28 @@ Razred: %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>Tovarna gradnikov po meri, ki je registrirana za gradnike razreda %1, je vrnila 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>Med ustvarjanjem gradnika z uporabo tovarne gradnikov po meri, ki je registrirana za gradnike razreda %1, je prišlo do neujemanja v imenu razreda. Tovarna je vrnila gradnik razreda %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>%1 Widget</source>
         <translation>Gradnik %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>Trenutne strani vsebnika »%1« (%2) med dodajanjem razporeda ni bilo moč določiti. To nakazuje na neskladnost v datoteki *.ui. Verjetno je na vsebovalnem gradniku zgrajen razpored.</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>Poskus dodajanja razporeda gradniku »%1« (%2), ki že ima neupravljan razpored vrste %3.
 To nakazuje na neskladnost v datoteki *.ui.</translation>
     </message>
     <message>
-        <location line="+211"/>
         <source>Cannot create style &apos;%1&apos;.</source>
         <translation>Ni moč ustvariti sloga »%1«.</translation>
     </message>
@@ -7001,12 +5802,10 @@ To nakazuje na neskladnost v datoteki *.ui.</translation>
 <context>
     <name>qdesigner_internal::WizardContainerWidgetTaskMenu</name>
     <message>
-        <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="-49"/>
         <source>Next</source>
         <translation>Naprej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Back</source>
         <translation>Nazaj</translation>
     </message>
@@ -7014,18 +5813,62 @@ To nakazuje na neskladnost v datoteki *.ui.</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>
+        <extracomment>Zoom factor
+</extracomment>
         <translation>%1 %</translation>
     </message>
 </context>
 <context>
     <name>qdesigner_internal::ZoomablePreviewDeviceSkin</name>
     <message>
-        <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="-270"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Povečava</translation>
     </message>
 </context>
+<context>
+    <name></name>
+    <message>
+        <source>&lt;Filter&gt;</source>
+        <comment>qdesigner_internal::FilterWidget|</comment>
+        <translation type="obsolete">&lt;filter&gt;</translation>
+    </message>
+    <message>
+        <source>Change Current Page</source>
+        <comment>qdesigner_internal::ObjectInspector::ObjectInspectorPrivate|</comment>
+        <translation type="obsolete">Spreminjanje trenutne strani</translation>
+    </message>
+    <message>
+        <source>Load Custom Device Skin</source>
+        <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment>
+        <translation type="obsolete">Naloži temo za napravo po meri</translation>
+    </message>
+    <message>
+        <source>All QVFB Skins (*.%1)</source>
+        <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment>
+        <translation type="obsolete">Vse teme za QVFB (*.%1)</translation>
+    </message>
+    <message>
+        <source>%1 - Duplicate Skin</source>
+        <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment>
+        <translation type="obsolete">%1 - podvojena tema</translation>
+    </message>
+    <message>
+        <source>The skin &apos;%1&apos; already exists.</source>
+        <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment>
+        <translation type="obsolete">Tema »%1« že obstaja.</translation>
+    </message>
+    <message>
+        <source>%1 - Error</source>
+        <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment>
+        <translation type="obsolete">%1 - napaka</translation>
+    </message>
+    <message>
+        <source>%1 is not a valid skin directory:
+%2</source>
+        <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment>
+        <translation type="obsolete">%1 ni veljavna mapa s temo:
+%2</translation>
+    </message>
+</context>
 </TS>
diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts
index 625a0f1..2d06f25 100644
--- a/translations/linguist_ru.ts
+++ b/translations/linguist_ru.ts
@@ -4,7 +4,6 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1366"/>
         <source>Qt Linguist</source>
         <translation>Qt Linguist</translation>
     </message>
@@ -12,77 +11,62 @@
 <context>
     <name>BatchTranslationDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/batchtranslation.ui"/>
         <source>Qt Linguist - Batch Translation</source>
         <translation>Qt Linguist - Пакетный перевод</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location/>
         <source>Set translated entries to finished</source>
         <translation>Помечать переведенные записи как завершённые</translation>
     </message>
     <message>
-        <location/>
         <source>Retranslate entries with existing translation</source>
         <translation>Переводить записи, уже имеющие перевод</translation>
     </message>
     <message>
-        <location/>
         <source>Translate also finished entries</source>
         <translation>Также переводить записи с завершёнными переводами</translation>
     </message>
     <message>
-        <location/>
         <source>Phrase book preference</source>
         <translation>Предпочитаемые глоссарии</translation>
     </message>
     <message>
-        <location/>
         <source>Move up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location/>
         <source>Move down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Run</source>
         <translation>&amp;Выполнить</translation>
     </message>
     <message>
-        <location/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/batchtranslationdialog.cpp" line="+79"/>
         <source>Batch Translation of &apos;%1&apos; - Qt Linguist</source>
         <translation>Пакетный перевод &apos;%1&apos; - Qt Linguist</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Searching, please wait...</source>
         <translation>Идёт поиск, ожидайте...</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Linguist batch translator</source>
         <translation>Пакетный переводчик Qt Linguist</translation>
     </message>
     <message numerus="yes">
-        <location line="+1"/>
         <source>Batch translated %n entries</source>
         <translation>
             <numerusform>Автоматически переведена %n запись</numerusform>
@@ -91,12 +75,10 @@
         </translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/batchtranslation.ui"/>
         <source>Note that the modified entries will be reset to unfinished if &apos;Set translated entries to finished&apos; above is unchecked</source>
         <translation>Имейте в виду, что изменённые записи будут отмечены как незавершённые, если не включен параметр &quot;Помечать переведенные записи как завершённые&quot;</translation>
     </message>
     <message>
-        <location/>
         <source>The batch translator will search through the selected phrase books in the order given above</source>
         <translation>Пакетный переводчик будет искать в выбранных глоссариях в указанном выше порядке</translation>
     </message>
@@ -104,45 +86,36 @@
 <context>
     <name>DataModel</name>
     <message>
-        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+214"/>
         <source>&lt;qt&gt;Duplicate messages found in &apos;%1&apos;:</source>
         <translation>&lt;qt&gt;В &apos;%1&apos; обнаружены повторяющиеся сообщения:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+8"/>
         <source>&lt;p&gt;[more duplicates omitted]</source>
         <translation>&lt;p&gt;[остальные повторы не указаны]</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&lt;p&gt;* ID: %1</source>
         <translation>&lt;p&gt;* ID: %1</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&lt;p&gt;* Context: %1&lt;br&gt;* Source: %2</source>
         <translation>&lt;p&gt;* Контекст: %1&lt;br&gt;* Источник: %2</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&lt;br&gt;* Comment: %3</source>
         <translation>&lt;br&gt;* Комментарий: %3</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>Linguist does not know the plural rules for &apos;%1&apos;.
 Will assume a single universal form.</source>
         <translation>Qt Linguist не знает правила множественных форм для &apos;%1&apos;.
 Будет использована универсальная единичная форма.</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>Cannot create &apos;%2&apos;: %1</source>
         <translation>Не удалось создать &apos;%2&apos;: %1</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>Universal Form</source>
         <translation>Универсальная форма</translation>
     </message>
@@ -150,37 +123,30 @@ Will assume a single universal form.</source>
 <context>
     <name>ErrorsView</name>
     <message>
-        <location filename="../tools/linguist/linguist/errorsview.cpp" line="+76"/>
         <source>Accelerator possibly superfluous in translation.</source>
         <translation>Возможно, лишний акселератор в переводе.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Accelerator possibly missing in translation.</source>
         <translation>Возможно, пропущен акселератор в переводе.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Translation does not end with the same punctuation as the source text.</source>
         <translation>Перевод не заканчивается тем же знаком препинания, что и исходный текст.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>A phrase book suggestion for &apos;%1&apos; was ignored.</source>
         <translation>Предложение глоссария для &apos;%1&apos; пропущено.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Translation does not refer to the same place markers as in the source text.</source>
         <translation>Перевод не содержит тех же маркеров форматирования, что и исходный текст.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Translation does not contain the necessary %n place marker.</source>
         <translation>Перевод не содержит необходимого маркера форматирования %n.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
@@ -188,98 +154,79 @@ Will assume a single universal form.</source>
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/finddialog.cpp" line="+42"/>
         <source></source>
         <comment>Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/finddialog.ui"/>
         <source>Find</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location/>
         <source>This window allows you to search for some text in the translation source file.</source>
         <translation>Данное окно позволяет искать текст в файле перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Find what:</source>
         <translation>&amp;Искать:</translation>
     </message>
     <message>
-        <location/>
         <source>Type in the text to search for.</source>
         <translation>Введите искомый текст.</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location/>
         <source>Source texts are searched when checked.</source>
         <translation>Если отмечено, поиск будет вестись в исходных текстах.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Source texts</source>
         <translation>&amp;Исходные тексты</translation>
     </message>
     <message>
-        <location/>
         <source>Translations are searched when checked.</source>
         <translation>Если отмечено, поиск будет вестись в переведённых текстах.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Translations</source>
         <translation>&amp;Переводы</translation>
     </message>
     <message>
-        <location/>
         <source>Texts such as &apos;TeX&apos; and &apos;tex&apos; are considered as different when checked.</source>
         <translation>Если отмечено, строки &quot;ПрИмЕр&quot; и &quot;пример&quot; будет считаться разными.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Match case</source>
         <translation>С учётом &amp;регистра</translation>
     </message>
     <message>
-        <location/>
         <source>Comments and contexts are searched when checked.</source>
         <translation>Если отмечено, поиск будет вестись по контекстам и комментариям.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Comments</source>
         <translation>&amp;Комментарии</translation>
     </message>
     <message>
-        <location/>
         <source>Ignore &amp;accelerators</source>
         <translation>Пропускать &amp;акселераторы</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to find the next occurrence of the text you typed in.</source>
         <translation>Найти следующее совпадение для введённого текста.</translation>
     </message>
     <message>
-        <location/>
         <source>Find Next</source>
         <translation>Найти далее</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to close this window.</source>
         <translation>Закрыть окно.</translation>
     </message>
     <message>
-        <location/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -287,30 +234,25 @@ Will assume a single universal form.</source>
 <context>
     <name>FormMultiWidget</name>
     <message>
-        <location filename="../tools/linguist/linguist/messageeditorwidgets.cpp" line="+302"/>
         <source>Alt+Delete</source>
         <extracomment>translate, but don&apos;t change</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Shift+Alt+Insert</source>
         <extracomment>translate, but don&apos;t change</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Alt+Insert</source>
         <extracomment>translate, but don&apos;t change</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>Confirmation - Qt Linguist</source>
         <translation>Подтверждение - Qt Linguist</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete non-empty length variant?</source>
         <translation>Удалить вариант перевода?</translation>
     </message>
@@ -318,7 +260,6 @@ Will assume a single universal form.</source>
 <context>
     <name>LRelease</name>
     <message numerus="yes">
-        <location filename="../tools/linguist/shared/qm.cpp" line="+763"/>
         <source>Dropped %n message(s) which had no ID.</source>
         <translation>
             <numerusform>Удалено %n сообщение, у которого не было ID.</numerusform>
@@ -327,7 +268,6 @@ Will assume a single universal form.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+4"/>
         <source>Excess context/disambiguation dropped from %n message(s).</source>
         <translation>
             <numerusform>Удалён лишний контекст из %n сообщения.</numerusform>
@@ -336,107 +276,80 @@ Will assume a single universal form.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+8"/>
-        <source>    Generated %n translation(s) (%1 finished and %2 unfinished)
-</source>
+        <source>    Generated %n translation(s) (%1 finished and %2 unfinished)</source>
         <translation>
-            <numerusform>    Создан %n перевод (%1 завершённых и %2 незавершённых)
-</numerusform>
-            <numerusform>    Создано %n перевода (%1 завершённых и %2 незавершённых)
-</numerusform>
-            <numerusform>    Создано %n переводов (%1 завершённых и %2 незавершённых)
-</numerusform>
+            <numerusform>    Создан %n перевод (%1 завершённых и %2 незавершённых)</numerusform>
+            <numerusform>    Создано %n перевода (%1 завершённых и %2 незавершённых)</numerusform>
+            <numerusform>    Создано %n переводов (%1 завершённых и %2 незавершённых)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+4"/>
-        <source>    Ignored %n untranslated source text(s)
-</source>
+        <source>    Ignored %n untranslated source text(s)</source>
         <translation>
-            <numerusform>    Пропущен %n непереведённый исходный текст
-</numerusform>
-            <numerusform>    Пропущено %n непереведённых исходных текста
-</numerusform>
-            <numerusform>    Пропущено %n непереведённых исходных текстов
-</numerusform>
+            <numerusform>    Пропущен %n непереведённый исходный текст</numerusform>
+            <numerusform>    Пропущено %n непереведённых исходных текста</numerusform>
+            <numerusform>    Пропущено %n непереведённых исходных текстов</numerusform>
         </translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1324"/>
         <source></source>
         <comment>This is the application&apos;s main window.</comment>
         <translatorcomment>Основное окно программы.</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location line="+160"/>
         <source>Source text</source>
         <translation>Исходный текст</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+25"/>
         <source>Index</source>
         <translation>Индекс</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+63"/>
         <source>Context</source>
         <translation>Контекст</translation>
     </message>
     <message>
-        <location line="-62"/>
         <source>Items</source>
         <translation>Записи</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>This panel lists the source contexts.</source>
         <translation>В данной панели перечислены исходные контексты.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Strings</source>
         <translation>Строки</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Phrases and guesses</source>
         <translation>Фразы и похожие переводы</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Sources and Forms</source>
         <translation>Исходники и формы</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Warnings</source>
         <translation>Предупреждения</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source> MOD </source>
         <comment>status bar: file(s) modified</comment>
         <translation> ИЗМ </translation>
     </message>
     <message>
-        <location line="+139"/>
         <source>Loading...</source>
         <translation>Загрузка...</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location line="+22"/>
         <source>Loading File - Qt Linguist</source>
         <translation>Загрузка файла - Qt Linguist</translation>
     </message>
     <message>
-        <location line="-21"/>
         <source>The file &apos;%1&apos; does not seem to be related to the currently open file(s) &apos;%2&apos;.
 
 Close the open file(s) first?</source>
@@ -445,7 +358,6 @@ Close the open file(s) first?</source>
 Закрыть открытые файлы?</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>The file &apos;%1&apos; does not seem to be related to the file &apos;%2&apos; which is being loaded as well.
 
 Skip loading the first named file?</source>
@@ -454,7 +366,6 @@ Skip loading the first named file?</source>
 Пропустить загрузку файла?</translation>
     </message>
     <message numerus="yes">
-        <location line="+61"/>
         <source>%n translation unit(s) loaded.</source>
         <translation>
             <numerusform>Загружена %n запись.</numerusform>
@@ -463,124 +374,84 @@ Skip loading the first named file?</source>
         </translation>
     </message>
     <message>
-        <location line="+94"/>
         <source>Related files (%1);;</source>
         <translation>Связанные файлы (%1);;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Open Translation Files</source>
         <translation>Открыть файлы перевода</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+31"/>
         <source>File saved.</source>
         <translation>Файл сохранён.</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.ui"/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+15"/>
-        <location line="+1187"/>
         <source>Release</source>
         <translation>Скомпилировать</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1186"/>
         <source>Qt message files for released applications (*.qm)
 All files (*)</source>
         <translation>Скомпилированные файлы перевода для приложений Qt (*.qm)
 Все файлы (*)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+12"/>
         <source>File created.</source>
         <translation>Файл создан.</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <location line="+355"/>
         <source>Printing...</source>
         <translation>Печать...</translation>
     </message>
     <message>
-        <location line="-347"/>
         <source>Context: %1</source>
         <translation>Контекст: %1</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>finished</source>
         <translation>завершён</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>unresolved</source>
         <translation>неразрешённый</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>obsolete</source>
         <translation>устаревший</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <location line="+307"/>
         <source>Printing... (page %1)</source>
         <translation>Печать... (страница %1)</translation>
     </message>
     <message>
-        <location line="-300"/>
-        <location line="+307"/>
         <source>Printing completed</source>
         <translation>Печать завершена</translation>
     </message>
     <message>
-        <location line="-305"/>
-        <location line="+307"/>
         <source>Printing aborted</source>
         <translation>Печать прервана</translation>
     </message>
     <message>
-        <location line="-232"/>
         <source>Search wrapped.</source>
         <translation>Поиск с начала.</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+278"/>
-        <location line="+34"/>
-        <location line="+24"/>
-        <location line="+22"/>
-        <location line="+538"/>
-        <location line="+1"/>
-        <location line="+274"/>
-        <location line="+40"/>
-        <location line="+10"/>
         <source>Qt Linguist</source>
         <translation>Qt Linguist</translation>
     </message>
     <message>
-        <location line="-1220"/>
-        <location line="+102"/>
         <source>Cannot find the string &apos;%1&apos;.</source>
         <translation>Не удалось найти строку &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="-82"/>
         <source>Search And Translate in &apos;%1&apos; - Qt Linguist</source>
         <translation>Поиск и перевод &apos;%1&apos; - Qt Linguist</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <location line="+23"/>
-        <location line="+24"/>
         <source>Translate - Qt Linguist</source>
         <translation>Перевод - Qt Linguist</translation>
     </message>
     <message numerus="yes">
-        <location line="-46"/>
         <source>Translated %n entry(s)</source>
         <translation>
             <numerusform>Переведена %n запись</numerusform>
@@ -589,39 +460,32 @@ All files (*)</source>
         </translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>No more occurrences of &apos;%1&apos;. Start over?</source>
         <translation>Нет больше совпадений с &apos;%1&apos;. Начать заново?</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Create New Phrase Book</source>
         <translation>Создать глоссарий</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Qt phrase books (*.qph)
 All files (*)</source>
         <translation>Глоссарии Qt (*.qph)
 Все файлы (*)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Phrase book created.</source>
         <translation>Глоссарий создан.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Open Phrase Book</source>
         <translation>Открыть глоссарий</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Qt phrase books (*.qph);;All files (*)</source>
         <translation>Глоссарии Qt (*.qph);;Все файлы (*)</translation>
     </message>
     <message numerus="yes">
-        <location line="+7"/>
         <source>%n phrase(s) loaded.</source>
         <translation>
             <numerusform>Загружена %n фраза.</numerusform>
@@ -630,879 +494,690 @@ All files (*)</source>
         </translation>
     </message>
     <message>
-        <location line="+93"/>
-        <location line="+3"/>
-        <location line="+7"/>
         <source>Add to phrase book</source>
         <translation>Добавить в глоссарий</translation>
     </message>
     <message>
-        <location line="-9"/>
         <source>No appropriate phrasebook found.</source>
         <translation>Подходящий глоссарий не найден.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Adding entry to phrasebook %1</source>
         <translation>Добавление записи в глоссарий %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Select phrase book to add to</source>
         <translation>Выберите глоссарий, в который желаете добавить фразу</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Unable to launch Qt Assistant (%1)</source>
         <translation>Не удалось запустить Qt Assistant (%1)</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Version %1</source>
         <translation>Версия %1</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist - инструмент для добавления переводов в приложения на основе Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения.</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Do you want to save the modified files?</source>
         <translation>Желаете сохранить изменённые файлы?</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Do you want to save &apos;%1&apos;?</source>
         <translation>Желаете сохранить &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Qt Linguist[*]</source>
         <translation>Qt Linguist[*]</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1[*] - Qt Linguist</source>
         <translation>%1[*] - Qt Linguist</translation>
     </message>
     <message>
-        <location line="+267"/>
-        <location line="+12"/>
         <source>No untranslated translation units left.</source>
         <translation>Непереведённых записей не осталось.</translation>
     </message>
     <message>
-        <location line="+198"/>
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+M</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Display the manual for %1.</source>
         <translation>Показать руководство для %1.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Display information about %1.</source>
         <translation>Показать информацию о %1.</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>&amp;Save &apos;%1&apos;</source>
         <translation>&amp;Сохранить&apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save &apos;%1&apos; &amp;As...</source>
         <translation>Сохранить&apos;%1&apos; &amp;как...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Release &apos;%1&apos;</source>
         <translation>Скомпилировать &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Release &apos;%1&apos; As...</source>
         <translation>Скомпилировать &apos;%1&apos; как...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Close &apos;%1&apos;</source>
         <translation>&amp;Закрыть &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+15"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.ui"/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-14"/>
-        <location line="+11"/>
         <source>Save &amp;As...</source>
         <translation>Сохранить &amp;как...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-9"/>
-        <location line="+10"/>
         <source>Release As...</source>
         <translation>Скомпилировать как...</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-9"/>
-        <location line="+13"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Save All</source>
         <translation>Сохранить все</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.ui"/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1"/>
         <source>&amp;Release All</source>
         <translation>С&amp;компилировать все</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1"/>
         <source>Close All</source>
         <translation>Закрыть все</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>&amp;Release</source>
         <translation>С&amp;компилировать</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Translation File &amp;Settings for &apos;%1&apos;...</source>
         <translation>&amp;Параметры файла перевода для &apos;%1&apos;...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Batch Translation of &apos;%1&apos;...</source>
         <translation>Пак&amp;етный перевод &apos;%1&apos;...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search And &amp;Translate in &apos;%1&apos;...</source>
         <translation>&amp;Найти и перевести в &apos;%1&apos;...</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.ui"/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+2"/>
         <source>Translation File &amp;Settings...</source>
         <translation>&amp;Параметры файла перевода...</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1"/>
         <source>&amp;Batch Translation...</source>
         <translation>Пак&amp;етный перевод...</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1"/>
         <source>Search And &amp;Translate...</source>
         <translation>&amp;Найти и перевести...</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.ui"/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+51"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+7"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+6"/>
         <source>Translation</source>
         <translation>Перевод</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+6"/>
         <source>Validation</source>
         <translation>Проверка</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+7"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+84"/>
         <source>Cannot read from phrase book &apos;%1&apos;.</source>
         <translation>Не удалось прочитать из глоссария &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Close this phrase book.</source>
         <translation>Закрыть глоссарий.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Enables you to add, modify, or delete entries in this phrase book.</source>
         <translation>Позволяет добавлять, изменять и удалять записи в глоссарии.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Print the entries in this phrase book.</source>
         <translation>Печать записей фраз глоссария.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Cannot create phrase book &apos;%1&apos;.</source>
         <translation>Не удалось создать глоссарий &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Do you want to save phrase book &apos;%1&apos;?</source>
         <translation>Желаете сохранить глоссарий &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location line="+349"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.ui"/>
         <source>MainWindow</source>
         <translation>Главное окно</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Phrases</source>
         <translation>Фра&amp;зы</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Close Phrase Book</source>
         <translation>&amp;Закрыть глоссарий</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Edit Phrase Book</source>
         <translation>&amp;Редактироваь глоссарий</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Print Phrase Book</source>
         <translation>&amp;Печатать глоссарий</translation>
     </message>
     <message>
-        <location/>
         <source>V&amp;alidation</source>
         <translation>П&amp;роверка</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location/>
         <source>Vie&amp;ws</source>
         <translation>Вид&amp;ы</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Toolbars</source>
         <translation>Пан&amp;ели инструментов</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Translation</source>
         <translation>П&amp;еревод</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location/>
         <source>Recently Opened &amp;Files</source>
         <translation>Недавно открытые &amp;файлы</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <location/>
         <source>Open a Qt translation source file (TS file) for editing</source>
         <translation>Открыть исходный файл переводов Qt (файл TS) для изменения</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+O</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>E&amp;xit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location/>
         <source>Close this window and exit.</source>
         <translation>Закрыть окно и выйти.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location/>
         <source>Save changes made to this Qt translation source file</source>
         <translation>Сохранить изменения в данном исходном файле перевода Qt</translation>
     </message>
     <message>
-        <location/>
         <source>Save As...</source>
         <translation>Сохранить как...</translation>
     </message>
     <message>
-        <location/>
         <source>Save changes made to this Qt translation source file into a new file.</source>
         <translation>Сохранить изменения в данном исходном файле перевода Qt в новый файл.</translation>
     </message>
     <message>
-        <location/>
         <source>Create a Qt message file suitable for released applications from the current message file.</source>
         <translation>Скомпилировать файл перевода Qt из текущего файла.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Print...</source>
         <translation>&amp;Печать...</translation>
     </message>
     <message>
-        <location/>
         <source>Print a list of all the translation units in the current translation source file.</source>
         <translation>Печать списка всех записей перевода из текущего файла.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
-        <location/>
         <source>Undo the last editing operation performed on the current translation.</source>
         <translation>Отменить последнее изменение текущего перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Redo</source>
         <translation>&amp;Повторить</translation>
     </message>
     <message>
-        <location/>
         <source>Redo an undone editing operation performed on the translation.</source>
         <translation>Повторить отменённую правку перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+Y</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Cu&amp;t</source>
         <translation>Выр&amp;езать</translation>
     </message>
     <message>
-        <location/>
         <source>Copy the selected translation text to the clipboard and deletes it.</source>
         <translation>Скопировать отмеченный текст в буфер обмена и удалить его из оригинала.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+X</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location/>
         <source>Copy the selected translation text to the clipboard.</source>
         <translation>Скопировать отмеченный текст в буфер обмена.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+C</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
-        <location/>
         <source>Paste the clipboard text into the translation.</source>
         <translation>Вставить текст из буфера обмена в перевод.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+V</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Select &amp;All</source>
         <translation>В&amp;ыделить всё</translation>
     </message>
     <message>
-        <location/>
         <source>Select the whole translation text.</source>
         <translation>Выделить весь текст перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+A</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Find...</source>
         <translation>&amp;Найти...</translation>
     </message>
     <message>
-        <location/>
         <source>Search for some text in the translation source file.</source>
         <translation>Найти текст в исходном файле перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+F</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Find &amp;Next</source>
         <translation>Найти д&amp;алее</translation>
     </message>
     <message>
-        <location/>
         <source>Continue the search where it was left.</source>
         <translation>Продолжить поиск с места, где он был остановлен.</translation>
     </message>
     <message>
-        <location/>
         <source>F3</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Prev Unfinished</source>
         <translation>&amp;Предыдущий незавершённый</translation>
     </message>
     <message>
-        <location/>
         <source>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file.</source>
         <translation>Создание готового файла перевода Qt из текущего файла. Имя файла будет автоматически определено из имени .ts файла.</translation>
     </message>
     <message>
-        <location/>
         <source>Length Variants</source>
         <translation>Варианты перевода</translation>
     </message>
     <message>
-        <location/>
         <source>Move to the previous unfinished item.</source>
         <translation>Перейти к предыдущему незавершённому переводу.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+K</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Next Unfinished</source>
         <translation>&amp;Следующий незавершённый</translation>
     </message>
     <message>
-        <location/>
         <source>Move to the next unfinished item.</source>
         <translation>Перейти к следующему незавершённому переводу.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+J</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>P&amp;rev</source>
         <translation>Пр&amp;едыдущий</translation>
     </message>
     <message>
-        <location/>
         <source>Move to the previous item.</source>
         <translation>Перейти к предыдущему переводу.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+Shift+K</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Ne&amp;xt</source>
         <translation>С&amp;ледующий</translation>
     </message>
     <message>
-        <location/>
         <source>Move to the next item.</source>
         <translation>Перейти к следующему переводу.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+Shift+J</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Done and Next</source>
         <translation>&amp;Готово и далее</translation>
     </message>
     <message>
-        <location/>
         <source>Mark this item as done and move to the next unfinished item.</source>
         <translation>Пометить перевод как завершённый и перейти к следующему незавершённому.</translation>
     </message>
     <message>
-        <location/>
         <source>Copy from source text</source>
         <translation>Скопировать из исходного текста</translation>
     </message>
     <message>
-        <location/>
         <source>Copies the source text into the translation field.</source>
         <translation>Скопировать исходный текст в поле перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+B</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Accelerators</source>
         <translation>&amp;Акселераторы</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
         <translation>Переключение проверки акселераторов, т.е. совпадает ли количество амперсандов в исходном и переведённом текстах. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Ending Punctuation</source>
         <translation>&amp;Знаки препинания</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
         <translation>Переключение проверки знаков препинания в конце текста. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Phrase matches</source>
         <translation>Совпадение &amp;фраз</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
         <translation>Переключение проверки использования предложений для фраз. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
     </message>
     <message>
-        <location/>
         <source>Place &amp;Marker Matches</source>
         <translation>Совпадение &amp;маркеров</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
         <translation>Переключение проверки маркеров форматирования, т.е. все ли маркеры (%1, %2, ...) исходного текста присутствуют в переведённом. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New Phrase Book...</source>
         <translation>&amp;Новый глоссарий...</translation>
     </message>
     <message>
-        <location/>
         <source>Create a new phrase book.</source>
         <translation>Создать глоссарий.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+N</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Open Phrase Book...</source>
         <translation>&amp;Открыть глоссарий...</translation>
     </message>
     <message>
-        <location/>
         <source>Open a phrase book to assist translation.</source>
         <translation>Открыть глоссарий для помощи в переводе.</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+H</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Reset Sorting</source>
         <translation>&amp;Сброс сортировки</translation>
     </message>
     <message>
-        <location/>
         <source>Sort the items back in the same order as in the message file.</source>
         <translation>Упорядочить элементы в той последовательности, в которой они находятся в файле.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Display guesses</source>
         <translation>&amp;Предлагать похожие</translation>
     </message>
     <message>
-        <location/>
         <source>Set whether or not to display translation guesses.</source>
         <translation>Определяет необходимо или нет отображать похожие переводы.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Statistics</source>
         <translation>&amp;Статистика</translation>
     </message>
     <message>
-        <location/>
         <source>Display translation statistics.</source>
         <translation>Показать статистику перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Manual</source>
         <translation>&amp;Руководство</translation>
     </message>
     <message>
-        <location/>
         <source>F1</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>About Qt Linguist</source>
         <translation>О Qt Linguist</translation>
     </message>
     <message>
-        <location/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;What&apos;s This?</source>
         <translation>&amp;Что это?</translation>
     </message>
     <message>
-        <location/>
         <source>What&apos;s This?</source>
         <translation>Что это?</translation>
     </message>
     <message>
-        <location/>
         <source>Enter What&apos;s This? mode.</source>
         <translation>Переход в режим &quot;Что это?&quot;.</translation>
     </message>
     <message>
-        <location/>
         <source>Shift+F1</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Search And Translate...</source>
         <translation>&amp;Найти и перевести...</translation>
     </message>
     <message>
-        <location/>
         <source>Replace the translation on all entries that matches the search source text.</source>
         <translation>Заменить перевод всех записей, которые совпадают с искомым исходным текстом.</translation>
     </message>
     <message>
-        <location/>
         <source>Batch translate all entries using the information in the phrase books.</source>
         <translation>Перевести все записи в пакетном режиме, используя информацию из глоссария.</translation>
     </message>
     <message>
-        <location/>
         <source>Open/Refresh Form &amp;Preview</source>
         <translation>Открыть/обновить предпрос&amp;мотр формы</translation>
     </message>
     <message>
-        <location/>
         <source>Form Preview Tool</source>
         <translation>Инструмент предпросмотра форм</translation>
     </message>
     <message>
-        <location/>
         <source>F5</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Add to Phrase Book</source>
         <translation>&amp;Добавить в глоссарий</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+T</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Open Read-O&amp;nly...</source>
         <translation>Открыть только для &amp;чтения...</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Save All</source>
         <translation>&amp;Сохранить все</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Close All</source>
         <translation>&amp;Закрыть все</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+W</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Previous unfinished item</source>
         <translation>Предыдущий незавершённый перевод</translation>
     </message>
     <message>
-        <location/>
         <source>Next unfinished item</source>
         <translation>Следующий незавершённый перевод</translation>
     </message>
     <message>
-        <location/>
         <source>Move to previous item</source>
         <translation>Перейти к предыдущему переводу</translation>
     </message>
     <message>
-        <location/>
         <source>Next item</source>
         <translation>Следующий перевод</translation>
     </message>
     <message>
-        <location/>
         <source>Mark item as done and move to the next unfinished item</source>
         <translation>Пометить перевод как завершённый и перейти к следующему незавершённому</translation>
     </message>
     <message>
-        <location/>
         <source>Copies the source text into the translation field</source>
         <translation>Скопировать исходный текст в поле перевода</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle the validity check of accelerators</source>
         <translation>Переключение проверки акселераторов</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle the validity check of ending punctuation</source>
         <translation>Переключение проверки знаков препинания в конце текста</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle checking that phrase suggestions are used</source>
         <translation>Переключение проверки использования предложений для фраз</translation>
     </message>
     <message>
-        <location/>
         <source>Toggle the validity check of place markers</source>
         <translation>Переключение проверки маркеров форматирования</translation>
     </message>
     <message>
-        <location/>
         <source>Display information about the Qt toolkit by Nokia.</source>
         <translation>Показать информацию об инструментарии Qt от Nokia.</translation>
     </message>
@@ -1510,104 +1185,84 @@ All files (*)</source>
 <context>
     <name>MessageEditor</name>
     <message>
-        <location filename="../tools/linguist/linguist/messageeditor.cpp" line="+42"/>
         <source></source>
         <comment>This is the right panel of the main window.</comment>
         <translatorcomment>Правая панель основного окна</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Russian</source>
         <translation>Русский</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>German</source>
         <translation>Немецкий</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Japanese</source>
         <translation>Японский</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>French</source>
         <translation>Французский</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Polish</source>
         <translation>Польский</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Chinese</source>
         <translation>Китайский</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>This whole panel allows you to view and edit the translation of some source text.</source>
         <translation>Данная панель позволяет просматривать и редактировать перевод исходного текста.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Source text</source>
         <translation>Исходный текст</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>This area shows the source text.</source>
         <translation>В данной области отображается исходный текст.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Source text (Plural)</source>
         <translation>Исходный текст (множественная форма)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>This area shows the plural form of the source text.</source>
         <translation>В данной области отображается исходный текст во множественной форме.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Developer comments</source>
         <translation>Комментарий разработчика</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>This area shows a comment that may guide you, and the context in which the text occurs.</source>
         <translation>В данной области отображается комментарий, который поможет определить в каком контексте встречается переводимый текст.</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Here you can enter comments for your own use. They have no effect on the translated applications.</source>
         <translation>Здесь вы можете оставить комментарий для собственного использования. Комментарии не влияют на перевод приложений.</translation>
     </message>
     <message>
-        <location line="+234"/>
         <source>%1 translation (%2)</source>
         <translation>%1 перевод (%2)</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>This is where you can enter or modify the translation of the above source text.</source>
         <translation>Здесь вы можете ввести или изменить перевод текста, представленного выше.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 translation</source>
         <translation>%1 перевод</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 translator comments</source>
         <translation>%1 перевод: комментарий переводчика</translation>
     </message>
     <message>
-        <location line="+157"/>
         <source>&apos;%1&apos;
 Line: %2</source>
         <translation>&apos;%1&apos;
@@ -1617,22 +1272,18 @@ Line: %2</source>
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+839"/>
         <source>Completion status for %1</source>
         <translation>Состояние завершённости для %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>&lt;file header&gt;</source>
         <translation>&lt;заголовок файла&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&lt;context comment&gt;</source>
         <translation>&lt;контекстный комментарий&gt;</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>&lt;unnamed context&gt;</source>
         <translation>&lt;безымянный контекст&gt;</translation>
     </message>
@@ -1640,113 +1291,91 @@ Line: %2</source>
 <context>
     <name>PhraseBookBox</name>
     <message>
-        <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="+42"/>
         <source></source>
         <comment>Go to Phrase &gt; Edit Phrase Book... The dialog that pops up is a PhraseBookBox.</comment>
         <translation></translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>(New Entry)</source>
         <translation>(Новая запись)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>%1[*] - Qt Linguist</source>
         <translation>%1[*] - Qt Linguist</translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>Qt Linguist</source>
         <translation>Qt Linguist</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cannot save phrase book &apos;%1&apos;.</source>
         <translation>Не удалось сохранить глоссарий &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/phrasebookbox.ui"/>
         <source>Edit Phrase Book</source>
         <translation>Правка глоссария</translation>
     </message>
     <message>
-        <location/>
         <source>This window allows you to add, modify, or delete entries in a phrase book.</source>
         <translation>Данное окно позволяет добавлять, изменять и удалять записи в глоссарии.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Translation:</source>
         <translation>&amp;Перевод:</translation>
     </message>
     <message>
-        <location/>
         <source>This is the phrase in the target language corresponding to the source phrase.</source>
         <translation>Перевод, соответствующий исходной фразе.</translation>
     </message>
     <message>
-        <location/>
         <source>S&amp;ource phrase:</source>
         <translation>&amp;Исходная фраза:</translation>
     </message>
     <message>
-        <location/>
         <source>This is a definition for the source phrase.</source>
         <translation>Определение исходной фразы.</translation>
     </message>
     <message>
-        <location/>
         <source>This is the phrase in the source language.</source>
         <translation>Фраза на исходном языке.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Definition:</source>
         <translation>&amp;Определение:</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to add the phrase to the phrase book.</source>
         <translation>Добавить фразу в глоссарий.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;New Entry</source>
         <translation>Новая &amp;запись</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to remove the entry from the phrase book.</source>
         <translation>Удалить фразу из глоссария.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Remove Entry</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Settin&amp;gs...</source>
         <translation>&amp;Настройки...</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to save the changes made.</source>
         <translation>Сохранить изменения.</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to close this window.</source>
         <translation>Закрыть окно.</translation>
     </message>
     <message>
-        <location/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1754,17 +1383,14 @@ Line: %2</source>
 <context>
     <name>PhraseModel</name>
     <message>
-        <location filename="../tools/linguist/linguist/phrasemodel.cpp" line="+117"/>
         <source>Source phrase</source>
         <translation>Исходная фраза</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Translation</source>
         <translation>Перевод</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Definition</source>
         <translation>Определение</translation>
     </message>
@@ -1772,22 +1398,18 @@ Line: %2</source>
 <context>
     <name>PhraseView</name>
     <message>
-        <location filename="../tools/linguist/linguist/phraseview.cpp" line="+122"/>
         <source>Insert</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Guess (%1)</source>
         <translation>Похожая (%1)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Guess</source>
         <translation>Похожая</translation>
     </message>
@@ -1795,63 +1417,46 @@ Line: %2</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1864"/>
         <source>Translation files (%1);;</source>
         <translation>Файлы перевода (%1);;</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>All files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1134"/>
-        <location line="+27"/>
-        <location line="+67"/>
-        <location line="+39"/>
-        <location line="+17"/>
-        <location line="+15"/>
-        <location filename="../tools/linguist/linguist/phrase.cpp" line="+196"/>
         <source>Qt Linguist</source>
         <translation>Qt Linguist</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/shared/po.cpp" line="+817"/>
         <source>GNU Gettext localization files</source>
         <translation>Файлы локализации GNU Gettext</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>GNU Gettext localization template files</source>
         <translation>Файлы шаблонов локализации GNU Gettext</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/shared/qm.cpp" line="+12"/>
         <source>Compiled Qt translations</source>
         <translation>Скомпилированные переводы Qt</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/shared/qph.cpp" line="+195"/>
         <source>Qt Linguist &apos;Phrase Book&apos;</source>
         <translation>&apos;Глоссарий&apos; Qt Linguist</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/shared/ts.cpp" line="+752"/>
         <source>Qt translation sources (format 1.1)</source>
         <translation>Исходные файлы перевода Qt (формат 1.1)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Qt translation sources (format 2.0)</source>
         <translation>Исходные файлы перевода Qt (формат 2.0)</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Qt translation sources (latest format)</source>
         <translation>Исходные файлы перевода Qt (последний формат)</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/shared/xliff.cpp" line="+829"/>
         <source>XLIFF localization files</source>
         <translation>Файлы локализации XLIFF</translation>
     </message>
@@ -1859,17 +1464,14 @@ Line: %2</source>
 <context>
     <name>SourceCodeView</name>
     <message>
-        <location filename="../tools/linguist/linguist/sourcecodeview.cpp" line="+70"/>
         <source>&lt;i&gt;Source code not available&lt;/i&gt;</source>
         <translation>&lt;i&gt;Исходный код недоступен&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>&lt;i&gt;File %1 not available&lt;/i&gt;</source>
         <translation>&lt;i&gt;Файл %1 недоступен&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&lt;i&gt;File %1 not readable&lt;/i&gt;</source>
         <translation>&lt;i&gt;Невозможно прочитать файл %1&lt;/i&gt;</translation>
     </message>
@@ -1877,42 +1479,34 @@ Line: %2</source>
 <context>
     <name>Statistics</name>
     <message>
-        <location filename="../tools/linguist/linguist/statistics.ui"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location/>
         <source>Translation</source>
         <translation>Перевод</translation>
     </message>
     <message>
-        <location/>
         <source>Source</source>
         <translation>Источник</translation>
     </message>
     <message>
-        <location/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location/>
         <source>Words:</source>
         <translation>Слов:</translation>
     </message>
     <message>
-        <location/>
         <source>Characters:</source>
         <translation>Символов:</translation>
     </message>
     <message>
-        <location/>
         <source>Characters (with spaces):</source>
         <translation>Символов (с пробелами):</translation>
     </message>
@@ -1920,72 +1514,58 @@ Line: %2</source>
 <context>
     <name>TranslateDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/translatedialog.ui"/>
         <source>This window allows you to search for some text in the translation source file.</source>
         <translation>Данное окно позволяет искать текст в файле перевода.</translation>
     </message>
     <message>
-        <location/>
         <source>Type in the text to search for.</source>
         <translation>Введите искомый текст.</translation>
     </message>
     <message>
-        <location/>
         <source>Find &amp;source text:</source>
         <translation>&amp;Найти текст:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Translate to:</source>
         <translation>&amp;Перевести как:</translation>
     </message>
     <message>
-        <location/>
         <source>Search options</source>
         <translation>Параметры поиска</translation>
     </message>
     <message>
-        <location/>
         <source>Texts such as &apos;TeX&apos; and &apos;tex&apos; are considered as different when checked.</source>
         <translation>Если отмечено, строки &quot;ПрИмЕр&quot; и &quot;пример&quot; будет считаться разными.</translation>
     </message>
     <message>
-        <location/>
         <source>Match &amp;case</source>
         <translation>С учётом &amp;регистра</translation>
     </message>
     <message>
-        <location/>
         <source>Mark new translation as &amp;finished</source>
         <translation>Помечать перевод как завер&amp;шённый</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to find the next occurrence of the text you typed in.</source>
         <translation>Найти следующее совпадение для введённого текста.</translation>
     </message>
     <message>
-        <location/>
         <source>Find Next</source>
         <translation>Найти далее</translation>
     </message>
     <message>
-        <location/>
         <source>Translate</source>
         <translation>Перевести</translation>
     </message>
     <message>
-        <location/>
         <source>Translate All</source>
         <translation>Перевести все</translation>
     </message>
     <message>
-        <location/>
         <source>Click here to close this window.</source>
         <translation>Закрыть окно.</translation>
     </message>
     <message>
-        <location/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -1993,33 +1573,26 @@ Line: %2</source>
 <context>
     <name>TranslationSettingsDialog</name>
     <message>
-        <location filename="../tools/linguist/linguist/translationsettings.ui"/>
         <source>Source language</source>
         <translation>Исходный язык</translation>
     </message>
     <message>
-        <location/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location/>
         <source>Country/Region</source>
         <translation>Страна/Регион</translation>
     </message>
     <message>
-        <location/>
         <source>Target language</source>
         <translation>Язык перевода</translation>
     </message>
     <message>
-        <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+93"/>
         <source>Any Country</source>
         <translation>Любая страна</translation>
     </message>
     <message>
-        <location line="-22"/>
-        <location line="+8"/>
         <source>Settings for &apos;%1&apos; - Qt Linguist</source>
         <translation>Настройки для &apos;%1&apos; - Qt Linguist</translation>
     </message>
diff --git a/translations/qt_help_ru.ts b/translations/qt_help_ru.ts
index f1aa0fa..be3583c 100644
--- a/translations/qt_help_ru.ts
+++ b/translations/qt_help_ru.ts
@@ -4,106 +4,92 @@
 <context>
     <name>QCLuceneResultWidget</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+110"/>
         <source>Search Results</source>
         <translation>Результат поиска</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Note:</source>
         <translation>Примечание:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The search results may not be complete since the documentation is still being indexed!</source>
         <translation>Результат поиска может быть неполным, так как документация ещё индексируется!</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Your search did not match any documents.</source>
         <translation>По вашему запросу не найдено ни одного документа.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>(The reason for this might be that the documentation is still being indexed.)</source>
         <translation>(Причиной этого может быть то, что документация ещё индексируется.)</translation>
     </message>
 </context>
 <context>
+    <name>QHelp</name>
+    <message>
+        <source>Untitled</source>
+        <translation>Безымянный</translation>
+    </message>
+</context>
+<context>
     <name>QHelpCollectionHandler</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpcollectionhandler.cpp" line="+79"/>
         <source>The collection file &apos;%1&apos; is not set up yet!</source>
         <translation>Файл коллекции справки &apos;%1&apos; ещё не установлен!</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Cannot load sqlite database driver!</source>
         <translation>Не удалось загрузить драйвер базы данных sqlite!</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+52"/>
         <source>Cannot open collection file: %1</source>
         <translation>Не удалось открыть файл коллекции справки: %1</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>Cannot create tables in file %1!</source>
         <translation>Не удалось создать таблицы в файле %1!</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>The collection file &apos;%1&apos; already exists!</source>
         <translation>Файл коллекции справки &apos;%1&apos; уже существует!</translation>
     </message>
     <message>
-        <location line="+151"/>
         <source>Unknown filter &apos;%1&apos;!</source>
         <translation>Неизвестный фильтр &apos;%1&apos;!</translation>
     </message>
     <message>
-        <location line="+103"/>
         <source>Invalid documentation file &apos;%1&apos;!</source>
         <translation>Некорректный файл документации &apos;%1&apos;!</translation>
     </message>
     <message>
-        <location line="+167"/>
         <source>Cannot register namespace &apos;%1&apos;!</source>
         <translation>Не удалось зарегистрировать пространство имён %1!</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Cannot open database &apos;%1&apos; to optimize!</source>
         <translation>Не удалось открыть базу данных &apos;%1&apos; для оптимизации!</translation>
     </message>
     <message>
-        <location line="-439"/>
         <source>Cannot create directory: %1</source>
         <translation>Не удалось создать каталог: %1</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Cannot copy collection file: %1</source>
         <translation>Не удалось скопировать файл коллекции справки: %1</translation>
     </message>
     <message>
-        <location line="+172"/>
         <source>Cannot register filter %1!</source>
         <translation>Не удалось зарегистрировать фильтр %1!</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Cannot open documentation file %1!</source>
         <translation>Не удалось открыть файл документации %1!</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>The namespace %1 was not registered!</source>
         <translation>Пространство имён %1 не зарегистрировано!</translation>
     </message>
     <message>
-        <location line="+120"/>
         <source>Namespace %1 already exists!</source>
         <translation>Пространство имён %1 уже существует!</translation>
     </message>
@@ -111,7 +97,6 @@
 <context>
     <name>QHelpDBReader</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpdbreader.cpp" line="+98"/>
         <source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %3</source>
         <extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
         <translation>Не удалось открыть базу данных &apos;%1&apos; &apos;%2&apos;: %3</translation>
@@ -120,12 +105,10 @@
 <context>
     <name>QHelpEngineCore</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+122"/>
         <source>Cannot open documentation file %1: %2!</source>
         <translation>Не удалось открыть файл документации %1: %2!</translation>
     </message>
     <message>
-        <location line="+404"/>
         <source>The specified namespace does not exist!</source>
         <translation>Указанное пространство имён не существует!</translation>
     </message>
@@ -133,132 +116,106 @@
 <context>
     <name>QHelpGenerator</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpgenerator.cpp" line="+158"/>
         <source>Invalid help data!</source>
         <translation>Некорректные данные справки!</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>No output file name specified!</source>
         <translation>Не указано имя результирующего файла!</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Building up file structure...</source>
         <translation>Создание структуры файла...</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>The file %1 cannot be overwritten!</source>
         <translation>Невозможно перезаписать файл %1!</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Cannot open data base file %1!</source>
         <translation>Не удалось открыть файл базы данных %1!</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Cannot register namespace %1!</source>
         <translation>Не удалось зарегистрировать пространство имён %1!</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Insert custom filters...</source>
         <translation>Добавление индивидуальных фильтров...</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Insert help data for filter section (%1 of %2)...</source>
         <translation>Добавление данных справки для раздела фильтра (%1 из %2)...</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Documentation successfully generated.</source>
         <translation>Документация успешно создана.</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Some tables already exist!</source>
         <translation>Некоторые таблицы уже существуют!</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>Cannot create tables!</source>
         <translation>Не удалось создать таблицы!</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Cannot register virtual folder!</source>
         <translation>Не удалось зарегистрировать виртуальный каталог!</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Insert files...</source>
         <translation>Добавление файлов...</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it.</source>
         <translation>Файл %1 должен быть в каталоге &apos;%2&apos; или в его подкаталоге. Пропускаем.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>The file %1 does not exist! Skipping it.</source>
         <translation>Файл %1 не существует! Пропускаем.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot open file %1! Skipping it.</source>
         <translation>Не удалось открыть файл %1! Пропускаем.</translation>
     </message>
     <message>
-        <location line="+133"/>
         <source>The filter %1 is already registered!</source>
         <translation>Фильтр %1 уже зарегистрирован!</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cannot register filter %1!</source>
         <translation>Не удалось зарегистрировать фильтр %1!</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Insert indices...</source>
         <translation>Добавление указателей...</translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>Insert contents...</source>
         <translation>Добавление оглавления...</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Cannot insert contents!</source>
         <translation>Не удалось добавить оглавление!</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Cannot register contents!</source>
         <translation>Не удалось зарегистрировать оглавление!</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>File &apos;%1&apos; does not exist.</source>
         <translation>Файл &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>File &apos;%1&apos; cannot be opened.</source>
         <translation>Невозможно открыть файл &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
         <translation>Файл &apos;%1&apos; содержит некорректную ссылку на файл &apos;%2&apos;</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Invalid links in HTML files.</source>
         <translation>В файлах HTML обнаружены некорректные ссылки.</translation>
     </message>
@@ -266,47 +223,38 @@
 <context>
     <name>QHelpProject</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+88"/>
         <source>Unknown token.</source>
         <translation>Неизвестный идентификатор.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unknown token. Expected &quot;QtHelpProject&quot;!</source>
         <translation>Неизвестный идентификатор. Ожидается &quot;QtHelpProject&quot;!</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Error in line %1: %2</source>
         <translation>Ошибка в строке %1: %2</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Virtual folder has invalid syntax.</source>
         <translation>Виртуальный каталог имеет некорректный синтаксис.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Namespace has invalid syntax.</source>
         <translation>Пространство имён имеет некорректный синтаксис.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Missing namespace in QtHelpProject.</source>
         <translation>В QtHelpProject отсутствует пространство имён.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Missing virtual folder in QtHelpProject</source>
         <translation>В QtHelpProject отсутствует виртуальный каталог</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Missing attribute in keyword at line %1.</source>
         <translation>Отсутствует атрибут у ключевого слова в строке %1.</translation>
     </message>
     <message>
-        <location line="+141"/>
         <source>The input file %1 could not be opened!</source>
         <translation>Невозможно открыть исходный файл %1!</translation>
     </message>
@@ -314,52 +262,42 @@
 <context>
     <name>QHelpSearchQueryWidget</name>
     <message>
-        <location filename="../tools/assistant/lib/qhelpsearchquerywidget.cpp" line="+124"/>
         <source>Search for:</source>
         <translation>Искать:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous search</source>
         <translation>Предыдущий запрос</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Next search</source>
         <translation>Следующий запрос</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Advanced search</source>
         <translation>Расширенный поиск</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
         <translation>&lt;B&gt;похожие&lt;/B&gt; слова:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;B&gt;without&lt;/B&gt; the words:</source>
         <translation>&lt;B&gt;не содержит&lt;/B&gt; слов:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>with &lt;B&gt;exact phrase&lt;/B&gt;:</source>
         <translation>содержит &lt;B&gt;точную фразу&lt;/B&gt;:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>with &lt;B&gt;all&lt;/B&gt; of the words:</source>
         <translation>содержит &lt;B&gt;все&lt;/B&gt; слова:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>with &lt;B&gt;at least one&lt;/B&gt; of the words:</source>
         <translation>содержит &lt;B&gt;хотя бы одно&lt;/B&gt; из слов:</translation>
     </message>
@@ -367,7 +305,6 @@
 <context>
     <name>QHelpSearchResultWidget</name>
     <message numerus="yes">
-        <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+174"/>
         <source>%1 - %2 of %n Hits</source>
         <translation>
             <numerusform>%1 - %2 из %n совпадения</numerusform>
@@ -376,7 +313,6 @@
         </translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>0 - 0 of 0 Hits</source>
         <translation>0 - 0 из 0 совпадений</translation>
     </message>
diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index deae134..5fbd6e3 100644
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -4,7 +4,6 @@
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2313"/>
         <source>Close Tab</source>
         <translation>Закрыть вкладку</translation>
     </message>
@@ -12,12 +11,10 @@
 <context>
     <name>FakeReply</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2273"/>
         <source>Fake error !</source>
         <translation>Фиктивная ошибка !</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid URL</source>
         <translation>Некорректный адрес URL</translation>
     </message>
@@ -25,37 +22,30 @@
 <context>
     <name>MAC_APPLICATION_MENU</name>
     <message>
-        <location filename="../src/gui/kernel/qapplication.cpp" line="+2335"/>
         <source>Services</source>
         <translation>Службы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide %1</source>
         <translation>Скрыть %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Others</source>
         <translation>Скрыть остальные</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show All</source>
         <translation>Показать все</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Preferences...</source>
         <translation>Настройки…</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Quit %1</source>
         <translation>Завершить %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>Уведомления</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Music</source>
         <translation>Музыка</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Communication</source>
         <translation>Общение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Games</source>
         <translation>Игры</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Accessibility</source>
         <translation>Специальные возможности</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;Звуковое устройство &lt;b&gt;%1&lt;/b&gt; не работает.&lt;br/&gt;Будет использоваться &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;Переключение на звуковое устройство &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;, которое стало доступно и имеет высший приоритет.&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+14"/>
         <source>Revert back to device &apos;%1&apos;</source>
         <translation>Возвращение к устройству &quot;%1&quot;</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;Переключение на устройство вывода звука &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;, которое имеет высший приоритет или настроено для обработки данного потока.&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>Внимание: Похоже, пакет gstreamer0.10-plugins-good не установлен.
           Некоторые возможности воспроизведения видео недоступны.</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>Внимание: Похоже, основной модуль GStreamer не установлен.
@@ -138,7 +114,6 @@
 <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 @@ have libgstreamer-plugins-base installed.</source>
 что пакет libgstreamer-plugins-base установлен.</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>Missing codec helper script assistant.</source>
         <translation>Отсутствует сценарий установки кодека.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Plugin codec installation failed for codec: %0</source>
         <translation>Не удалось установить модуль кодека: %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>Отсутствует необходимый кодек. Вам нужно установить следующие кодеки для воспроизведения данного содержимого: %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>Не удалось открыть источник медиа-данных.</translation>
     </message>
     <message>
-        <location line="-514"/>
         <source>Invalid source type.</source>
         <translation>Некорректный тип источника медиа-данных.</translation>
     </message>
     <message>
-        <location line="+488"/>
         <source>Could not locate media source.</source>
         <translation>Не удалось найти источник медиа-данных.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Could not open audio device. The device is already in use.</source>
         <translation>Не удалось открыть звуковое устройство. Устройство уже используется.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Could not decode media source.</source>
         <translation>Не удалось декодировать источник медиа-данных.</translation>
     </message>
@@ -199,162 +159,130 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+103"/>
         <source>Audio Output</source>
         <translation>Воспроизведение звука</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The audio output device</source>
         <translation>Устройство воспроизведения звука</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/utils.cpp" line="+89"/>
         <source>No error</source>
         <translation>Нет ошибки</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Not found</source>
         <translation>Не найдено</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Out of memory</source>
         <translation>Недостаточно ресурсов</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Not supported</source>
         <translation>Не поддерживается</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Overflow</source>
         <translation>Переполнение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Underflow</source>
         <translation type="unfinished">Переполнение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Already exists</source>
         <translation>Уже существует</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Path not found</source>
         <translation>Путь не найден</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>In use</source>
         <translation>Используется</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Not ready</source>
         <translation>Не готово</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Access denied</source>
         <translation>Доступ запрещён</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Could not connect</source>
         <translation>Не удалось установить соединение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disconnected</source>
         <translation>Соединение разорвано</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Permission denied</source>
         <translation>Доступ запрещён</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insufficient bandwidth</source>
         <translation>Недостаточная скорость передачи данных</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network unavailable</source>
         <translation>Сеть недоступна</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Network communication error</source>
         <translation>Ошибка сетевого обмена данными</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Streaming not supported</source>
         <translation>Потоковое воспроизведение не поддерживается</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Server alert</source>
         <translation type="unfinished">Сигнал сервера</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid protocol</source>
         <translation>Некорректный протокол</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid URL</source>
         <translation>Некорректный адрес URL</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Multicast error</source>
         <translation>Ошибка широковещательной передачи</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Proxy server error</source>
         <translation>Ошибка прокси-сервера</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy server not supported</source>
         <translation>Прокси-сервер не поддерживается</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Audio output error</source>
         <translation>Ошибка воспроизведения звука</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video output error</source>
         <translation>Ошибка воспроизведения видео</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Decoder error</source>
         <translation>Ошибка декодирования</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Audio or video components could not be played</source>
         <translation>Аудио- или видео-состовляющая не может быть воспроизведена</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>DRM error</source>
         <translation>Ошибка DRM</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unknown error (%1)</source>
         <translation>Неизвестная ошибка (%1)</translation>
     </message>
@@ -362,33 +290,26 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::AbstractMediaPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/abstractmediaplayer.cpp" line="+73"/>
         <source>Not ready to play</source>
         <translation>Не готов к воспроизведению</translation>
     </message>
     <message>
-        <location line="+161"/>
-        <location line="+10"/>
         <source>Error opening file</source>
         <translation>Ошибка открытия файла</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Error opening URL</source>
         <translation>Ошибка открытия адреса URL</translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Setting volume failed</source>
         <translation>Не удалось установить уровень громкости</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Loading clip failed</source>
         <translation>Не удалось загрузить клип</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Playback complete</source>
         <translation>Воспроизведение завершено</translation>
     </message>
@@ -396,22 +317,18 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::AbstractVideoPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/abstractvideoplayer.cpp" line="+108"/>
         <source>Pause failed</source>
         <translation>Не удалось приостановить воспроизведение</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Seek failed</source>
         <translation>Не удалось установить позицию</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Getting position failed</source>
         <translation>Не удалось получить позицию</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>Opening clip failed</source>
         <translation>Не удалось открыть клип</translation>
     </message>
@@ -419,7 +336,6 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::AudioEqualizer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audioequalizer.cpp" line="+92"/>
         <source>%1 Hz</source>
         <translation>%1 Гц</translation>
     </message>
@@ -427,7 +343,6 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::AudioPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audioplayer.cpp" line="+173"/>
         <source>Getting position failed</source>
         <translation>Не удалось получить позицию</translation>
     </message>
@@ -435,11 +350,6 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::DsaVideoPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/videoplayer_dsa.cpp" line="+238"/>
-        <location line="+15"/>
-        <location line="+8"/>
-        <location line="+22"/>
-        <location line="+22"/>
         <source>Video display error</source>
         <translation>Ошибка отображения видео</translation>
     </message>
@@ -447,7 +357,6 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::EffectFactory</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/effectfactory.cpp" line="+181"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
@@ -455,61 +364,51 @@ have libgstreamer-plugins-base installed.</source>
 <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>Коэффициент затухания ВЧ (%)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Decay time (ms)</source>
         <extracomment>DecayTime: Time over which reverberation is diminished.</extracomment>
         <translation>Время затухания (мс)</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>Плотность (%)</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>Рассеивание (%)</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>Затухание отражений (мс)</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>Уровень отражений (мБар)</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>Задержка эха (мс)</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>Уровень эха (мБар)</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>Уровень ВЧ отражений</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Room level (mB)</source>
         <extracomment>RoomLevel: Master volume control for all reflected sound.</extracomment>
         <translation>Уровень отражений (мБар)</translation>
@@ -518,20 +417,17 @@ have libgstreamer-plugins-base installed.</source>
 <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>Ошибка открытыия источника: тип не поддерживается</translation>
+        <translation>Ошибка открытия источника: тип не поддерживается</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Error opening source: media type could not be determined</source>
-        <translation>Ошибка открытыия источника: тип носителя не определён</translation>
+        <translation>Ошибка открытия источника: не удалось определить тип медиа-данных</translation>
     </message>
 </context>
 <context>
     <name>Phonon::MMF::StereoWidening</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/stereowidening.cpp" line="+79"/>
         <source>Level (%)</source>
         <translation>Уровень (%)</translation>
     </message>
@@ -539,8 +435,6 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Phonon::MMF::SurfaceVideoPlayer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/videoplayer_surface.cpp" line="+126"/>
-        <location line="+16"/>
         <source>Video display error</source>
         <translation>Ошибка отображения видео</translation>
     </message>
@@ -548,22 +442,14 @@ have libgstreamer-plugins-base installed.</source>
 <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>Громкость: %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>Используйте данный регулятор для настройки громкости. Крайнее левое положение соответствует 0%, крайнее правое - %1%</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Muted</source>
         <translation>Без звука</translation>
     </message>
@@ -571,12 +457,10 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Q3Accel</name>
     <message>
-        <location filename="../src/qt3support/other/q3accel.cpp" line="+481"/>
         <source>%1, %2 not defined</source>
         <translation>%1, %2 не определён</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Ambiguous %1 not handled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -584,27 +468,22 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Q3DataTable</name>
     <message>
-        <location filename="../src/qt3support/sql/q3datatable.cpp" line="+285"/>
         <source>True</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>False</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+505"/>
         <source>Insert</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Update</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -612,313 +491,238 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Q3FileDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+835"/>
         <source>Copy or Move a File</source>
         <translation>Копировать или переместить файл</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Read: %1</source>
         <translation>Чтение: %1</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+30"/>
         <source>Write: %1</source>
         <translation>Запись: %1</translation>
     </message>
     <message>
-        <location line="-22"/>
-        <location line="+1579"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="-157"/>
-        <location line="+49"/>
-        <location line="+2149"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+133"/>
         <source>All Files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location line="-2085"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Attributes</source>
         <translation>Атрибуты</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+2027"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location line="-1987"/>
         <source>Look &amp;in:</source>
         <translation>&amp;Папка:</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+1977"/>
-        <location line="+16"/>
         <source>File &amp;name:</source>
         <translation>&amp;Имя файла:</translation>
     </message>
     <message>
-        <location line="-1992"/>
         <source>File &amp;type:</source>
         <translation>&amp;Тип файла:</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>One directory up</source>
         <translation>Вверх на один уровень</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Create New Folder</source>
         <translation>Создать папку</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>List View</source>
         <translation>Список</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Detail View</source>
         <translation>Подробный вид</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Preview File Info</source>
         <translation>Предпросмотр информации о файле</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Preview File Contents</source>
         <translation>Предпросмотр содержимого файла</translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Read-write</source>
         <translation>Чтение и запись</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Read-only</source>
         <translation>Только чтение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write-only</source>
         <translation>Только запись</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Inaccessible</source>
         <translation>Нет доступа</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Symlink to File</source>
         <translation>Ссылка на файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Symlink to Directory</source>
         <translation>Ссылка на каталог</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Symlink to Special</source>
         <translation>Ссылка на спецфайл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dir</source>
         <translation>Каталог</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Special</source>
         <translation>Спецфайл</translation>
     </message>
     <message>
-        <location line="+704"/>
-        <location line="+1999"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+209"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location line="-1889"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+71"/>
         <source>Save As</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location line="+642"/>
-        <location line="+5"/>
-        <location line="+355"/>
         <source>&amp;Open</source>
         <translation>&amp;Открыть</translation>
     </message>
     <message>
-        <location line="-357"/>
-        <location line="+341"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="-334"/>
         <source>&amp;Rename</source>
         <translation>&amp;Переименовать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>R&amp;eload</source>
         <translation>О&amp;бновить</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Sort by &amp;Name</source>
         <translation>По &amp;имени</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Sort by &amp;Size</source>
         <translation>По &amp;размеру</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sort by &amp;Date</source>
         <translation>По &amp;дате</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Unsorted</source>
         <translation>&amp;Не упорядочивать</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Sort</source>
         <translation>Упорядочить</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Show &amp;hidden files</source>
         <translation>Показать ск&amp;рытые файлы</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>the file</source>
         <translation>файл</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>the directory</source>
         <translation>каталог</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>the symlink</source>
         <translation>ссылку</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete %1</source>
         <translation>Удалить %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Are you sure you wish to delete %1 &quot;%2&quot;?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Вы действительно хотите удалить %1 &quot;%2&quot;?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>New Folder 1</source>
         <translation>Новая папка 1</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder</source>
         <translation>Новая папка</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder %1</source>
         <translation>Новая папка %1</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>Find Directory</source>
         <translation>Найти каталог</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+108"/>
         <source>Directories</source>
         <translation>Каталоги</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Directory:</source>
         <translation>Каталог:</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+1009"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location line="-1008"/>
         <source>%1
 File not found.
 Check path and filename.</source>
@@ -927,17 +731,14 @@ Check path and filename.</source>
 Проверьте правильность пути и имени файла.</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="-191"/>
         <source>All Files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location line="+264"/>
         <source>Open </source>
         <translation>Открыть </translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Select a Directory</source>
         <translation>Выбрать каталог</translation>
     </message>
@@ -945,29 +746,24 @@ Check path and filename.</source>
 <context>
     <name>Q3LocalFs</name>
     <message>
-        <location filename="../src/qt3support/network/q3localfs.cpp" line="+130"/>
-        <location line="+10"/>
         <source>Could not read directory
 %1</source>
         <translation>Не удалось прочитать каталог
 %1</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Could not create directory
 %1</source>
         <translation>Не удалось создать каталог
 %1</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Could not remove file or directory
 %1</source>
         <translation>Не удалось удалить файл или каталог
 %1</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Could not rename
 %1
 to
@@ -978,14 +774,12 @@ to
 %2</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Could not open
 %1</source>
         <translation>Не удалось открыть
 %1</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Could not write
 %1</source>
         <translation>Не удалось записать
@@ -995,12 +789,10 @@ to
 <context>
     <name>Q3MainWindow</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3mainwindow.cpp" line="+2051"/>
         <source>Line up</source>
         <translation>Выровнять</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Customize...</source>
         <translation>Настроить...</translation>
     </message>
@@ -1008,7 +800,6 @@ to
 <context>
     <name>Q3NetworkProtocol</name>
     <message>
-        <location filename="../src/qt3support/network/q3networkprotocol.cpp" line="+854"/>
         <source>Operation stopped by the user</source>
         <translation>Операция остановлена пользователем</translation>
     </message>
@@ -1016,8 +807,6 @@ to
 <context>
     <name>Q3ProgressDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3progressdialog.cpp" line="+224"/>
-        <location line="+61"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -1025,28 +814,22 @@ to
 <context>
     <name>Q3TabDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3tabdialog.cpp" line="+190"/>
-        <location line="+824"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location line="-366"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -1054,38 +837,30 @@ to
 <context>
     <name>Q3TextEdit</name>
     <message>
-        <location filename="../src/qt3support/text/q3textedit.cpp" line="+5429"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить действие</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Redo</source>
         <translation>&amp;Повторить действие</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Paste</source>
         <translation>В&amp;ставить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+2"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
@@ -1093,67 +868,54 @@ to
 <context>
     <name>Q3TitleBar</name>
     <message>
-        <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+246"/>
         <source>System</source>
         <translation>Системное меню</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore up</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore down</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maximize</source>
         <translation>Распахнуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Contains commands to manipulate the window</source>
         <translation>Содержит команды управления окном</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Puts a minimized window back to normal</source>
         <translation>Возвращает свёрнутое окно в нормальное состояние</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Moves the window out of the way</source>
         <translation>Сворачивает окно</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Puts a maximized window back to normal</source>
         <translation>Возвращает распахнутое окно в нормальное состояние</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Makes the window full screen</source>
         <translation>Разворачивает окно на весь экран</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Closes the window</source>
         <translation>Зыкрывает окно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Displays the name of the window and contains controls to manipulate it</source>
         <translation>Отображает название окна и содержит команды управления им</translation>
     </message>
@@ -1161,7 +923,6 @@ to
 <context>
     <name>Q3ToolBar</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3toolbar.cpp" line="+692"/>
         <source>More...</source>
         <translation>Больше...</translation>
     </message>
@@ -1169,51 +930,38 @@ to
 <context>
     <name>Q3UrlOperator</name>
     <message>
-        <location filename="../src/qt3support/network/q3urloperator.cpp" line="+386"/>
-        <location line="+260"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; is not supported</source>
         <translation>Протокол &quot;%1&quot; не поддерживается</translation>
     </message>
     <message>
-        <location line="-260"/>
         <source>The protocol `%1&apos; does not support listing directories</source>
         <translation>Протокол &quot;%1&quot; не поддерживает просмотр каталогов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support creating new directories</source>
         <translation>Протокол &quot;%1&quot; не поддерживает создание каталогов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support removing files or directories</source>
         <translation>Протокол &quot;%1&quot; не поддерживает удаление файлов или каталогов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support renaming files or directories</source>
         <translation>Протокол &quot;%1&quot; не поддерживает переименование файлов или каталогов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support getting files</source>
         <translation>Протокол &quot;%1&quot; не поддерживает доставку файлов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support putting files</source>
         <translation>Протокол &quot;%1&quot; не поддерживает отправку файлов</translation>
     </message>
     <message>
-        <location line="+243"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
         <translation>Протокол &quot;%1&quot; не поддерживает копирование или перемещение файлов или каталогов</translation>
     </message>
     <message>
-        <location line="+237"/>
-        <location line="+1"/>
         <source>(unknown)</source>
         <translation>(неизвестно)</translation>
     </message>
@@ -1221,27 +969,22 @@ to
 <context>
     <name>Q3Wizard</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3wizard.cpp" line="+177"/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Назад</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Далее &gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Finish</source>
         <translation>&amp;Завершить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
@@ -1249,45 +992,30 @@ to
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+629"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+661"/>
-        <location line="+26"/>
         <source>Host not found</source>
         <translation>Узел не найден</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+3"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+4"/>
         <source>Connection refused</source>
         <translation>Отказано в соединении</translation>
     </message>
     <message>
-        <location line="+142"/>
         <source>Connection timed out</source>
         <translation>Время на соединение истекло</translation>
     </message>
     <message>
-        <location line="-559"/>
-        <location line="+809"/>
-        <location line="+220"/>
         <source>Operation on socket is not supported</source>
         <translation>Операция с сокетом не поддерживается</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+625"/>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+203"/>
         <source>Socket operation timed out</source>
         <translation>Время на операцию с сокетом истекло</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+380"/>
         <source>Socket is not connected</source>
         <translation>Сокет не подключён</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-8"/>
         <source>Network unreachable</source>
         <translation>Сеть недоступна</translation>
     </message>
@@ -1295,17 +1023,14 @@ to
 <context>
     <name>QAbstractSpinBox</name>
     <message>
-        <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1263"/>
         <source>&amp;Step up</source>
         <translation>Шаг вв&amp;ерх</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Step &amp;down</source>
         <translation>Шаг вн&amp;из</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Select All</source>
         <translation>&amp;Выделить всё</translation>
     </message>
@@ -1313,7 +1038,6 @@ to
 <context>
     <name>QAccessibleButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+250"/>
         <source>Press</source>
         <translation>Нажать</translation>
     </message>
@@ -1321,27 +1045,22 @@ to
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="+354"/>
         <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
         <translation>Программный модуль &quot;%1&quot; требует Qt %2, найдена версия %3.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Incompatible Qt Library Error</source>
         <translation>Ошибка совместимости библиотеки Qt</translation>
     </message>
     <message>
-        <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+376"/>
         <source>Activate</source>
         <translation>Активировать</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Activates the program&apos;s main window</source>
         <translation>Активирует главное окно программы</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 +1069,18 @@ to
 <context>
     <name>QAxSelect</name>
     <message>
-        <location filename="../src/activeqt/container/qaxselect.ui"/>
         <source>Select ActiveX Control</source>
         <translation>Выбор компоненты ActiveX</translation>
     </message>
     <message>
-        <location/>
         <source>OK</source>
         <translation>Выбрать</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
     <message>
-        <location/>
         <source>COM &amp;Object:</source>
         <translation>&amp;Объект COM:</translation>
     </message>
@@ -1373,17 +1088,14 @@ to
 <context>
     <name>QCheckBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-136"/>
         <source>Uncheck</source>
         <translation>Снять отметку</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Check</source>
         <translation>Отметить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Toggle</source>
         <translation>Переключить</translation>
     </message>
@@ -1391,57 +1103,46 @@ to
 <context>
     <name>QColorDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1378"/>
         <source>Hu&amp;e:</source>
         <translation>&amp;Тон:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Sat:</source>
         <translation>&amp;Нас:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Val:</source>
         <translation>&amp;Ярк:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Red:</source>
         <translation>&amp;Красный:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Green:</source>
         <translation>&amp;Зелёный:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bl&amp;ue:</source>
         <translation>С&amp;иний:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A&amp;lpha channel:</source>
         <translation>&amp;Альфа-канал:</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Select Color</source>
         <translation>Выбор цвета</translation>
     </message>
     <message>
-        <location line="+183"/>
         <source>&amp;Basic colors</source>
         <translation>&amp;Основные цвета</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Custom colors</source>
         <translation>&amp;Пользовательские цвета</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Add to Custom Colors</source>
         <translation>&amp;Добавить к пользовательским цветам</translation>
     </message>
@@ -1449,23 +1150,18 @@ to
 <context>
     <name>QComboBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+1772"/>
-        <location line="+65"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+556"/>
         <source>False</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>True</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+0"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1473,43 +1169,36 @@ to
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="+119"/>
         <source>%1: key is empty</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: пустой ключ</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: unable to make key</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: невозможно создать ключ</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1: ftok failed</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: ошибка ftok</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_symbian.cpp" line="+65"/>
         <source>%1: already exists</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: уже существует</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: does not exist</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: не существует</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1: out of resources</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: недостаточно ресурсов</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: unknown error %2</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: неизвестная ошибка %2</translation>
@@ -1518,22 +1207,18 @@ to
 <context>
     <name>QDB2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1253"/>
         <source>Unable to connect</source>
         <translation>Невозможно соединиться</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to set autocommit</source>
         <translation>Невозможно установить автозавершение транзакций</translation>
     </message>
@@ -1541,33 +1226,26 @@ to
 <context>
     <name>QDB2Result</name>
     <message>
-        <location line="-1030"/>
-        <location line="+240"/>
         <source>Unable to execute statement</source>
         <translation>Невозможно выполнить выражение</translation>
     </message>
     <message>
-        <location line="-203"/>
         <source>Unable to prepare statement</source>
         <translation>Невозможно подготовить выражение</translation>
     </message>
     <message>
-        <location line="+193"/>
         <source>Unable to bind variable</source>
         <translation>Невозможно привязать значение</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Unable to fetch record %1</source>
         <translation>Невозможно получить запись %1</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch next</source>
         <translation>Невозможно получить следующую строку</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Unable to fetch first</source>
         <translation>Невозможно получить первую строку</translation>
     </message>
@@ -1575,22 +1253,18 @@ to
 <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 +1272,14 @@ to
 <context>
     <name>QDeclarativeAbstractAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+166"/>
         <source>Cannot animate non-existent property &quot;%1&quot;</source>
         <translation>Невозможно анимировать несуществуещее свойство &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot animate read-only property &quot;%1&quot;</source>
         <translation>Невозможно анимировать свойство только для чтения &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+122"/>
         <source>Animation is an abstract class</source>
         <translation>Animation - это абстрактный класс</translation>
     </message>
@@ -1616,7 +1287,6 @@ to
 <context>
     <name>QDeclarativeAnchorAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+2553"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Невозможно установить длительность &lt; 0</translation>
     </message>
@@ -1624,67 +1294,50 @@ to
 <context>
     <name>QDeclarativeAnchors</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeanchors.cpp" line="+180"/>
         <source>Possible anchor loop detected on fill.</source>
         <translation type="unfinished">Обнаружена возможная цикличная привязка на fill.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Possible anchor loop detected on centerIn.</source>
         <translation type="unfinished">Обнаружена возможная цикличная привязка на centerIn.</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 type="unfinished">Невозможно установить привязку к элементу, не являющемуся родителем или соседом.</translation>
     </message>
     <message>
-        <location line="-534"/>
         <source>Possible anchor loop detected on vertical anchor.</source>
         <translation type="unfinished">Обнаружена возможная цикличная привязка к вертикальной привязке.</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Possible anchor loop detected on horizontal anchor.</source>
         <translation type="unfinished">Обнаружена возможная цикличная привязка к горизонтальной привязке.</translation>
     </message>
     <message>
-        <location line="+422"/>
         <source>Cannot specify left, right, and hcenter anchors.</source>
         <translation type="unfinished">Невозможно задать левую, правую и среднюю привязки.</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+37"/>
         <source>Cannot anchor to a null item.</source>
         <translation type="unfinished">Невозможно привязаться к нулевому элементу.</translation>
     </message>
     <message>
-        <location line="-34"/>
         <source>Cannot anchor a horizontal edge to a vertical edge.</source>
         <translation type="unfinished">Невозможно привязать горизонтальный край к вертикальному.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+37"/>
         <source>Cannot anchor item to self.</source>
         <translation type="unfinished">Невозможно привязать элемент к самому себе.</translation>
     </message>
     <message>
-        <location line="-25"/>
         <source>Cannot specify top, bottom, and vcenter anchors.</source>
         <translation type="unfinished">Невозможно задать верхнюю, нижнюю и среднюю привязки.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.</source>
         <translation type="unfinished">Невозможно использовать базовую привязку вместе с верхней, нижней и центральной по вертикали.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot anchor a vertical edge to a horizontal edge.</source>
         <translation type="unfinished">Невозможно привязать вертикальный край к горизонтальному.</translation>
     </message>
@@ -1692,7 +1345,6 @@ to
 <context>
     <name>QDeclarativeAnimatedImage</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+86"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt было собрано без поддержки QMovie</translation>
     </message>
@@ -1700,7 +1352,6 @@ to
 <context>
     <name>QDeclarativeBehavior</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativebehavior.cpp" line="+127"/>
         <source>Cannot change the animation assigned to a Behavior.</source>
         <translation type="unfinished">Невозможно изменить анимацию, назначенную поведению.</translation>
     </message>
@@ -1708,7 +1359,6 @@ to
 <context>
     <name>QDeclarativeBinding</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativebinding.cpp" line="+238"/>
         <source>Binding loop detected for property &quot;%1&quot;</source>
         <translation type="unfinished">Обнаружена цикличная привязка для свойства &quot;%1&quot;</translation>
     </message>
@@ -1716,7 +1366,6 @@ to
 <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 type="unfinished">Обнаружена цикличная привязка для свойства &quot;%1&quot;</translation>
     </message>
@@ -1724,381 +1373,303 @@ to
 <context>
     <name>QDeclarativeCompiler</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecompiler.cpp" line="+186"/>
-        <location line="+1592"/>
-        <location line="+186"/>
-        <location line="+81"/>
-        <location line="+75"/>
-        <location line="+487"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Некорректное присваивание свойства: &quot;%1&quot; свойство только для чтения</translation>
     </message>
     <message>
-        <location line="-2412"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Некорректное присваивание свойства: неизвестное перечисление</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: string expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;string&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid property assignment: url expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;url&quot;</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Invalid property assignment: unsigned int expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;unsigned int&quot;</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Invalid property assignment: int expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;int&quot;</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Invalid property assignment: float expected</source>
-        <translation>Некорректное присваивание свойства: ожидается значение типа &quot;float&quot;</translation>
+        <source>Invalid property assignment: number expected</source>
+        <translation>Некорректное присваивание свойства: ожидается число</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Invalid property assignment: double expected</source>
-        <translation>Некорректное присваивание свойства: ожидается значение типа &quot;double&quot;</translation>
-    </message>
-    <message>
-        <location line="+6"/>
         <source>Invalid property assignment: color expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;color&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: date expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;date&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: time expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;time&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: datetime expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;datetime&quot;</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: point expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;point&quot;</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: size expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;size&quot;</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Invalid property assignment: rect expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;rect&quot;</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Invalid property assignment: boolean expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение булевого типа</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid property assignment: 3D vector expected</source>
         <translation>Некорректное присваивание свойства: ожидается значение типа &quot;трёхмерный вектор&quot;</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Invalid property assignment: unsupported type &quot;%1&quot;</source>
         <translation>Некорректное присваивание свойства: неподдерживаемый тип &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+275"/>
         <source>Element is not creatable.</source>
         <translation>Элемент не является создаваемым.</translation>
     </message>
     <message>
-        <location line="+618"/>
         <source>Component elements may not contain properties other than id</source>
         <translation type="unfinished">Элементы Component не могут содержать свойств кроме id</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Invalid component id specification</source>
         <translation type="unfinished">Некорректная спецификация id компонента</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+478"/>
         <source>id is not unique</source>
         <translation>id не уникален</translation>
     </message>
     <message>
-        <location line="-468"/>
         <source>Invalid component body specification</source>
         <translation type="unfinished">Некорректная спецификация тела компонента</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Component objects cannot declare new properties.</source>
         <translation type="unfinished">Объекты Component не могут объявлять новые свойства.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Component objects cannot declare new signals.</source>
         <translation type="unfinished">Объекты Component не могут объявлять новые сигналы.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Component objects cannot declare new functions.</source>
         <translation type="unfinished">Объекты Component не могут объявлять новые функции.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cannot create empty component specification</source>
         <translation type="unfinished">Невозможно создать пустую спецификацю компонента</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Incorrectly specified signal assignment</source>
         <translation type="unfinished">Неверно указано назначение сигнала</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Cannot assign a value to a signal (expecting a script to be run)</source>
         <translation type="unfinished">Невозможно назначить значение сигналу (сценарий должен быть запущен)</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Empty signal assignment</source>
         <translation type="unfinished">Пустое назначение сигнала</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Empty property assignment</source>
         <translation type="unfinished">Пустое назначение свойства</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Attached properties cannot be used here</source>
         <translatorcomment>здесь - в данном контексте?</translatorcomment>
         <translation type="unfinished">Прикреплённые свойства не могут быть использованы здесь</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <location line="+102"/>
         <source>Non-existent attached object</source>
         <translation type="unfinished">Несуществующий прикреплённый объект</translation>
     </message>
     <message>
-        <location line="-98"/>
-        <location line="+101"/>
         <source>Invalid attached object assignment</source>
         <translation type="unfinished">Некорректное назначение прикреплённого объекта</translation>
     </message>
     <message>
-        <location line="-48"/>
         <source>Cannot assign to non-existent default property</source>
         <translation type="unfinished">Невозможно назначить несуществующему свойству по умолчанию</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+352"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
         <translation type="unfinished">Невозможно назначить несуществующему свойству &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="-322"/>
         <source>Invalid use of namespace</source>
         <translation>Некорректное использование пространства имён</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Not an attached property name</source>
         <translation type="unfinished">Не является именем привязанного свойства</translation>
     </message>
     <message>
-        <location line="+182"/>
         <source>Invalid use of id property</source>
         <translation type="unfinished">Некорректное использование свойства id</translation>
     </message>
     <message>
-        <location line="+89"/>
-        <location line="+2"/>
         <source>Property has already been assigned a value</source>
         <translation type="unfinished">Свойству уже назначено значение</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+7"/>
         <source>Invalid grouped property access</source>
         <translation type="unfinished">Некорректный доступ к сгруппированному свойству</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot assign a value directly to a grouped property</source>
         <translation type="unfinished">Невозможно присвоить значение непосредственно сгруппированному свойству</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Invalid property use</source>
         <translation>Некорректное использование свойства</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Property assignment expected</source>
         <translation type="unfinished">Ожидается назначение свойства</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Single property assignment expected</source>
         <translation type="unfinished">Ожидается одиночное назначение свойства</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unexpected object assignment</source>
         <translation type="unfinished">Неожиданное назначение объекта</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Cannot assign object to list</source>
         <translation type="unfinished">Невозможно назначить объект списку</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Can only assign one binding to lists</source>
         <translation type="unfinished">Можно назначить только одну связь для списка</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot assign primitives to lists</source>
         <translation type="unfinished">Невозможно назначить примитивы списку</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot assign multiple values to a script property</source>
         <translation type="unfinished">Невозможно назначить множественное значение свойству сценария</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid property assignment: script expected</source>
         <translation type="unfinished">Некорректное присваивание свойства: ожидается сценарий</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>Cannot assign object to property</source>
         <translation type="unfinished">Невозможно назначить объектсвойству</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>&quot;%1&quot; cannot operate on &quot;%2&quot;</source>
         <translation>&quot;%1&quot; не может воздействовать на &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+117"/>
         <source>Duplicate default property</source>
         <translation type="unfinished">Дублирование свойства по умолчанию</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Duplicate property name</source>
         <translation type="unfinished">Дублирование названия свойства</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Property names cannot begin with an upper case letter</source>
         <translation>Названия свойств не могут начинаться с заглавной буквы</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <source>Illegal property name</source>
+        <translation>Недопустимое название свойства</translation>
+    </message>
+    <message>
         <source>Duplicate signal name</source>
         <translation type="unfinished">Дублирование названия сигнала</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Signal names cannot begin with an upper case letter</source>
         <translation>Названия сигналов не могут начинаться с заглавной буквы</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <source>Illegal signal name</source>
+        <translation>Недопустимое название сигнала</translation>
+    </message>
+    <message>
         <source>Duplicate method name</source>
         <translation type="unfinished">Дублирование название метода</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Method names cannot begin with an upper case letter</source>
         <translation>Названия методов не могут начинаться с заглавной буквы</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <source>Illegal method name</source>
+        <translation>Недопустимое название метода</translation>
+    </message>
+    <message>
         <source>Property value set multiple times</source>
         <translation type="unfinished">Значение свойства задано несколько раз</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invalid property nesting</source>
         <translation type="unfinished">Некорректное вложенность свойств</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Cannot override FINAL property</source>
         <translation>Невозможно переопределить свойство FINAL</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Invalid property type</source>
         <translation>Некорректный тип свойства</translation>
     </message>
     <message>
-        <location line="+159"/>
         <source>Invalid empty ID</source>
         <translation>Некорректный пустой идентификатор</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>IDs cannot start with an uppercase letter</source>
         <translation>Идентификаторы не могут начинаться с заглавной буквы</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>IDs must start with a letter or underscore</source>
         <translation>Идентификаторы должны начинаться с буквы или подчёркивания</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>IDs must contain only letters, numbers, and underscores</source>
         <translation>Идентификаторы должны содержать только буквы, цифры и подчёркивания</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>ID illegally masks global JavaScript property</source>
         <translation type="unfinished">Идентификатор неверно маскирует глобальное свойство JavaScript</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 type="unfinished">Некорректное размещение псевдонима</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 type="unfinished">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как &lt;id&gt; или &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 type="unfinished">Некорректная ссылка на псевдоним. Не удалось найти id &quot;%1&quot;</translation>
     </message>
@@ -2106,7 +1677,6 @@ to
 <context>
     <name>QDeclarativeComponent</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecomponent.cpp" line="+459"/>
         <source>Invalid empty URL</source>
         <translation>Пустой адрес URL</translation>
     </message>
@@ -2114,23 +1684,18 @@ to
 <context>
     <name>QDeclarativeCompositeTypeManager</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecompositetypemanager.cpp" line="+475"/>
-        <location line="+266"/>
         <source>Resource %1 unavailable</source>
         <translation>Ресурс &quot;%1&quot; недоступен</translation>
     </message>
     <message>
-        <location line="-122"/>
         <source>Namespace %1 cannot be used as a type</source>
         <translation>Пространство имён &quot;%1&quot; не может быть использовано в качестве типа</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>Тип &quot;%1&quot; недоступен</translation>
     </message>
@@ -2138,23 +1703,18 @@ to
 <context>
     <name>QDeclarativeConnections</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeconnections.cpp" line="+209"/>
-        <location line="+60"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
         <translation type="unfinished">Невозможно назначить несуществующему свойству &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="-50"/>
         <source>Connections: nested objects not allowed</source>
         <translation>Подключения: вложенные объекты недопустимы</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connections: syntax error</source>
         <translation>Подключения: синтаксическая ошибка</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Connections: script expected</source>
         <translation>Подключения: ожидается сценарий</translation>
     </message>
@@ -2162,33 +1722,26 @@ to
 <context>
     <name>QDeclarativeEngine</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+204"/>
         <source>executeSql called outside transaction()</source>
         <translation>executeSql() вызван вне transaction()</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Read-only Transaction</source>
         <translation>Транзакция только для чтения</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Version mismatch: expected %1, found %2</source>
         <translation>Несовпадение версий: ожидалась %1, найдена %2</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>SQL transaction failed</source>
         <translation>Не удалось выполнить транзакцию SQL</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>transaction: missing callback</source>
         <translation>транзакция: отсутствует обратный вызов</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+16"/>
         <source>SQL: database version mismatch</source>
         <translation>Не совпадает версия базы данных SQL</translation>
     </message>
@@ -2196,12 +1749,10 @@ to
 <context>
     <name>QDeclarativeFlipable</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+127"/>
         <source>front is a write-once property</source>
         <translation>front - свойство для однократной записи</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>back is a write-once property</source>
         <translation>back - свойство для однократной записи</translation>
     </message>
@@ -2209,75 +1760,58 @@ to
 <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 type="unfinished">невозможно прочитать определение &quot;%2&quot; модуля &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>plugin cannot be loaded for module &quot;%1&quot;: %2</source>
         <translation type="unfinished">модуль не может быть загружен для подмодуля &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>module &quot;%1&quot; plugin &quot;%2&quot; not found</source>
         <translation type="unfinished">подмодуль &quot;%1&quot; модуля &quot;%2&quot; не найден</translation>
     </message>
     <message>
-        <location line="+79"/>
-        <location line="+55"/>
         <source>module &quot;%1&quot; version %2.%3 is not installed</source>
         <translation>модуль &quot;%1&quot; версии %2.%3 не установлен</translation>
     </message>
     <message>
-        <location line="-53"/>
         <source>module &quot;%1&quot; is not installed</source>
         <translation>модуль &quot;%1&quot; не установлен</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+19"/>
         <source>&quot;%1&quot;: no such directory</source>
         <translation>&quot;%1&quot;: каталог не существует</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>import &quot;%1&quot; has no qmldir and no namespace</source>
         <translation type="unfinished">каталог &quot;%1&quot; не содержит ни qmldir, ни namespace</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>- %1 is not a namespace</source>
         <translation>- %1 - некорректное пространство имён</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>- nested namespaces not allowed</source>
         <translation>- вложенные пространства имён недопустимы</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+4"/>
         <source>local directory</source>
         <translation>локальный каталог</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>is ambiguous. Found in %1 and in %2</source>
         <translation>неоднозначно. Найдено в %1 и %2</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source>
         <translation>неоднозначно. Найдено в %1 версий %2.%3 и %4.%5</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>is instantiated recursively</source>
         <translation>обрабатывается рекурсивно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>is not a type</source>
         <translation>не является типом</translation>
     </message>
@@ -2285,7 +1819,6 @@ to
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+66"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished">KeyNavigation доступна только через прикреплённые свойства</translation>
     </message>
@@ -2293,7 +1826,6 @@ to
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished">Keys доступны только через прикреплённые свойства</translation>
     </message>
@@ -2301,59 +1833,46 @@ to
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+399"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: индекс %1 вне диапазона</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>insert: value is not an object</source>
         <translation>insert: значение не является объектом</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>insert: index %1 out of range</source>
         <translation>insert: индекс %1 вне диапазона</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>move: out of range</source>
         <translation>move: индекс вне диапазона</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>append: value is not an object</source>
         <translation>append: значение не является объектом</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>set: value is not an object</source>
         <translation>set: значение не является объектом</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+34"/>
         <source>set: index %1 out of range</source>
         <translation>set: индекс %1 вне диапазона</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+15"/>
         <source>ListElement: cannot contain nested elements</source>
         <translation>ListElement: не может содержать вложенные элементы</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>ListElement: cannot use reserved &quot;id&quot; property</source>
         <translation>ListElement: невозможно использовать зарезервированное свойство &quot;id&quot;</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>ListElement: cannot use script for property value</source>
         <translation>ListElement: невозможно использовать сценарий в качестве значения свойства</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>ListModel: undefined property &apos;%1&apos;</source>
         <translation>ListModel: неопределённое свойство &quot;%1&quot;</translation>
     </message>
@@ -2361,7 +1880,6 @@ to
 <context>
     <name>QDeclarativeLoader</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeloader.cpp" line="+313"/>
         <source>Loader does not support loading non-visual elements.</source>
         <translation>Загрузчик не поддерживает загрузку невизуальных элементов.</translation>
     </message>
@@ -2369,18 +1887,14 @@ to
 <context>
     <name>QDeclarativeParentAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="-169"/>
         <source>Unable to preserve appearance under complex transform</source>
         <translation>Невозможно сохранить внешний вид при сложном преобразовании</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
         <source>Unable to preserve appearance under non-uniform scale</source>
         <translation>Невозможно сохранить внешний вид при неоднородном масштабе</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Unable to preserve appearance under scale of 0</source>
         <translation>Невозможно сохранить внешний вид при масштабе 0</translation>
     </message>
@@ -2388,18 +1902,14 @@ to
 <context>
     <name>QDeclarativeParentChange</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativestateoperations.cpp" line="+95"/>
         <source>Unable to preserve appearance under complex transform</source>
         <translation>Невозможно сохранить внешний вид при сложном преобразовании</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
         <source>Unable to preserve appearance under non-uniform scale</source>
         <translation>Невозможно сохранить внешний вид при неоднородном масштабе</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Unable to preserve appearance under scale of 0</source>
         <translation>Невозможно сохранить внешний вид при масштабе 0</translation>
     </message>
@@ -2407,144 +1917,110 @@ to
 <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">Неверная unicode esc-последовательность</translation>
     </message>
     <message>
-        <location line="-140"/>
         <source>Illegal character</source>
         <translation>Недопустимый символ</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Unclosed string at end of line</source>
         <translation>Незакрытый текст в конце строки</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Illegal escape squence</source>
         <translation type="unfinished">Неверная esc-последовательность</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Unclosed comment at end of file</source>
         <translation>Незакрытый комментарий в конце строки</translation>
     </message>
     <message>
-        <location line="+102"/>
         <source>Illegal syntax for exponential number</source>
         <translation type="unfinished">Недопустимый синтаксис для экспоненциального числа</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Identifier cannot start with numeric literal</source>
         <translation>Идентификатор не может начинаться с цифры</translation>
     </message>
     <message>
-        <location line="+338"/>
         <source>Unterminated regular expression literal</source>
         <translation>Незаконченный литерал регулярного выражения</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Invalid regular expression flag &apos;%0&apos;</source>
         <translation>Некорректный флаг &quot;%0&quot; в регулярном выражении</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+22"/>
         <source>Unterminated regular expression backslash sequence</source>
         <translation>Регулярное выражение содержит незавершённую экранированную последовательность</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unterminated regular expression class</source>
         <translation>Регулярное выражение содержит незавершённый класс</translation>
     </message>
     <message>
-        <location filename="../src/declarative/qml/parser/qdeclarativejsparser.cpp" line="+1828"/>
-        <location line="+67"/>
         <source>Syntax error</source>
         <translation>Синтаксическая ошибка</translation>
     </message>
     <message>
-        <location line="-65"/>
         <source>Unexpected token `%1&apos;</source>
         <translation>Неожиданный символ &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+24"/>
         <source>Expected token `%1&apos;</source>
         <translation>Ожидается символ &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 type="unfinished">Значение свойства установлено несколько раз</translation>
     </message>
     <message>
-        <location line="-479"/>
         <source>Expected type name</source>
         <translation>Ожидается название типа</translation>
     </message>
     <message>
-        <location line="+136"/>
         <source>Invalid import qualifier ID</source>
         <translation type="unfinished">Некорректный ID спецификатора импорта</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
         <translation type="unfinished">Зарезервированное имя &quot;Qt&quot; не может быть использовано в качестве спецификатора</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Script import qualifiers must be unique.</source>
         <translation type="unfinished">Спецификаторы импорта сценария должны быть уникальными.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Script import requires a qualifier</source>
         <translation type="unfinished">Для импорта сценария требуется спецификатор</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Library import requires a version</source>
         <translation type="unfinished">Импорт библиотеки требует версию</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Expected parameter type</source>
         <translation>Ожидается тип параметра</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Invalid property type modifier</source>
         <translation>Некорректный модификатор типа свойства</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unexpected property type modifier</source>
         <translation>Неожиданный модификатор типа свойства</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Expected property type</source>
         <translation>Ожидается тип свойства</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Readonly not yet supported</source>
         <translation type="unfinished">Readonly ещё не поддерживается</translation>
     </message>
     <message>
-        <location line="+215"/>
         <source>JavaScript declaration outside Script element</source>
         <translation>Определение JavaScript вне элемента Script</translation>
     </message>
@@ -2552,39 +2028,28 @@ to
 <context>
     <name>QDeclarativePauseAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="-1977"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Невозможно установить длительность &lt; 0</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativePixmapCache</name>
+    <name>QDeclarativePixmap</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativepixmapcache.cpp" line="+190"/>
         <source>Error decoding: %1: %2</source>
         <translation>Ошибка декодирования: %1: %2</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Failed to get image from provider: %1</source>
-        <translation>Не удалось получить изображение от поставщика: %1</translation>
+        <translation>Не удалось получить изображение от постащика изображений: %1</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location line="+345"/>
         <source>Cannot open: %1</source>
         <translation>Не удалось открыть: %1</translation>
     </message>
-    <message>
-        <location line="+37"/>
-        <source>Unknown Error loading %1</source>
-        <translation>Неизвестная ошибка загрузки %1</translation>
-    </message>
 </context>
 <context>
     <name>QDeclarativePropertyAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+1102"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Невозможно установить длительность &lt; 0</translation>
     </message>
@@ -2592,17 +2057,14 @@ to
 <context>
     <name>QDeclarativePropertyChanges</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativepropertychanges.cpp" line="+252"/>
         <source>PropertyChanges does not support creating state-specific objects.</source>
         <translation type="unfinished">PropertyChanges не поддерживают создание объектов, зависимых от состояния.</translation>
     </message>
     <message>
-        <location line="+157"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
         <translation type="unfinished">Невозможно назначить несуществующему свойству &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot assign to read-only property &quot;%1&quot;</source>
         <translation type="unfinished">Невозможно назначить свойству только для чтения &quot;%1&quot;</translation>
     </message>
@@ -2610,13 +2072,10 @@ to
 <context>
     <name>QDeclarativeTextInput</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativetextinput.cpp" line="+798"/>
-        <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>
@@ -2624,47 +2083,38 @@ to
 <context>
     <name>QDeclarativeVME</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativevme.cpp" line="+194"/>
         <source>Unable to create object of type %1</source>
         <translation>Невозможно создать объект типа &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+390"/>
         <source>Cannot assign value %1 to property %2</source>
         <translation>Невозможно установить значение &quot;%1&quot; свойству &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Cannot assign object type %1 with no default method</source>
         <translation type="unfinished">Невозможно назначить объект типа %1 без метода по умолчанию</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cannot connect mismatched signal/slot %1 %vs. %2</source>
         <translation type="unfinished">Невозможно подключить отсутствующий сигнал/слот %1 к %2</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cannot assign an object to signal property %1</source>
         <translation type="unfinished">Невозможно назначить объект к свойству сигнала %1</translation>
     </message>
     <message>
-        <location line="+146"/>
         <source>Cannot assign object to list</source>
         <translation type="unfinished">Невозможно назначить объект списку</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 type="unfinished">Не удалось создать вложенный объект</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Cannot set properties on %1 as it is null</source>
         <translation type="unfinished">Невозможно установить свойства для %1, так как он нулевой</translation>
     </message>
@@ -2672,7 +2122,6 @@ to
 <context>
     <name>QDeclarativeVisualDataModel</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp" line="+1088"/>
         <source>Delegate component must be Item type.</source>
         <translation type="unfinished">Компинент делегата должен быть типа Item.</translation>
     </message>
@@ -2680,8 +2129,6 @@ to
 <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 было собрано без поддержки xmlpatterns</translation>
     </message>
@@ -2689,7 +2136,6 @@ to
 <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 type="unfinished">Запрос XmlRole не должен начинаться с &apos;/&apos;</translation>
     </message>
@@ -2697,7 +2143,6 @@ to
 <context>
     <name>QDeclarativeXmlRoleList</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+712"/>
         <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
         <translation type="unfinished">Запрос XmlListModel должен начинаться с &apos;/&apos; или &quot;//&quot;</translation>
     </message>
@@ -2705,17 +2150,14 @@ to
 <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>SpeedoMeter</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>SliderHandle</source>
         <translation>SliderHandle</translation>
     </message>
@@ -2723,12 +2165,10 @@ to
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qdialog.cpp" line="+645"/>
         <source>What&apos;s This?</source>
         <translation>Что это?</translation>
     </message>
     <message>
-        <location line="-122"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
@@ -2736,124 +2176,98 @@ to
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1920"/>
-        <location line="+464"/>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+649"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+3"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Don&apos;t Save</source>
         <translation>Не сохранять</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Discard</source>
         <translation>Отклонить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Yes to &amp;All</source>
         <translation>Да для &amp;всех</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>N&amp;o to All</source>
         <translation>Н&amp;ет для всех</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Save All</source>
         <translation>Сохранить все</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Retry</source>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ignore</source>
         <translation>Пропустить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore Defaults</source>
         <translation>Восстановить значения</translation>
     </message>
     <message>
-        <location line="-29"/>
         <source>Close without Saving</source>
         <translation>Закрыть без сохранения</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
@@ -2861,29 +2275,24 @@ to
 <context>
     <name>QDirModel</name>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+457"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Вид</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <comment>All other platforms</comment>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Date Modified</source>
         <translation>Дата изменения</translation>
     </message>
@@ -2891,17 +2300,14 @@ to
 <context>
     <name>QDockWidget</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblewidgets.cpp" line="+1239"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock</source>
         <translation type="unfinished">Прикрепить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Float</source>
         <translation type="unfinished">Открепить</translation>
     </message>
@@ -2909,12 +2315,10 @@ to
 <context>
     <name>QDoubleSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-537"/>
         <source>More</source>
         <translation>Больше</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Меньше</translation>
     </message>
@@ -2922,27 +2326,22 @@ to
 <context>
     <name>QErrorMessage</name>
     <message>
-        <location filename="../src/gui/dialogs/qerrormessage.cpp" line="+414"/>
         <source>&amp;Show this message again</source>
         <translation>&amp;Показывать это сообщение в дальнейшем</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;OK</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="-207"/>
         <source>Debug Message:</source>
         <translation>Отладочное сообщение:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Warning:</source>
         <translation>Предупреждение:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Fatal Error:</source>
         <translation>Критическая ошибка:</translation>
     </message>
@@ -2950,38 +2349,30 @@ to
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/corelib/io/qfile.cpp" line="+703"/>
-        <location line="+155"/>
         <source>Destination file exists</source>
         <translation>Файл существует</translation>
     </message>
     <message>
-        <location line="-140"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Последовательный файл не будет переименован с использованием поблочного копирования</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Cannot remove source file</source>
         <translation>Невозможно удалить исходный файл</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>Cannot open %1 for input</source>
         <translation>Невозможно открыть %1 для ввода</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Cannot open for output</source>
         <translation>Невозможно открыть для вывода</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Failure to write block</source>
         <translation>Сбой записи блока</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot create %1 for output</source>
         <translation>Невозможно создать %1 для вывода</translation>
     </message>
@@ -2989,143 +2380,110 @@ to
 <context>
     <name>QFileDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+558"/>
-        <location line="+481"/>
         <source>All Files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>List View</source>
         <translation>Список</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Detail View</source>
         <translation>Подробный вид</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+467"/>
-        <location line="+1"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>File Folder</source>
         <comment>Match Windows Explorer</comment>
         <translation>Папка с файлами</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Folder</source>
         <comment>All other platforms</comment>
         <translation>Папка</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Alias</source>
         <comment>Mac OS X Finder</comment>
         <translation>Псевдоним</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shortcut</source>
         <comment>All other platforms</comment>
         <translation>Ярлык</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-498"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Save As</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location line="+709"/>
-        <location line="+55"/>
-        <location line="+1532"/>
         <source>&amp;Open</source>
         <translation>&amp;Открыть</translation>
     </message>
     <message>
-        <location line="-1587"/>
-        <location line="+55"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="+1381"/>
         <source>&apos;%1&apos; is write protected.
 Do you want to delete it anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; защищён от записи.
+Действительно желаете удалить?</translation>
     </message>
     <message>
-        <location line="+424"/>
         <source>Recent Places</source>
         <translation>Недавние документы</translation>
     </message>
     <message>
-        <location line="-2540"/>
         <source>&amp;Rename</source>
         <translation>&amp;Переименовать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show &amp;hidden files</source>
         <translation>Показать ск&amp;рытые файлы</translation>
     </message>
     <message>
-        <location line="+1986"/>
         <source>New Folder</source>
         <translation>Новая папка</translation>
     </message>
     <message>
-        <location line="-2021"/>
         <source>Find Directory</source>
         <translation>Найти каталог</translation>
     </message>
     <message>
-        <location line="+716"/>
         <source>Directories</source>
         <translation>Каталоги</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog_win.cpp" line="+148"/>
         <source>All Files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-675"/>
-        <location line="+679"/>
         <source>Directory:</source>
         <translation>Каталог:</translation>
     </message>
     <message>
-        <location line="+819"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 уже существует.
 Хотите заменить его?</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1
 File not found.
 Please verify the correct file name was given.</source>
@@ -3134,25 +2492,18 @@ Please verify the correct file name was given.</source>
 Проверьте правильность указанного имени файла.</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+402"/>
         <source>My Computer</source>
         <translation>Мой компьютер</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Parent Directory</source>
         <translation>Родительский каталог</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Files of type:</source>
         <translation>Типы файлов:</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-54"/>
-        <location line="+862"/>
         <source>%1
 Directory not found.
 Please verify the correct directory name was given.</source>
@@ -3161,97 +2512,74 @@ Please verify the correct directory name was given.</source>
 Проверьте правильность указанного имени каталога.</translation>
     </message>
     <message>
-        <location line="-213"/>
         <source>Are sure you want to delete &apos;%1&apos;?</source>
         <translation>Вы действительно хотите удалить &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Could not delete directory.</source>
         <translation>Не удалось удалить каталог.</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="-22"/>
         <source>Drive</source>
         <translation>Диск</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2140"/>
         <source>Show </source>
         <translation>Показать </translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Forward</source>
         <translation>Вперёд</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+7"/>
         <source>&amp;New Folder</source>
         <translation>&amp;Новая папка</translation>
     </message>
     <message>
-        <location line="+687"/>
-        <location line="+43"/>
         <source>&amp;Choose</source>
         <translation>&amp;Выбрать</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qsidebar.cpp" line="+442"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-723"/>
-        <location line="+683"/>
         <source>File &amp;name:</source>
         <translation>&amp;Имя файла:</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Look in:</source>
         <translation>Перейти к:</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Create New Folder</source>
         <translation>Создать папку</translation>
     </message>
     <message>
-        <location/>
         <source>Go back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location/>
         <source>Go forward</source>
         <translation>Вперёд</translation>
     </message>
     <message>
-        <location/>
         <source>Go to the parent directory</source>
         <translation>Перейти в родительский каталог</translation>
     </message>
     <message>
-        <location/>
         <source>Create a New Folder</source>
         <translation>Создать новую папку</translation>
     </message>
     <message>
-        <location/>
         <source>Change to list view mode</source>
         <translation>Переключить в режим списка</translation>
     </message>
     <message>
-        <location/>
         <source>Change to detail view mode</source>
         <translation>Переключить в подробный режим</translation>
     </message>
@@ -3259,83 +2587,64 @@ Please verify the correct directory name was given.</source>
 <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 Тб</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 GB</source>
         <translation>%1 Гб</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 MB</source>
         <translation>%1 Мб</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 KB</source>
         <translation>%1 Кб</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 bytes</source>
         <translation>%1 байт</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Invalid filename</source>
         <translation>Некорректное имя файла</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;Имя &quot;%1&quot; не может быть использовано.&lt;/b&gt;&lt;p&gt;Попробуйте использовать имя меньшей длины и/или без символов пунктуации.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Вид</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <comment>All other platforms</comment>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Date Modified</source>
         <translation>Дата изменения</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+261"/>
         <source>My Computer</source>
         <translation>Мой компьютер</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Computer</source>
         <translation>Компьютер</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+1"/>
         <source>%1 byte(s)</source>
         <translation>%1 байт</translation>
     </message>
@@ -3343,221 +2652,170 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QFontDatabase</name>
     <message>
-        <location filename="../src/gui/text/qfontdatabase.cpp" line="+102"/>
-        <location line="+1342"/>
         <source>Normal</source>
         <translation>Обычный</translation>
     </message>
     <message>
-        <location line="-1339"/>
-        <location line="+12"/>
-        <location line="+1315"/>
         <source>Bold</source>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location line="-1324"/>
-        <location line="+1326"/>
         <source>Demi Bold</source>
         <translation>Полужирный</translation>
     </message>
     <message>
-        <location line="-1323"/>
-        <location line="+18"/>
-        <location line="+1301"/>
         <source>Black</source>
         <translation>Чёрный</translation>
     </message>
     <message>
-        <location line="-1311"/>
         <source>Demi</source>
         <translation>Средний</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+1311"/>
         <source>Light</source>
         <translation>Светлый</translation>
     </message>
     <message>
-        <location line="-1165"/>
-        <location line="+1168"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="-1165"/>
-        <location line="+1167"/>
         <source>Oblique</source>
         <translation>Наклонный</translation>
     </message>
     <message>
-        <location line="+704"/>
         <source>Any</source>
         <translation>Любая</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Latin</source>
         <translation>Латиница</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Greek</source>
         <translation>Греческая</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cyrillic</source>
         <translation>Кириллица</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Armenian</source>
         <translation>Армянская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Hebrew</source>
         <translation>Иврит</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Arabic</source>
         <translation>Арабская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Syriac</source>
         <translation>Сирийская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thaana</source>
         <translation>Таана</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Devanagari</source>
         <translation>Деванагири</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bengali</source>
         <translation>Бенгальская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gurmukhi</source>
         <translation>Гурмукхи</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gujarati</source>
         <translation>Гуджарати</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Oriya</source>
         <translation>Ория</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tamil</source>
         <translation>Тамильская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Telugu</source>
         <translation>Телугу</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Kannada</source>
         <translation>Каннада</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Malayalam</source>
         <translation>Малайялам</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sinhala</source>
         <translation>Сингальская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thai</source>
         <translation>Тайская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lao</source>
         <translation>Лаосская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tibetan</source>
         <translation>Тибетская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Myanmar</source>
         <translation>Мьянма</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Georgian</source>
         <translation>Грузинская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Khmer</source>
         <translation>Кхмерская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Simplified Chinese</source>
         <translation>Китайская упрощённая</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Traditional Chinese</source>
         <translation>Китайская традиционная</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Japanese</source>
         <translation>Японская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Korean</source>
         <translation>Корейская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Vietnamese</source>
         <translation>Вьетнамская</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Symbol</source>
         <translation>Символьная</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ogham</source>
         <translation>Огамическая</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Runic</source>
         <translation>Руническая</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>N&apos;Ko</source>
         <translation>Нко</translation>
     </message>
@@ -3565,47 +2823,38 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QFontDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfontdialog.cpp" line="+768"/>
         <source>&amp;Font</source>
         <translation>&amp;Шрифт</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font st&amp;yle</source>
         <translation>&amp;Начертание</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Размер</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Effects</source>
         <translation>Эффекты</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Stri&amp;keout</source>
         <translation>Зачёр&amp;кнутый</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Underline</source>
         <translation>П&amp;одчёркнутый</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sample</source>
         <translation>Пример</translation>
     </message>
     <message>
-        <location line="-595"/>
         <source>Select Font</source>
         <translation>Выбор шрифта</translation>
     </message>
     <message>
-        <location line="+596"/>
         <source>Wr&amp;iting System</source>
         <translation>&amp;Система письма</translation>
     </message>
@@ -3613,145 +2862,104 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QFtp</name>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+2303"/>
         <source>Host %1 found</source>
         <translation>Узел %1 найден</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Host found</source>
         <translation>Узел найден</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+1008"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1456"/>
-        <location line="+1451"/>
         <source>Connected to host %1</source>
         <translation>Установлено соединение с узлом %1</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+7"/>
         <source>Connected to host</source>
         <translation>Соединение с узлом установлено</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Connection to %1 closed</source>
         <translation>Соединение с %1 закрыто</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+1383"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-243"/>
-        <location line="+250"/>
         <source>Connection closed</source>
         <translation>Соединение закрыто</translation>
     </message>
     <message>
-        <location line="-1495"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1566"/>
         <source>Host %1 not found</source>
         <translation>Узел %1 не найден</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+4"/>
         <source>Connection refused to host %1</source>
         <translation>В соединении с узлом %1 отказано</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection timed out to host %1</source>
         <translation>Время на соединение с узлом %1 истекло</translation>
     </message>
     <message>
-        <location line="+501"/>
-        <location line="+29"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+458"/>
-        <location line="+728"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="+897"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+77"/>
         <source>Connecting to host failed:
 %1</source>
         <translation>Не удалось соединиться с узлом:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Login failed:
 %1</source>
         <translation>Не удалось авторизоваться:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Listing directory failed:
 %1</source>
         <translation>Не удалось прочитать каталог:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Changing directory failed:
 %1</source>
         <translation>Не удалось сменить каталог:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Downloading file failed:
 %1</source>
         <translation>Не удалось загрузить файл:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Uploading file failed:
 %1</source>
         <translation>Не удалось отгрузить файл:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Removing file failed:
 %1</source>
         <translation>Не удалось удалить файл:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Creating directory failed:
 %1</source>
         <translation>Не удалось создать каталог:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Removing directory failed:
 %1</source>
         <translation>Не удалось удалить каталог:
 %1</translation>
     </message>
     <message>
-        <location line="-1535"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1356"/>
         <source>Not connected</source>
         <translation>Соединение не установлено</translation>
     </message>
     <message>
-        <location line="+399"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+332"/>
         <source>Connection refused for data connection</source>
         <translation>Отказ в соединении для передачи данных</translation>
     </message>
@@ -3759,12 +2967,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QHostInfo</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_p.h" line="+103"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location filename="../src/network/kernel/qhostinfo.cpp" line="+171"/>
         <source>No host name given</source>
         <translation>Имя узла не задано</translation>
     </message>
@@ -3772,37 +2978,22 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+260"/>
-        <location line="+32"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+215"/>
-        <location line="+27"/>
         <source>Host not found</source>
         <translation>Узел не найден</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>Неизвестный тип адреса</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-19"/>
-        <location line="+27"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="-98"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-67"/>
         <source>No host name given</source>
         <translation>Имя узла не задано</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+0"/>
         <source>Invalid hostname</source>
         <translation>Некорректное имя узла</translation>
     </message>
@@ -3810,153 +3001,110 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QHttp</name>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-6"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+1835"/>
         <source>Connection refused</source>
         <translation>Отказано в соединении</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="+3"/>
         <source>Host %1 not found</source>
         <translation>Узел %1 не найден</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-45"/>
         <source>Wrong content length</source>
         <translation>Неверная длина содержимого</translation>
     </message>
     <message>
-        <location line="+82"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+48"/>
         <source>HTTP request failed</source>
         <translation>HTTP-запрос не удался</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+450"/>
         <source>Host %1 found</source>
         <translation>Узел %1 найден</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Host found</source>
         <translation>Узел найден</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>Connected to host %1</source>
         <translation>Установлено соединение с узлом %1</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Connected to host</source>
         <translation>Соединение с узлом установлено</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>Connection to %1 closed</source>
         <translation>Соединение с узлом %1 закрыто</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+7"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+14"/>
         <source>Connection closed</source>
         <translation>Соединение закрыто</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-1077"/>
-        <location line="+820"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-1152"/>
-        <location line="+567"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="-568"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-370"/>
         <source>Request aborted</source>
         <translation>Запрос прерван</translation>
     </message>
     <message>
-        <location line="+579"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+381"/>
         <source>No server set to connect to</source>
         <translation>Не указан сервер для подключения</translation>
     </message>
     <message>
-        <location line="+168"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+60"/>
         <source>Server closed connection unexpectedly</source>
         <translation>Сервер неожиданно разорвал соединение</translation>
     </message>
     <message>
-        <location line="+172"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+113"/>
         <source>Invalid HTTP response header</source>
         <translation>Некорректный HTTP-заголовок ответа</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Unknown authentication method</source>
         <translation>Неизвестный метод авторизации</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <location line="+48"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+40"/>
-        <location line="+47"/>
         <source>Invalid HTTP chunked body</source>
         <translation>Некорректное HTTP-фрагментирование данных</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Error writing response to device</source>
         <translation>Ошибка записи ответа на устройство</translation>
     </message>
     <message>
-        <location line="-173"/>
         <source>Proxy authentication required</source>
         <translation>Требуется авторизация на прокси-сервере</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Authentication required</source>
         <translation>Требуется авторизация</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+6"/>
         <source>Proxy requires authentication</source>
         <translation>Прокси-сервер требует авторизацию</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Host requires authentication</source>
         <translation>Узел требует авторизацию</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Data corrupted</source>
         <translation>Данные повреждены</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>SSL handshake failed</source>
         <translation>Квитирование SSL не удалось</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>Unknown protocol specified</source>
         <translation>Указан неизвестный протокол</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-159"/>
         <source>Connection refused (or timed out)</source>
         <translation>В соединении отказано (или время ожидания истекло)</translation>
     </message>
     <message>
-        <location line="-2266"/>
         <source>HTTPS connection requested but SSL support not compiled in</source>
         <translation>Запрошено соединение по протоколу HTTPS, но поддержка SSL не скомпилирована</translation>
     </message>
@@ -3964,47 +3112,38 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QHttpSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="-89"/>
         <source>Did not receive HTTP response from proxy</source>
         <translation>Не получен HTTP-ответ от прокси-сервера</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Error parsing authentication request from proxy</source>
         <translation>Ошибка разбора запроса авторизации от прокси-сервера</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Authentication required</source>
         <translation>Требуется авторизация</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Proxy denied connection</source>
         <translation>Прокси-сервер запретил соединение</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Error communicating with HTTP proxy</source>
         <translation>Ошибка обмена данными с прокси-сервером HTTP</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Proxy server not found</source>
         <translation>Прокси-сервер не найден</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection refused</source>
         <translation>В соединении прокси-сервером отказано</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy server connection timed out</source>
         <translation>Время на соединение с прокси-сервером истекло</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection closed prematurely</source>
         <translation>Соединение с прокси-сервером неожиданно закрыто</translation>
     </message>
@@ -4012,22 +3151,18 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QIBaseDriver</name>
     <message>
-        <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1491"/>
         <source>Error opening database</source>
         <translation>Ошибка открытия базы данных</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Could not start transaction</source>
         <translation>Не удалось начать транзакцию</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
@@ -4035,89 +3170,70 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QIBaseResult</name>
     <message>
-        <location line="-1149"/>
         <source>Unable to create BLOB</source>
         <translation>Невозможно создать BLOB</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to write BLOB</source>
         <translation>Невозможно записать BLOB</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Unable to open BLOB</source>
         <translation>Невозможно открыть BLOB</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Unable to read BLOB</source>
         <translation>Невозможно прочитать BLOB</translation>
     </message>
     <message>
-        <location line="+125"/>
-        <location line="+187"/>
         <source>Could not find array</source>
         <translation>Не удалось найти массив</translation>
     </message>
     <message>
-        <location line="-155"/>
         <source>Could not get array data</source>
         <translation>Не удалось найти данные массива</translation>
     </message>
     <message>
-        <location line="+210"/>
         <source>Could not get query info</source>
         <translation>Не удалось найти информацию о запросе</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Could not start transaction</source>
         <translation>Не удалось начать транзакцию</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Could not allocate statement</source>
         <translation>Не удалось получить ресурсы для создания выражения</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Could not prepare statement</source>
         <translation>Не удалось подготовить выражение</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+11"/>
         <source>Could not describe input statement</source>
         <translation>Не удалось описать входящее выражение</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Could not describe statement</source>
         <translation>Не удалось описать выражение</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unable to close statement</source>
         <translation>Невозможно закрыть выражение</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unable to execute query</source>
         <translation>Невозможно выполнить запрос</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Could not fetch next item</source>
         <translation>Не удалось получить следующий элемент</translation>
     </message>
     <message>
-        <location line="+197"/>
         <source>Could not get statement info</source>
         <translation>Не удалось найти информацию о выражении</translation>
     </message>
@@ -4125,27 +3241,22 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/corelib/global/qglobal.cpp" line="+2120"/>
         <source>Permission denied</source>
         <translation>Доступ запрещён</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Too many open files</source>
         <translation>Слишком много открытых файлов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No such file or directory</source>
         <translation>Файл или каталог не существует</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No space left on device</source>
         <translation>Нет свободного места на устройстве</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qiodevice.cpp" line="+1598"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
@@ -4153,32 +3264,26 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QInputContext</name>
     <message>
-        <location filename="../src/gui/inputmethod/qinputcontextfactory.cpp" line="+301"/>
         <source>XIM</source>
         <translation>Метод ввода X-сервера</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>FEP</source>
         <translation>Метод ввода S60 FEP</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>XIM input method</source>
         <translation>Метод ввода X-сервера</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Windows input method</source>
         <translation>Метод ввода Windows</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Mac OS X input method</source>
         <translation>Метод ввода Mac OS X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>S60 FEP input method</source>
         <translation>Метод ввода S60 FEP</translation>
     </message>
@@ -4186,7 +3291,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QInputDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qinputdialog.cpp" line="+223"/>
         <source>Enter a value:</source>
         <translation>Укажите значение:</translation>
     </message>
@@ -4194,67 +3298,50 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QLibrary</name>
     <message>
-        <location filename="../src/corelib/plugin/qlibrary.cpp" line="+383"/>
         <source>Could not mmap &apos;%1&apos;: %2</source>
         <translation>Не удалось выполнить mmap &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>Проверочная информация для модуля &quot;%1&quot; не совпадает</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Could not unmap &apos;%1&apos;: %2</source>
         <translation>Не удалось выполнить unmap &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location line="+375"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Модуль &quot;%1&quot; использует несоместимую библиотеку 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>Модуль &quot;%1&quot; использует несоместимую библиотеку Qt. Ожидается ключ &quot;%2&quot;, но получен ключ &quot;%3&quot;</translation>
     </message>
     <message>
-        <location line="+365"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</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>Динамическая библиотека не найдена.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
         <translation>Файл &quot;%1&quot; - не является корректным модулем 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>Модуль &quot;%1&quot; использует несоместимую библиотеку Qt. (Невозможно совместить релизные и отладочные библиотеки.)</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>Невозможно загрузить библиотеку %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>Невозможно выгрузить библиотеку %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>Невозможно разрешить символ &quot;%1&quot; в %2: %3</translation>
     </message>
@@ -4262,37 +3349,30 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qlineedit.cpp" line="+2116"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить действие</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Redo</source>
         <translation>&amp;Повторить действие</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Paste</source>
         <translation>В&amp;ставить</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -4300,23 +3380,18 @@ Please verify the correct directory name was given.</source>
 <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: Некорректное имя</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="-8"/>
         <source>%1: Permission denied</source>
         <translation>%1: Доступ запрещён</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: Address in use</source>
         <translation>%1: Адрес используется</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1: Unknown error %2</source>
         <translation>%1: Неизвестная ошибка %2</translation>
     </message>
@@ -4324,70 +3399,46 @@ Please verify the correct directory name was given.</source>
 <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: Отказано в соединении</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Remote closed</source>
         <translation>%1: Закрыто удаленной стороной</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: Некорректное имя</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket access error</source>
         <translation>%1: Ошибка обращения к сокету</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket resource error</source>
         <translation>%1: Ошибка выделения ресурсов сокета</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: Время на операцию с сокетом истекло</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Datagram too large</source>
         <translation>%1: Датаграмма слишком большая</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: Ошибка соединения</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: Операция с сокетом не поддерживается</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: Unknown error</source>
         <translation>%1: Неизвестная ошибка</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: Неизвестная ошибка %2</translation>
     </message>
@@ -4395,27 +3446,22 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMYSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1287"/>
         <source>Unable to open database &apos;</source>
         <translation>Невозможно открыть базу данных &apos;</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to connect</source>
         <translation>Невозможно соединиться</translation>
     </message>
     <message>
-        <location line="+150"/>
         <source>Unable to begin transaction</source>
         <translation>Невозможно начать транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
@@ -4423,60 +3469,46 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMYSQLResult</name>
     <message>
-        <location line="-977"/>
-        <location line="+31"/>
         <source>Unable to fetch data</source>
         <translation>Невозможно получить данные</translation>
     </message>
     <message>
-        <location line="+161"/>
         <source>Unable to execute query</source>
         <translation>Невозможно выполнить запрос</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to store result</source>
         <translation>Невозможно сохранить результат</translation>
     </message>
     <message>
-        <location line="+191"/>
-        <location line="+8"/>
         <source>Unable to prepare statement</source>
         <translation>Невозможно подготовить выражение</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Unable to reset statement</source>
         <translation>Невозможно сбросить выражение</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Unable to bind value</source>
         <translation>Невозможно привязать значение</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to execute statement</source>
         <translation>Невозможно выполнить выражение</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+21"/>
         <source>Unable to bind outvalues</source>
         <translation>Невозможно привязать результирующие значения</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Unable to store statement results</source>
         <translation>Невозможно сохранить результаты выполнения выражения</translation>
     </message>
     <message>
-        <location line="-253"/>
         <source>Unable to execute next query</source>
         <translation>Невозможно выполнить следующий запрос</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Unable to store next result</source>
         <translation>Невозможно сохранить следующий результат</translation>
     </message>
@@ -4484,7 +3516,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMdiArea</name>
     <message>
-        <location filename="../src/gui/widgets/qmdiarea.cpp" line="+290"/>
         <source>(Untitled)</source>
         <translation>(Неозаглавлено)</translation>
     </message>
@@ -4492,92 +3523,74 @@ Please verify the correct directory name was given.</source>
 <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>Закрыть</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Restore Down</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location line="+707"/>
         <source>&amp;Restore</source>
         <translation>&amp;Восстановить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Move</source>
         <translation>&amp;Переместить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Размер</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mi&amp;nimize</source>
         <translation>&amp;Свернуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>Р&amp;аспахнуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Stay on &amp;Top</source>
         <translation>Оставаться &amp;сверху</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="-729"/>
         <source>Maximize</source>
         <translation>Распахнуть</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unshade</source>
         <translation>Восстановить из заголовка</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Shade</source>
         <translation>Свернуть в заголовок</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location line="-79"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
@@ -4585,21 +3598,14 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMenu</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+157"/>
-        <location line="+225"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="-224"/>
-        <location line="+225"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+225"/>
-        <location line="+51"/>
         <source>Execute</source>
         <translation>Выполнить</translation>
     </message>
@@ -4607,7 +3613,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="../src/gui/widgets/qmenu_symbian.cpp" line="+456"/>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
@@ -4615,40 +3620,30 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1964"/>
-        <location line="+847"/>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="-52"/>
-        <location line="+8"/>
         <source>OK</source>
         <translation>Закрыть</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;О Qt&lt;/h3&gt;&lt;p&gt;Данная программа использует Qt версии %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>&lt;p&gt;Qt - это инструментарий для разработки кроссплатформенных приложений на C++.&lt;/p&gt;&lt;p&gt;Qt предоставляет совместимость на уровне исходных текстов между MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux и всеми популярными коммерческими вариантами Unix. Также Qt доступна для встраиваемых устройств в виде Qt для Embedded Linux и Qt для Windows CE.&lt;/p&gt;&lt;p&gt;Qt доступна под тремя различными лицензиями, разработанными для удовлетворения различных требований.&lt;/p&gt;&lt;p&gt;Qt под нашей коммерческой лицензией предназначена для развития проприетарного/коммерческого программного обеспечения, когда Вы не желаете предоставлять исходные тексты третьим сторонам, или в случае невозможности принятия условий лицензий GNU LGPL версии 2.1 или GNU GPL версии 3.0.&lt;/p&gt;&lt;p&gt;Qt под лицензией GNU LGPL версии 2.1 предназначена для разработки программного обеспечения с открытыми исходными текстами или коммерческого программного обеспечения при соблюдении условий лицензии GNU LGPL версии 2.1.&lt;/p&gt;&lt;p&gt;Qt под лицензией GNU General Public License версии 3.0 предназначена для разработки программных приложений в тех случаях, когда Вы хотели бы использовать такие приложения в сочетании с программным обеспечением на условиях лицензии GNU GPL с версии 3.0 или если Вы готовы соблюдать условия лицензии GNU GPL версии 3.0.&lt;/p&gt;&lt;p&gt;Обратитесь к &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; для обзора лицензий Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения.&lt;/p&gt;&lt;p&gt;Qt - продукт компании Nokia. Обратитесь к &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; для получения дополнительной информации.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location line="-512"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location line="-1129"/>
         <source>Show Details...</source>
         <translation>Показать подробности...</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Hide Details...</source>
         <translation>Скрыть подробности...</translation>
     </message>
@@ -4656,7 +3651,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMultiInputContext</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp" line="+88"/>
         <source>Select IM</source>
         <translation>Выбор режима ввода</translation>
     </message>
@@ -4664,12 +3658,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMultiInputContextPlugin</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp" line="+95"/>
         <source>Multiple input method switcher</source>
         <translation>Переключатель режима множественного ввода</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Multiple input method switcher that uses the context menu of the text widgets</source>
         <translation>Переключатель режима множественного ввода, используемый в контекстном меню текстовых редакторов</translation>
     </message>
@@ -4677,132 +3669,106 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNativeSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qnativesocketengine.cpp" line="+209"/>
         <source>The remote host closed the connection</source>
         <translation>Удалённый узел закрыл соединение</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network operation timed out</source>
         <translation>Время на сетевую операцию истекло</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Out of resources</source>
         <translation>Недостаточно ресурсов</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unsupported socket operation</source>
         <translation>Операция с сокетом не поддерживается</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Protocol type not supported</source>
         <translation>Протокол не поддерживается</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid socket descriptor</source>
         <translation>Некорректный дескриптор сокета</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Network unreachable</source>
         <translation>Сеть недоступна</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Permission denied</source>
         <translation>Доступ запрещён</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection timed out</source>
         <translation>Время на соединение истекло</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection refused</source>
         <translation>Отказано в соединении</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The bound address is already in use</source>
         <translation>Адрес уже используется</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is not available</source>
         <translation>Адрес недоступен</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is protected</source>
         <translation>Адрес защищён</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to send a message</source>
         <translation>Невозможно отправить сообщение</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to receive a message</source>
         <translation>Невозможно получить сообщение</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to write</source>
         <translation>Невозможно записать</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network error</source>
         <translation>Ошибка сети</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Another socket is already listening on the same port</source>
         <translation>Другой сокет уже прослушивает этот порт</translation>
     </message>
     <message>
-        <location line="-66"/>
         <source>Unable to initialize non-blocking socket</source>
         <translation>Невозможно инициализировать не-блочный сокет</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to initialize broadcast socket</source>
         <translation>Невозможно инициализировать широковещательный сокет</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
         <translation>Попытка использовать IPv6 на платформе, не поддерживающей IPv6</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Host unreachable</source>
         <translation>Узел недоступен</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Datagram was too large to send</source>
         <translation>Датаграмма слишком большая для отправки</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Operation on non-socket</source>
         <translation>Операция с не-сокетом</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>The proxy type is invalid for this operation</source>
         <translation>Некорректный тип прокси-сервера для данной операции</translation>
     </message>
@@ -4810,7 +3776,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessCacheBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesscachebackend.cpp" line="+66"/>
         <source>Error opening %1</source>
         <translation>Ошибка открытия %1</translation>
     </message>
@@ -4818,12 +3783,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessDataBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdatabackend.cpp" line="+76"/>
         <source>Operation not supported on %1</source>
         <translation>Операция не поддерживается для %1</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Invalid URI: %1</source>
         <translation>Некорректный URI: %1</translation>
     </message>
@@ -4831,17 +3794,14 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+195"/>
         <source>Write error writing to %1: %2</source>
         <translation>Ошибка записи в %1: %2</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>Socket error on %1: %2</source>
         <translation>Ошика сокета для %1: %2</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remote host closed the connection prematurely on %1</source>
         <translation>Удалённый узел неожиданно прервал соединение для %1</translation>
     </message>
@@ -4849,30 +3809,22 @@ Please verify the correct directory name was given.</source>
 <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>Запрос на открытие файла вне файловой системы %1</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+45"/>
         <source>Error opening %1: %2</source>
         <translation>Ошибка открытия %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+38"/>
         <source>Write error writing to %1: %2</source>
         <translation>Ошибка записи в %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>Невозможно открыть %1: Указан путь к каталогу</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+21"/>
         <source>Read error reading from %1: %2</source>
         <translation>Ошибка чтения из %1: %2</translation>
     </message>
@@ -4880,27 +3832,22 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessFtpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessftpbackend.cpp" line="+131"/>
         <source>No suitable proxy found</source>
         <translation>Подходящий прокси-сервер не найден</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Cannot open %1: is a directory</source>
         <translation>Невозможно открыть %1: Указан путь к каталогу</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Logging in to %1 failed: authentication required</source>
         <translation>Соединение с %1 не удалось: требуется авторизация</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Error while downloading %1: %2</source>
         <translation>Ошибка в процессе загрузки %1: %2</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Error while uploading %1: %2</source>
         <translation>Ошибка в процессе отгрузки %1: %2</translation>
     </message>
@@ -4908,7 +3855,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+652"/>
         <source>No suitable proxy found</source>
         <translation>Подходящий прокси-сервер не найден</translation>
     </message>
@@ -4916,7 +3862,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+942"/>
         <source>Network access is disabled.</source>
         <translation>Доступ в сеть отключён.</translation>
     </message>
@@ -4924,22 +3869,18 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+100"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Ошибка загрузки %1 - ответ сервера: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-860"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Неизвестный протокол &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+192"/>
         <source>Network session error.</source>
         <translation>Ошибка сетевой сессии.</translation>
     </message>
     <message>
-        <location line="+352"/>
         <source>Temporary network failure.</source>
         <translation>Временная ошибка сети.</translation>
     </message>
@@ -4947,8 +3888,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkReplyImpl</name>
     <message>
-        <location line="+120"/>
-        <location line="+28"/>
         <source>Operation canceled</source>
         <translation>Операция отменена</translation>
     </message>
@@ -4956,7 +3895,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+449"/>
         <source>Invalid configuration.</source>
         <translation>Некорректная конфигурация.</translation>
     </message>
@@ -4964,48 +3902,35 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkSessionPrivateImpl</name>
     <message>
-        <location filename="../src/plugins/bearer/icd/qnetworksession_impl.cpp" line="+1005"/>
         <source>Roaming error</source>
         <translatorcomment>или перемещения?</translatorcomment>
         <translation type="unfinished">Ошибка роуминга</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Session aborted by user or system</source>
         <translation>Сессия прервана пользователем или системой</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unidentified Error</source>
         <translation>Неопределённая ошибка</translation>
     </message>
     <message>
-        <location filename="../src/plugins/bearer/qnetworksession_impl.cpp" line="+272"/>
-        <location filename="../src/plugins/bearer/symbian/qnetworksession_impl.cpp" line="+280"/>
         <source>Unknown session error.</source>
         <translation>Неизвестная ошибка сессии.</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>Сессия была прервана пользователем или системой.</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>Требуемая операция не поддерживается системой.</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>Невозможно использовать указанную конфигурацию.</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 type="unfinished">Роуминг прерван или невозможен.</translation>
     </message>
@@ -5013,28 +3938,23 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QOCIDriver</name>
     <message>
-        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+1944"/>
         <source>Unable to initialize</source>
         <comment>QOCIDriver</comment>
         <translation>Невозможно инициализировать</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Unable to logon</source>
         <translation>Невозможно авторизоваться</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>Unable to begin transaction</source>
         <translation>Невозможно начать транзакцию</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
@@ -5042,44 +3962,34 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QOCIResult</name>
     <message>
-        <location line="-979"/>
-        <location line="+168"/>
-        <location line="+15"/>
         <source>Unable to bind column for batch execute</source>
         <translation>Невозможно привязать столбец для пакетного выполнения</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to execute batch statement</source>
         <translation>Невозможно выполнить пакетное выражение</translation>
     </message>
     <message>
-        <location line="+304"/>
         <source>Unable to goto next</source>
         <translation>Невозможно перейти к следующей строке</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Unable to alloc statement</source>
         <translation>Невозможно создать выражение</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to prepare statement</source>
         <translation>Невозможно подготовить выражение</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Unable to get statement type</source>
         <translation>Невозможно определить тип выражения</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to bind value</source>
         <translation>Невозможно привязать результирующие значения</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to execute statement</source>
         <translation>Невозможно выполнить выражение</translation>
     </message>
@@ -5087,32 +3997,26 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QODBCDriver</name>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1888"/>
         <source>Unable to connect</source>
         <translation>Невозможно соединиться</translation>
     </message>
     <message>
-        <location line="+269"/>
         <source>Unable to disable autocommit</source>
         <translation>Невозможно отключить автозавершение транзакций</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to enable autocommit</source>
         <translation>Невозможно включить автозавершение транзакций</translation>
     </message>
     <message>
-        <location line="-312"/>
         <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
         <translation>Невозможно соединиться - Драйвер не поддерживает требуемый функционал</translation>
     </message>
@@ -5120,51 +4024,38 @@ Please verify the correct directory name was given.</source>
 <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: Невозможно установить &quot;SQL_CURSOR_STATIC&quot; атрибутом выражение. Проверьте настройки драйвера ODBC</translation>
     </message>
     <message>
-        <location line="-334"/>
-        <location line="+627"/>
         <source>Unable to execute statement</source>
         <translation>Невозможно выполнить выражение</translation>
     </message>
     <message>
-        <location line="-546"/>
         <source>Unable to fetch next</source>
         <translation>Невозможно получить следующую строку</translation>
     </message>
     <message>
-        <location line="+271"/>
         <source>Unable to prepare statement</source>
         <translation>Невозможно подготовить выражение</translation>
     </message>
     <message>
-        <location line="+267"/>
         <source>Unable to bind variable</source>
         <translation>Невозможно привязать значение</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+189"/>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-466"/>
-        <location line="+578"/>
         <source>Unable to fetch last</source>
         <translation>Невозможно получить последнюю строку</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-672"/>
         <source>Unable to fetch</source>
         <translation>Невозможно получить данные</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Unable to fetch first</source>
         <translation>Невозможно получить первую строку</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch previous</source>
         <translation>Невозможно получить предыдущую строку</translation>
     </message>
@@ -5172,19 +4063,14 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-241"/>
         <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
         <translation>&quot;%1&quot; повторяет имя предыдущей роли и не будет использовано.</translation>
     </message>
     <message>
-        <location line="+515"/>
-        <location line="+4"/>
         <source>invalid query: &quot;%1&quot;</source>
         <translation>Некорректный запрос: &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/pulsesupport.cpp" line="+162"/>
-        <location line="+11"/>
         <source>PulseAudio Sound Server</source>
         <translation>Звуковой сервер PulseAudio</translation>
     </message>
@@ -5192,12 +4078,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1238"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
@@ -5205,32 +4089,26 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/psql/qsql_psql.cpp" line="+782"/>
         <source>Unable to connect</source>
         <translation>Невозможно соединиться</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Could not begin transaction</source>
         <translation>Не удалось начать транзакцию</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Could not commit transaction</source>
         <translation>Не удалось завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Could not rollback transaction</source>
         <translation>Не удалось отозвать транзакцию</translation>
     </message>
     <message>
-        <location line="+374"/>
         <source>Unable to subscribe</source>
         <translation>Невозможно подписаться</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Unable to unsubscribe</source>
         <translation>Невозможно отписаться</translation>
     </message>
@@ -5238,12 +4116,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPSQLResult</name>
     <message>
-        <location line="-1085"/>
         <source>Unable to create query</source>
         <translation>Невозможно создать запрос</translation>
     </message>
     <message>
-        <location line="+372"/>
         <source>Unable to prepare statement</source>
         <translation>Невозможно подготовить выражение</translation>
     </message>
@@ -5251,102 +4127,82 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPageSetupWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="+304"/>
         <source>Centimeters (cm)</source>
         <translation>Сантиметры (cm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Millimeters (mm)</source>
         <translation>Миллиметры (mm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Inches (in)</source>
         <translation>Дюймы (in)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Points (pt)</source>
         <translation>Точки (pt)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupwidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Paper</source>
         <translation>Бумага</translation>
     </message>
     <message>
-        <location/>
         <source>Page size:</source>
         <translation>Размер страницы:</translation>
     </message>
     <message>
-        <location/>
         <source>Width:</source>
         <translation>Ширина:</translation>
     </message>
     <message>
-        <location/>
         <source>Height:</source>
         <translation>Высота:</translation>
     </message>
     <message>
-        <location/>
         <source>Paper source:</source>
         <translation>Источник бумаги:</translation>
     </message>
     <message>
-        <location/>
         <source>Orientation</source>
         <translation>Ориентация</translation>
     </message>
     <message>
-        <location/>
         <source>Portrait</source>
         <translation>Книжная</translation>
     </message>
     <message>
-        <location/>
         <source>Landscape</source>
         <translation>Альбомная</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse landscape</source>
         <translation>Перевёрнутая альбомная</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse portrait</source>
         <translation>Перевёрнутая книжная</translation>
     </message>
     <message>
-        <location/>
         <source>Margins</source>
         <translation>Поля</translation>
     </message>
     <message>
-        <location/>
         <source>top margin</source>
         <translation>верхнее поле</translation>
     </message>
     <message>
-        <location/>
         <source>left margin</source>
         <translation>левое поле</translation>
     </message>
     <message>
-        <location/>
         <source>right margin</source>
         <translation>правое поле</translation>
     </message>
     <message>
-        <location/>
         <source>bottom margin</source>
         <translation>нижнее поле</translation>
     </message>
@@ -5354,12 +4210,10 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPluginLoader</name>
     <message>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+24"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="-113"/>
         <source>The plugin was not loaded.</source>
         <translation>Модуль не был загружен.</translation>
     </message>
@@ -5367,433 +4221,344 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+110"/>
         <source>locally connected</source>
         <translation>соединено локально</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <location line="+225"/>
         <source>Aliases: %1</source>
         <translation>Псевдонимы: %1</translation>
     </message>
     <message>
-        <location line="+225"/>
-        <location line="+199"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+272"/>
         <source>OK</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+379"/>
         <source>Print all</source>
         <translation>Все страницы</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Print range</source>
         <translation>Диапазон страниц</translation>
     </message>
     <message>
-        <location line="-48"/>
         <source>A0 (841 x 1189 mm)</source>
         <translation>A0 (841 x 1189 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A1 (594 x 841 mm)</source>
         <translation>A1 (594 x 841 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A2 (420 x 594 mm)</source>
         <translation>A2 (420 x 594 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A3 (297 x 420 mm)</source>
         <translation>A3 (297 x 420 мм)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>A5 (148 x 210 mm)</source>
         <translation>A5 (148 x 210 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A6 (105 x 148 mm)</source>
         <translation>A6 (105 x 148 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A7 (74 x 105 mm)</source>
         <translation>A7 (74 x 105 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A8 (52 x 74 mm)</source>
         <translation>A8 (52 x 74 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A9 (37 x 52 mm)</source>
         <translation>A9 (37 x 52 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B0 (1000 x 1414 mm)</source>
         <translation>B0 (1000 x 1414 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B1 (707 x 1000 mm)</source>
         <translation>B1 (707 x 1000 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B2 (500 x 707 mm)</source>
         <translation>B2 (500 x 707 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B3 (353 x 500 mm)</source>
         <translation>B3 (353 x 500 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B4 (250 x 353 mm)</source>
         <translation>B4 (250 x 353 мм)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>B6 (125 x 176 mm)</source>
         <translation>B6 (125 x 176 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B7 (88 x 125 mm)</source>
         <translation>B7 (88 x 125 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B8 (62 x 88 mm)</source>
         <translation>B8 (62 x 88 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B9 (44 x 62 mm)</source>
         <translation>B9 (44 x 62 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B10 (31 x 44 mm)</source>
         <translation>B10 (31 x 44 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>C5E (163 x 229 mm)</source>
         <translation>C5E (163 x 229 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DLE (110 x 220 mm)</source>
         <translation>DLE (110 x 220 мм)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Folio (210 x 330 mm)</source>
         <translation>Folio (210 x 330 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ledger (432 x 279 mm)</source>
         <translation>Ledger (432 x 279 мм)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tabloid (279 x 432 mm)</source>
         <translation>Tabloid (279 x 432 мм)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>US Common #10 Envelope (105 x 241 mm)</source>
         <translation>Конверт US #10 (105x241 мм)</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Print current page</source>
         <translation>Текущая страница</translation>
     </message>
     <message>
-        <location line="-45"/>
         <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source>
         <translation>A4 (210 x 297 мм, 8.26 x 11.7 дюймов)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source>
         <translation>B5 (176 x 250 мм, 6.93 x 9.84 дюймов)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source>
         <translation>Executive (191 x 254 мм, 7.5 x 10 дюймов)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source>
         <translation>Legal (216 x 356 мм, 8.5 x 14 дюймов)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source>
         <translation>Letter (216 x 279 мм, 8.5 x 11 дюймов)</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Print selection</source>
         <translation>Выделенный фрагмент</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>Печать</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-392"/>
         <source>Print To File ...</source>
         <translation>Печать в файл ...</translation>
     </message>
     <message>
-        <location line="+82"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
         <translation>%1 недоступен для записи.
 Выберите другое имя файла.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 already exists.
 Do you want to overwrite it?</source>
         <translation>%1 уже существует.
 Хотите заменить его?</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-232"/>
         <source>File exists</source>
         <translation>Файл существует</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Do you want to overwrite it?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Хотите заменить?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-8"/>
         <source>%1 is a directory.
 Please choose a different file name.</source>
         <translation>%1 - это каталог.
 Выберите другое имя файла.</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>Значение &quot;с&quot; не может быть больше значения &quot;по&quot;.</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>Пользовательский</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-530"/>
-        <location line="+68"/>
         <source>&amp;Options &gt;&gt;</source>
         <translation>&amp;Параметры &gt;&gt;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Options &lt;&lt;</source>
         <translation>&amp;Параметры &lt;&lt;</translation>
     </message>
     <message>
-        <location line="+260"/>
         <source>Print to File (PDF)</source>
         <translation>Печать в файл (PDF)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print to File (Postscript)</source>
         <translation>Печать в файл (Postscript)</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Local file</source>
         <translation>Локальный файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write %1 file</source>
         <translation>Запись %1 файла</translation>
     </message>
     <message>
-        <location line="-376"/>
         <source>&amp;Print</source>
         <translation>&amp;Печать</translation>
     </message>
@@ -5801,108 +4566,86 @@ Please choose a different file name.</source>
 <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>Просмотр печати</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Next page</source>
         <translation>Следующая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous page</source>
         <translation>Предыдущая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>First page</source>
         <translation>Первая страница</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Last page</source>
         <translation>Последняя страница</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Fit width</source>
         <translation>По ширине</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Fit page</source>
         <translation>На всю страницу</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Zoom in</source>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom out</source>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Portrait</source>
         <translation>Книжная</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Landscape</source>
         <translation>Альбомная</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Show single page</source>
         <translation>Показать одну страницу</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show facing pages</source>
         <translation>Показать титульные страницы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show overview of all pages</source>
         <translation>Показать обзор всех страниц</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page setup</source>
         <translation>Параметры страницы</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+148"/>
         <source>Export to PDF</source>
         <translation>Экспорт в PDF</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Export to PostScript</source>
         <translation>Экспорт в Postscript</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qabstractpagesetupdialog.cpp" line="+68"/>
-        <location line="+12"/>
         <source>Page Setup</source>
         <translation>Параметры страницы</translation>
     </message>
@@ -5910,17 +4653,14 @@ Please choose a different file name.</source>
 <context>
     <name>QPrintPropertiesWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpropertieswidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Page</source>
         <translation>Страница</translation>
     </message>
     <message>
-        <location/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
@@ -5928,102 +4668,82 @@ Please choose a different file name.</source>
 <context>
     <name>QPrintSettingsOutput</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintsettingsoutput.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Copies</source>
         <translation>Копии</translation>
     </message>
     <message>
-        <location/>
         <source>Print range</source>
         <translation>Диапазон печати</translation>
     </message>
     <message>
-        <location/>
         <source>Print all</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location/>
         <source>Pages from</source>
         <translation>Страницы с</translation>
     </message>
     <message>
-        <location/>
         <source>to</source>
         <translation>по</translation>
     </message>
     <message>
-        <location/>
         <source>Selection</source>
         <translation>Выделенный фрагмент</translation>
     </message>
     <message>
-        <location/>
         <source>Output Settings</source>
         <translation>Настройки вывода</translation>
     </message>
     <message>
-        <location/>
         <source>Copies:</source>
         <translation>Количество копий:</translation>
     </message>
     <message>
-        <location/>
         <source>Collate</source>
-        <translation>Разобрать про копиям</translation>
+        <translation>Разобрать по копиям</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse</source>
         <translation>Обратный порядок</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location/>
         <source>Color Mode</source>
         <translation>Режим цвета</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location/>
         <source>Grayscale</source>
         <translation>Оттенки серого</translation>
     </message>
     <message>
-        <location/>
         <source>Duplex Printing</source>
         <translation>Двусторонняя печать</translation>
     </message>
     <message>
-        <location/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location/>
         <source>Long side</source>
         <translation>По длинной стороне</translation>
     </message>
     <message>
-        <location/>
         <source>Short side</source>
         <translation>По короткой стороне</translation>
     </message>
     <message>
-        <location/>
         <source>Current Page</source>
         <translation>Текущая страница</translation>
     </message>
@@ -6031,47 +4751,38 @@ Please choose a different file name.</source>
 <context>
     <name>QPrintWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintwidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location/>
         <source>Printer</source>
         <translation>Принтер</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Название:</translation>
     </message>
     <message>
-        <location/>
         <source>P&amp;roperties</source>
         <translation>С&amp;войства</translation>
     </message>
     <message>
-        <location/>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Просмотр</translation>
     </message>
     <message>
-        <location/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location/>
         <source>Output &amp;file:</source>
         <translation>Вывод в &amp;файл:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6079,62 +4790,38 @@ Please choose a different file name.</source>
 <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>Не удалось открыть перенаправление ввода для чтения</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>Не удалось открыть перенаправление вывода для записи</translation>
     </message>
     <message>
-        <location line="+239"/>
         <source>Resource error (fork failure): %1</source>
         <translation>Ошибка выделения ресурсов (сбой fork): %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="+406"/>
-        <location line="+50"/>
-        <location line="+75"/>
-        <location line="+42"/>
-        <location line="+54"/>
         <source>Process operation timed out</source>
         <translation>Время на операцию с процессом истекло</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>Ошибка получения данных от процесса</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+826"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+140"/>
         <source>Error writing to process</source>
         <translation>Ошибка отправки данных процессу</translation>
     </message>
     <message>
-        <location line="-756"/>
         <source>Process crashed</source>
         <translation>Процесс завершился с ошибкой</translation>
     </message>
     <message>
-        <location line="+959"/>
         <source>No program defined</source>
         <translation>Программа не указана</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-360"/>
         <source>Process failed to start: %1</source>
         <translation>Не удалось запустить процесс: %1</translation>
     </message>
@@ -6142,7 +4829,6 @@ Please choose a different file name.</source>
 <context>
     <name>QProgressDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprogressdialog.cpp" line="+196"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -6150,7 +4836,6 @@ Please choose a different file name.</source>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-8"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
@@ -6158,7 +4843,6 @@ Please choose a different file name.</source>
 <context>
     <name>QRadioButton</name>
     <message>
-        <location line="+12"/>
         <source>Check</source>
         <translation>Отметить</translation>
     </message>
@@ -6166,57 +4850,46 @@ Please choose a different file name.</source>
 <context>
     <name>QRegExp</name>
     <message>
-        <location filename="../src/corelib/tools/qregexp.cpp" line="+65"/>
         <source>no error occurred</source>
         <translation>ошибки отсутствуют</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>disabled feature used</source>
         <translation>использование отключённых возможностей</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad char class syntax</source>
         <translation>неправильный синтаксис класса символов</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad lookahead syntax</source>
         <translation>неправильный предварительный синтаксис</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad repetition syntax</source>
         <translation>неправильный синтаксис повторения</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid octal value</source>
         <translation>некорректное восьмеричное значение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>missing left delim</source>
         <translation>отсутствует левый разделитель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected end</source>
         <translation>неожиданный конец</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>met internal limit</source>
         <translation>достигнуто внутреннее ограничение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid interval</source>
         <translation>некорректный интервал</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid category</source>
         <translation>некорректная категория</translation>
     </message>
@@ -6224,22 +4897,18 @@ Please choose a different file name.</source>
 <context>
     <name>QSQLite2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+399"/>
         <source>Error opening database</source>
         <translation>Ошибка открытия базы данных</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Unable to begin transaction</source>
         <translation>Невозможно начать транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
@@ -6247,12 +4916,10 @@ Please choose a different file name.</source>
 <context>
     <name>QSQLite2Result</name>
     <message>
-        <location line="-326"/>
         <source>Unable to fetch results</source>
         <translation>Невозможно получить результаты</translation>
     </message>
     <message>
-        <location line="+150"/>
         <source>Unable to execute statement</source>
         <translation>Невозможно выполнить выражение</translation>
     </message>
@@ -6260,27 +4927,22 @@ Please choose a different file name.</source>
 <context>
     <name>QSQLiteDriver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+539"/>
         <source>Error opening database</source>
         <translation>Ошибка открытия базы данных</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Error closing database</source>
         <translation>Ошибка закрытия базы данных</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to begin transaction</source>
         <translation>Невозможно начать транзакцию</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to commit transaction</source>
         <translation>Невозможно завершить транзакцию</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to rollback transaction</source>
         <translation>Невозможно отозвать транзакцию</translation>
     </message>
@@ -6288,34 +4950,26 @@ Please choose a different file name.</source>
 <context>
     <name>QSQLiteResult</name>
     <message>
-        <location line="-396"/>
-        <location line="+63"/>
-        <location line="+8"/>
         <source>Unable to fetch row</source>
         <translation>Невозможно получить строку</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Unable to execute statement</source>
         <translation>Невозможно выполнить выражение</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to reset statement</source>
         <translation>Невозможно сбросить выражение</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Unable to bind parameters</source>
         <translation>Невозможно привязать параметр</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Parameter count mismatch</source>
         <translation>Количество параметров не совпадает</translation>
     </message>
     <message>
-        <location line="-201"/>
         <source>No query</source>
         <translation>Отсутствует запрос</translation>
     </message>
@@ -6323,32 +4977,26 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptBreakpointsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointsmodel.cpp" line="+455"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Location</source>
         <translation>Размещение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Condition</source>
         <translation>Условие</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ignore-count</source>
         <translation>Пропущено</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Single-shot</source>
         <translation>Однократно</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Hit-count</source>
         <translation>Совпадений</translation>
     </message>
@@ -6356,12 +5004,10 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptBreakpointsWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointswidget.cpp" line="+298"/>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -6369,143 +5015,114 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+885"/>
-        <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Перейти к строке</translation>
     </message>
     <message>
-        <location line="-1012"/>
         <source>Line:</source>
         <translation>Строка:</translation>
     </message>
     <message>
-        <location line="+791"/>
         <source>Interrupt</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F5</source>
         <translation>Shift+F5</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Into</source>
         <translation>Войти в</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Over</source>
         <translation>Перейти через</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Out</source>
         <translation>Выйти из функции</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>Выполнить до курсора</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>Выполнить до нового сценария</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Toggle Breakpoint</source>
         <translation>Установить/убрать точку останова</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Clear Debug Output</source>
         <translation>Очистить отладочный вывод</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Clear Error Log</source>
         <translation>Очистить журнал ошибок</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Clear Console</source>
         <translation>Очистить консоль</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>&amp;Find in Script...</source>
         <translation>&amp;Найти в сценарии...</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>Найти &amp;следующее</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Find &amp;Previous</source>
         <translation>Найти &amp;предыдущее</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>Отладка</translation>
     </message>
@@ -6513,32 +5130,26 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerCodeFinderWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp" line="+141"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Previous</source>
         <translation>Предыдущий</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Next</source>
         <translation>Следующий</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Case Sensitive</source>
         <translation>Учитывать регистр</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Whole words</source>
         <translation>Слова целиком</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;Поиск с начала</translation>
     </message>
@@ -6546,12 +5157,10 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
@@ -6559,17 +5168,14 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerStackModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerstackmodel.cpp" line="+161"/>
         <source>Level</source>
         <translation>Уровень</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Location</source>
         <translation>Размещение</translation>
     </message>
@@ -6577,22 +5183,18 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptEdit</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptedit.cpp" line="+411"/>
         <source>Toggle Breakpoint</source>
         <translation>Установить/убрать точку останова</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disable Breakpoint</source>
         <translation>Убрать точку останова</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable Breakpoint</source>
         <translation>Установить точку останова</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Breakpoint Condition:</source>
         <translation>Условие точки останова:</translation>
     </message>
@@ -6600,52 +5202,42 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptEngineDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptenginedebugger.cpp" line="+523"/>
         <source>Loaded Scripts</source>
         <translation>Загруженные сценарии</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Breakpoints</source>
         <translation>Точки останова</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stack</source>
         <translation>Стек</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Locals</source>
         <translation>Локальные переменные</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Console</source>
         <translation>Консоль</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Debug Output</source>
         <translation>Отладочный вывод</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Error Log</source>
         <translation>Журнал ошибок</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Qt Script Debugger</source>
         <translation>Отладчик сценариев Qt</translation>
     </message>
@@ -6653,7 +5245,6 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptNewBreakpointWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointswidget.cpp" line="-223"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -6661,84 +5252,66 @@ Please choose a different file name.</source>
 <context>
     <name>QScrollBar</name>
     <message>
-        <location filename="../src/gui/widgets/qscrollbar.cpp" line="+454"/>
         <source>Scroll here</source>
         <translation>Прокрутить сюда</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Left edge</source>
         <translation>К левой границе</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
         <translation>Вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
         <translation>К правой границе</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>Вниз</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Page left</source>
         <translation>На страницу влево</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+143"/>
         <source>Page up</source>
         <translation>На страницу вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>На страницу вправо</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+4"/>
         <source>Page down</source>
         <translation>На страницу вниз</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Scroll left</source>
         <translation>Прокрутить влево</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Прокрутить вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Прокрутить вправо</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Прокрутить вниз</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-6"/>
         <source>Line up</source>
         <translation>На строку вверх</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Position</source>
         <translation>Положение</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Line down</source>
         <translation>На строку вниз</translation>
     </message>
@@ -6746,111 +5319,78 @@ Please choose a different file name.</source>
 <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: размер меньше нуля</translation>
     </message>
     <message>
-        <location line="+168"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_p.h" line="+155"/>
         <source>%1: unable to lock</source>
         <translation>%1: невозможно заблокировать</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1: unable to unlock</source>
         <translation>%1: невозможно разблокировать</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: доступ запрещён</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: уже существует</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: doesn&apos;t exists</source>
         <translation>%1: не существует</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: недостаточно ресурсов</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: неизвестная ошибка %2</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+21"/>
         <source>%1: key is empty</source>
         <translation>%1: пустой ключ</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>%1: ftok failed</source>
         <translation>%1: ошибка 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: невозможно создать ключ</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: не существует</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>%1: UNIX key file doesn&apos;t exist</source>
         <translation>%1: специфический ключ UNIX не существует</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: системой наложены ограничения на размер</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1: not attached</source>
         <translation>%1: не приложенный</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: некорректный размер</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+63"/>
         <source>%1: key error</source>
         <translation>%1: некорректный ключ</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+32"/>
         <source>%1: size query failed</source>
         <translation>%1: не удалось запросить размер</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="-271"/>
         <source>%1: unable to set key on lock</source>
         <translation>%1: невозможно установить ключ блокировки</translation>
     </message>
@@ -6858,1063 +5398,884 @@ Please choose a different file name.</source>
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+396"/>
         <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 type="unfinished">Пробел</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Esc</source>
         <translation type="unfinished">Esc</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tab</source>
         <translation type="unfinished">Tab</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backtab</source>
         <translation type="unfinished">Backtab</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backspace</source>
         <translation type="unfinished">Backspace</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Return</source>
         <translation type="unfinished">Return</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enter</source>
         <translation type="unfinished">Enter</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ins</source>
         <translation type="unfinished">Ins</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Del</source>
         <translation type="unfinished">Del</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pause</source>
         <translation type="unfinished">Pause</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print</source>
         <translation type="unfinished">Print</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SysReq</source>
         <translation type="unfinished">SysReq</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Home</source>
         <translation type="unfinished">Home</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>End</source>
         <translation type="unfinished">End</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Left</source>
         <translation type="unfinished">Влево</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Up</source>
         <translation type="unfinished">Вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right</source>
         <translation type="unfinished">Вправо</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Down</source>
         <translation type="unfinished">Вниз</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PgUp</source>
         <translation type="unfinished">PgUp</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PgDown</source>
         <translation type="unfinished">PgDown</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CapsLock</source>
         <translation type="unfinished">CapsLock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>NumLock</source>
         <translation type="unfinished">NumLock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ScrollLock</source>
         <translation type="unfinished">ScrollLock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Menu</source>
         <translation type="unfinished">Меню</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Help</source>
         <translation type="unfinished">Справка</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Back</source>
         <translation type="unfinished">Назад</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Forward</source>
         <translation type="unfinished">Вперёд</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Stop</source>
         <translation type="unfinished">Остановить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Refresh</source>
         <translation type="unfinished">Обновить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Down</source>
         <translation type="unfinished">Тише</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Mute</source>
         <translation type="unfinished">Выключить звук</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Up</source>
         <translation type="unfinished">Громче</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Boost</source>
         <translation type="unfinished">Усиление басов</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Up</source>
         <translation type="unfinished">Басы выше</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Down</source>
         <translation type="unfinished">Басы ниже</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Treble Up</source>
         <translation type="unfinished">ВЧ выше</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Treble Down</source>
         <translation type="unfinished">ВЧ ниже</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Play</source>
-        <translation type="unfinished">Воспроизведение</translation>
+        <translation type="unfinished">Начать воспроизведение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Stop</source>
         <translation type="unfinished">Остановить воспроизведение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Previous</source>
         <translation type="unfinished">Воспроизвести предыдущее</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Next</source>
         <translation type="unfinished">Воспроизвести следующее</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Record</source>
-        <translation type="unfinished">Запись</translation>
+        <translation type="unfinished">Начать запись</translation>
+    </message>
+    <message>
+        <source>Media Pause</source>
+        <extracomment>Media player pause button</extracomment>
+        <translation type="unfinished">Приостановить воспроизведение</translation>
+    </message>
+    <message>
+        <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="+2"/>
         <source>Favorites</source>
         <translation type="unfinished">Избранное</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search</source>
         <translation type="unfinished">Поиск</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Standby</source>
         <translation type="unfinished">Режим ожидания</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open URL</source>
         <translation type="unfinished">Открыть URL</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Mail</source>
         <translation type="unfinished">Почта</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Media</source>
         <translation type="unfinished">Проигрыватель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (0)</source>
         <translation type="unfinished">Запустить (0)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (1)</source>
         <translation type="unfinished">Запустить (1)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (2)</source>
         <translation type="unfinished">Запустить (2)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (3)</source>
         <translation type="unfinished">Запустить (3)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (4)</source>
         <translation type="unfinished">Запустить (4)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (5)</source>
         <translation type="unfinished">Запустить (5)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (6)</source>
         <translation type="unfinished">Запустить (6)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (7)</source>
         <translation type="unfinished">Запустить (7)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (8)</source>
         <translation type="unfinished">Запустить (8)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (9)</source>
         <translation type="unfinished">Запустить (9)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (A)</source>
         <translation type="unfinished">Запустить (A)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (B)</source>
         <translation type="unfinished">Запустить (B)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (C)</source>
         <translation type="unfinished">Запустить (C)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (D)</source>
         <translation type="unfinished">Запустить (D)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (E)</source>
         <translation type="unfinished">Запустить (E)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (F)</source>
         <translation type="unfinished">Запустить (F)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Monitor Brightness Up</source>
         <translation type="unfinished">Увеличить яркость монитора</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Monitor Brightness Down</source>
         <translation type="unfinished">Уменьшить яркость монитора</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Light On/Off</source>
         <translation type="unfinished">Вкл./Откл. подсветку клавиатуры</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Brightness Up</source>
         <translation type="unfinished">Увеличить яркость подсветки клавиатуры</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Brightness Down</source>
         <translation type="unfinished">Уменьшить яркость подсветки клавиатуры</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Power Off</source>
         <translation type="unfinished">Отключение питания</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Wake Up</source>
         <translation type="unfinished">Пробуждение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Eject</source>
         <translation type="unfinished">Извлечь</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Screensaver</source>
         <translation type="unfinished">Экранная заставка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>WWW</source>
         <translation type="unfinished">WWW</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sleep</source>
         <translation type="unfinished">Спящий режим</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LightBulb</source>
         <translation type="unfinished">Лампочка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Shop</source>
         <translation type="unfinished">Магазин</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>History</source>
         <translation type="unfinished">История</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Add Favorite</source>
         <translation type="unfinished">Добавить в избранное</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hot Links</source>
         <translation type="unfinished">Горячие ссылки</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Adjust Brightness</source>
         <translation type="unfinished">Настройка яркости</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Finance</source>
         <translation type="unfinished">Финансы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Community</source>
         <translation type="unfinished">Сообщество</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Rewind</source>
         <translation type="unfinished">Перемотка аудио назад</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 type="unfinished">Книга</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Calculator</source>
         <translation type="unfinished">Калькулятор</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear</source>
         <translation type="unfinished">Очистить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear Grab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Close</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
         <translation type="unfinished">Копировать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cut</source>
         <translation type="unfinished">Вырезать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DOS</source>
         <translation type="unfinished">DOS</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Documents</source>
         <translation type="unfinished">Документы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Spreadsheet</source>
         <translation type="unfinished">Электронная таблицы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Browser</source>
         <translation type="unfinished">Обозреватель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Game</source>
         <translation type="unfinished">Игра</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Go</source>
         <translation type="unfinished">Перейти</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>iTouch</source>
         <translation type="unfinished">iTouch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Logoff</source>
         <translation type="unfinished">Выйти из системы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Market</source>
         <translation type="unfinished">Рынок</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Meeting</source>
         <translation type="unfinished">Встреча</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Keyboard Menu</source>
         <translation type="unfinished">Клавиатурное меню</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Menu PB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>My Sites</source>
         <translation type="unfinished">Мои сайты</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>News</source>
         <translation type="unfinished">Новости</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Home Office</source>
         <translation type="unfinished">Домашний офис</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Option</source>
         <translation type="unfinished">Опция</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Paste</source>
         <translation type="unfinished">Вставить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Phone</source>
         <translation type="unfinished">Телефон</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reply</source>
         <translation type="unfinished">Ответить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reload</source>
         <translation type="unfinished">Перезагрузить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rotate Windows</source>
         <translation type="unfinished">Повернуть окна</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rotation PB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rotation KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save</source>
         <translation type="unfinished">Сохранить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Send</source>
         <translation type="unfinished">Отправить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Spellchecker</source>
         <translation type="unfinished">Проверка орфографии</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Split Screen</source>
         <translation type="unfinished">Разделить экран</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Support</source>
         <translation type="unfinished">Поддержка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Task Panel</source>
         <translation type="unfinished">Панель задач</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Terminal</source>
         <translation type="unfinished">Терминал</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tools</source>
         <translation type="unfinished">Инструменты</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Travel</source>
         <translation type="unfinished">Путешествие</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Video</source>
         <translation type="unfinished">Видео</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Word Processor</source>
         <translation type="unfinished">Текстовый редактор</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>XFer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom In</source>
         <translation type="unfinished">Увеличить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom Out</source>
         <translation type="unfinished">Уменьшить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Away</source>
         <translation type="unfinished">Ушёл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Messenger</source>
         <translation type="unfinished">Клиент обмена мгновенными сообщениями</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>WebCam</source>
         <translation type="unfinished">Вэб-камера</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mail Forward</source>
         <translation type="unfinished">Переслать письмо</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pictures</source>
         <translation type="unfinished">Изображения</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Music</source>
         <translation type="unfinished">Музыка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Battery</source>
         <translation type="unfinished">Батарея</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bluetooth</source>
         <translation type="unfinished">Bluetooth</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Wireless</source>
         <translation type="unfinished">Беспроводная сеть</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ultra Wide Band</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сверхширокополосная связь</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Последовательное воспроизведение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Repeat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Воспроизведение по кругу</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Random Play</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Случайное воспроизведение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Subtitle</source>
         <translation type="unfinished">Субтитры</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Audio Cycle Track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Зацикленное воспроизведение дорожки</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
         <translation type="unfinished">Время</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>View</source>
         <translation type="unfinished">Вид</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Top Menu</source>
         <translation type="unfinished">Главное меню</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Suspend</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Приостановить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hibernate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Усыпить</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Print Screen</source>
         <translation type="unfinished">Печать экрана</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page Up</source>
         <translation type="unfinished">На страницу вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page Down</source>
         <translation type="unfinished">На страницу вниз</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Caps Lock</source>
         <translation type="unfinished">Верний регистр</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Num Lock</source>
         <translation type="unfinished">Цифровые клавиши</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Number Lock</source>
         <translation type="unfinished">Цифровые клавиши</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll Lock</source>
         <translation type="unfinished">Scroll Lock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insert</source>
         <translation type="unfinished">Вставить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Escape</source>
         <translation type="unfinished">Escape</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>System Request</source>
         <translation type="unfinished">Системный запрос</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <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>
+        <source>Voice Dial</source>
+        <extracomment>Button to trigger voice dialling</extracomment>
+        <translation type="unfinished">Голосовой вызов</translation>
+    </message>
+    <message>
+        <source>Last Number Redial</source>
+        <extracomment>Button to redial the last number called</extracomment>
+        <translation type="unfinished">Повторный набор</translation>
+    </message>
+    <message>
+        <source>Camera Shutter</source>
+        <extracomment>Button to trigger the camera shutter (take a picture)</extracomment>
+        <translation type="unfinished">Затвор камеры</translation>
+    </message>
+    <message>
+        <source>Camera Focus</source>
+        <extracomment>Button to focus the camera</extracomment>
+        <translation type="unfinished">Фокусировка камеры</translation>
+    </message>
+    <message>
         <source>Kanji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Muhenkan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Henkan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Romaji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hiragana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Katakana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hiragana Katakana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zenkaku</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hankaku</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zenkaku Hankaku</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Touroku</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Massyo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Kana Lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Kana Shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Eisu Shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Eisu toggle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Code input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Multiple Candidate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous Candidate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Hangul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Hanja</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Jamo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Romaja</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Jeonja</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Banja</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul PreHanja</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul PostHanja</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangul Special</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
-        <location line="+22"/>
         <source>Select</source>
         <translation type="unfinished">Выбрать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Yes</source>
         <translation type="unfinished">Да</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>No</source>
         <translation type="unfinished">Нет</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Context1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Call</source>
+        <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment>
         <translation type="unfinished">Позвонить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangup</source>
+        <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment>
         <translation type="unfinished">Положить трубку</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+638"/>
-        <location line="+135"/>
         <source>Ctrl</source>
         <translation type="unfinished">Ctrl</translation>
     </message>
     <message>
-        <location line="-134"/>
-        <location line="+138"/>
         <source>Shift</source>
         <translation type="unfinished">Shift</translation>
     </message>
     <message>
-        <location line="-137"/>
-        <location line="+135"/>
         <source>Alt</source>
         <translation type="unfinished">Alt</translation>
     </message>
     <message>
-        <location line="-134"/>
-        <location line="+130"/>
         <source>Meta</source>
         <translation type="unfinished">Meta</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>+</source>
         <translation type="unfinished">+</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>F%1</source>
         <translation type="unfinished">F%1</translation>
     </message>
     <message>
-        <location line="-934"/>
         <source>Home Page</source>
         <translation type="unfinished">Домашняя страница</translation>
     </message>
@@ -7922,27 +6283,22 @@ Please choose a different file name.</source>
 <context>
     <name>QSlider</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+151"/>
         <source>Page left</source>
         <translation>Страница влево</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
         <translation>Страница вверх</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Position</source>
         <translation>Положение</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page right</source>
         <translation>Страница вправо</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
         <translation>Страница вниз</translation>
     </message>
@@ -7950,72 +6306,58 @@ Please choose a different file name.</source>
 <context>
     <name>QSocks5SocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-67"/>
         <source>Connection to proxy refused</source>
         <translation>В соединении с прокси-сервером отказано</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection to proxy closed prematurely</source>
         <translation>Соединение с прокси-сервером неожиданно закрыто</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Proxy host not found</source>
         <translation>Прокси-сервер не найден</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Connection to proxy timed out</source>
         <translation>Время на соединение с прокси-сервером истекло</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Proxy authentication failed</source>
         <translation>Не удалось авторизоваться на прокси-сервере</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Proxy authentication failed: %1</source>
         <translation>Не удалось авторизоваться на прокси-сервере: %1</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>SOCKS version 5 protocol error</source>
         <translation>Ошибка протокола SOCKSv5</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>General SOCKSv5 server failure</source>
         <translation>Ошибка сервере SOCKSv5</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection not allowed by SOCKSv5 server</source>
         <translation>Соединение не разрешено сервером SOCKSv5</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>TTL expired</source>
         <translation>TTL истекло</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>SOCKSv5 command not supported</source>
         <translation>Команда SOCKSv5 не поддерживается</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Address type not supported</source>
         <translation>Тип адреса не поддерживается</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unknown SOCKSv5 proxy error code 0x%1</source>
         <translation>Неизвестная ошибка SOCKSv5 прокси (код 0x%1)</translation>
     </message>
     <message>
-        <location line="+689"/>
         <source>Network operation timed out</source>
         <translation>Время на сетевую операцию истекло</translation>
     </message>
@@ -8023,32 +6365,26 @@ Please choose a different file name.</source>
 <context>
     <name>QSoftKeyManager</name>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+63"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select</source>
         <translation>Выбрать</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager_s60.cpp" line="+321"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
@@ -8056,12 +6392,10 @@ Please choose a different file name.</source>
 <context>
     <name>QSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-574"/>
         <source>More</source>
         <translation>Больше</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Меньше</translation>
     </message>
@@ -8069,56 +6403,42 @@ Please choose a different file name.</source>
 <context>
     <name>QSql</name>
     <message>
-        <location filename="../src/qt3support/sql/q3sqlmanager_p.cpp" line="+890"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete this record?</source>
         <translation>Удалить данную запись?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location line="-51"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="-44"/>
         <source>Insert</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Update</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save edits?</source>
         <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Confirm</source>
         <translation>Подтверждение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cancel your edits?</source>
         <translation>Отменить изменения?</translation>
     </message>
@@ -8126,177 +6446,142 @@ Please choose a different file name.</source>
 <context>
     <name>QSslSocket</name>
     <message>
-        <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+550"/>
         <source>Unable to write data: %1</source>
         <translation>Невозможно записать данные: %1</translation>
     </message>
     <message>
-        <location line="+63"/>
         <source>Unable to decrypt data: %1</source>
         <translation>Невозможно расшифровать данные: %1</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Error while reading: %1</source>
         <translation>Ошибка чтения: %1</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Error during SSL handshake: %1</source>
         <translation>Ошибка квитирования SSL: %1</translation>
     </message>
     <message>
-        <location line="-524"/>
         <source>Error creating SSL context (%1)</source>
         <translation>Ошибка создания контекста SSL: (%1)</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Invalid or empty cipher list (%1)</source>
         <translation>Некорректный или пустой список шифров (%1)</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Private key does not certify public key, %1</source>
         <translation>Закрытый ключ не соответствует открытому ключу, %1</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Error creating SSL session, %1</source>
         <translation>Ошибка создания сессии SSL, %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Error creating SSL session: %1</source>
         <translation>Ошибка создания сессии SSL: %1</translation>
     </message>
     <message>
-        <location line="-64"/>
         <source>Cannot provide a certificate with no key, %1</source>
         <translation>Невозможно предоставить сертификат без ключа, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error loading local certificate, %1</source>
         <translation>Ошибка загрузки локального сертификата, %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Error loading private key, %1</source>
         <translation>Ошибка загрузки закрытого ключа, %1</translation>
     </message>
     <message>
-        <location filename="../src/network/ssl/qsslerror.cpp" line="+213"/>
         <source>No error</source>
         <translation>Нет ошибки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The issuer certificate could not be found</source>
         <translation>Не удалось найти сертификат издателя</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate signature could not be decrypted</source>
         <translation>Не удалось расшифровать подпись сертификата</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The public key in the certificate could not be read</source>
         <translation>Не удалось прочитать открытый ключ сертификата</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The signature of the certificate is invalid</source>
         <translation>Некорректная подпись сертификата</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate is not yet valid</source>
         <translation>Срок действия сертификата ещё не наступил</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate has expired</source>
         <translation>Срок действия сертификата истёк</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate&apos;s notBefore field contains an invalid time</source>
         <translation>Поле notBefore сертификата содержит некорректное время</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate&apos;s notAfter field contains an invalid time</source>
         <translation>Поле notAfter сертификата содержит некорректное время</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The certificate is self-signed, and untrusted</source>
         <translation>Сертификат самоподписанный и не является заверенным</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
         <translation>Корневой сертификат цепочки сертификатов самоподписанный и не является заверенным</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The issuer certificate of a locally looked up certificate could not be found</source>
         <translation>Не удалось найти сертификат издателя локального сертификата</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No certificates could be verified</source>
         <translation>Не удалось проверить сертификаты</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>One of the CA certificates is invalid</source>
         <translation>Один из сертификатов центра сертификации некорректен</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The basicConstraints path length parameter has been exceeded</source>
         <translation>Превышено значение параметра длины пути поля basicConstraints сертификата</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The supplied certificate is unsuitable for this purpose</source>
         <translation>Представленный сертификат непригоден для данной цели</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The root CA certificate is not trusted for this purpose</source>
         <translation>Корневой сертификат центра сертификации не является заверенным для данной цели</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The root CA certificate is marked to reject the specified purpose</source>
         <translation>Корневой сертификат центра сертификации отмечен на отклонение для данной цели</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>Текущий сертификат издателя был отклонён, так как название темы не совпадает с названием издателя сертификата</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>Текущий сертификат издателя был отклонён, так как название издателя и серийный номер не совпадают с идентификатором ключа сертификата</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The peer did not present any certificate</source>
         <translation>Сертификат не был предоставлен</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The host name did not match any of the valid hosts for this certificate</source>
         <translation>Название узла не совпадает с допустимыми названиями узлов сертификата</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
@@ -8304,22 +6589,18 @@ Please choose a different file name.</source>
 <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>Отсутствует исходное состояние в составном состоянии &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Missing default state in history state &apos;%1&apos;</source>
         <translation>Отсутствует состояние по умолчанию в историческом состоянии &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>Нет общего предка у источника и цели перехода из состояния &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
@@ -8327,30 +6608,22 @@ Please choose a different file name.</source>
 <context>
     <name>QSystemSemaphore</name>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="-46"/>
         <source>%1: does not exist</source>
         <translation>%1: не существует</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+66"/>
         <source>%1: out of resources</source>
         <translation>%1: недостаточно ресурсов</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+4"/>
         <source>%1: permission denied</source>
         <translation>%1: доступ запрещён</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: already exists</source>
         <translation>%1: уже существует</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+3"/>
         <source>%1: unknown error %2</source>
         <translation>%1: неизвестная ошибка %2</translation>
     </message>
@@ -8358,12 +6631,10 @@ Please choose a different file name.</source>
 <context>
     <name>QTDSDriver</name>
     <message>
-        <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+595"/>
         <source>Unable to open connection</source>
         <translation>Невозможно открыть соединение</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unable to use database</source>
         <translation>Невозможно использовать базу данных</translation>
     </message>
@@ -8371,12 +6642,10 @@ Please choose a different file name.</source>
 <context>
     <name>QTabBar</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="-326"/>
         <source>Scroll Left</source>
         <translation>Прокрутить влево</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll Right</source>
         <translation>Прокрутить вправо</translation>
     </message>
@@ -8384,7 +6653,6 @@ Please choose a different file name.</source>
 <context>
     <name>QTcpServer</name>
     <message>
-        <location filename="../src/network/socket/qtcpserver.cpp" line="+292"/>
         <source>Operation on socket is not supported</source>
         <translation>Операция с сокетом не поддерживается</translation>
     </message>
@@ -8392,42 +6660,34 @@ Please choose a different file name.</source>
 <context>
     <name>QTextControl</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2046"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить действие</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Redo</source>
         <translation>&amp;Повторить действие</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy &amp;Link Location</source>
         <translation>Скопировать &amp;адрес ссылки</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Paste</source>
         <translation>В&amp;ставить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
@@ -8435,14 +6695,10 @@ Please choose a different file name.</source>
 <context>
     <name>QToolButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+310"/>
-        <location line="+6"/>
         <source>Press</source>
         <translation>Нажать</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+8"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
@@ -8450,7 +6706,6 @@ Please choose a different file name.</source>
 <context>
     <name>QUdpSocket</name>
     <message>
-        <location filename="../src/network/socket/qudpsocket.cpp" line="+189"/>
         <source>This platform does not support IPv6</source>
         <translation>Данная платформа не поддерживает IPv6</translation>
     </message>
@@ -8458,12 +6713,10 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoGroup</name>
     <message>
-        <location filename="../src/gui/util/qundogroup.cpp" line="+385"/>
         <source>Undo</source>
         <translation>Отменить действие</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Redo</source>
         <translation>Повторить действие</translation>
     </message>
@@ -8471,7 +6724,6 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoModel</name>
     <message>
-        <location filename="../src/gui/util/qundoview.cpp" line="+101"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;пусто&gt;</translation>
     </message>
@@ -8479,12 +6731,10 @@ Please choose a different file name.</source>
 <context>
     <name>QUndoStack</name>
     <message>
-        <location filename="../src/gui/util/qundostack.cpp" line="+832"/>
         <source>Undo</source>
         <translation>Отменить действие</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Redo</source>
         <translation>Повторить действие</translation>
     </message>
@@ -8492,57 +6742,46 @@ Please choose a different file name.</source>
 <context>
     <name>QUnicodeControlCharacterMenu</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+899"/>
         <source>LRM Left-to-right mark</source>
         <translation>LRM Признак написания слева направо</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLM Right-to-left mark</source>
         <translation>RLM Признак написания справа налево</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWJ Zero width joiner</source>
         <translation>ZWJ Объединяющий символ нулевой ширины</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWNJ Zero width non-joiner</source>
         <translation>ZWNJ Необъединяющий символ нулевой ширины</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWSP Zero width space</source>
         <translation>ZWSP Пробел нулевой ширины</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LRE Start of left-to-right embedding</source>
         <translation>LRE Начало встраивания написания слева направо</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLE Start of right-to-left embedding</source>
         <translation>LRE Начало встраивания написания справа налево</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LRO Start of left-to-right override</source>
         <translation>LRO Начало замены написания слева направо</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLO Start of right-to-left override</source>
         <translation>RLO Начало замены написания справа налево</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PDF Pop directional formatting</source>
         <translation>PDF Признак окончания написания с другим направлением</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Insert Unicode control character</source>
         <translation>Вставить управляющий символ Unicode</translation>
     </message>
@@ -8550,32 +6789,26 @@ Please choose a different file name.</source>
 <context>
     <name>QWebFrame</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+753"/>
         <source>Request cancelled</source>
         <translation>Запрос отменён</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Request blocked</source>
         <translation>Запрос блокирован</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cannot show URL</source>
         <translation>Невозможно отобразить URL</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Frame load interrupted by policy change</source>
         <translation>Загрузка фрейма прервана изменением политики</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot show mimetype</source>
         <translation>Невозможно отобразить тип MIME</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File does not exist</source>
         <translation>Файл не существует</translation>
     </message>
@@ -8583,858 +6816,705 @@ Please choose a different file name.</source>
 <context>
     <name>QWebPage</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp" line="+248"/>
         <source>Web Inspector - %2</source>
         <translation>Web-инспектор  - %2</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+347"/>
         <source>Redirection limit reached</source>
         <translation>Достигнут предел переадресации</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source>Bad HTTP request</source>
         <translation>Некорректный HTTP-запрос</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp" line="+58"/>
         <source>Scroll here</source>
         <translation>Прокрутить сюда</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Left edge</source>
         <translation>К левой границе</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
         <translation>Вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
         <translation>К правой границе</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>Вниз</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page left</source>
         <translation>На страницу влево</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
         <translation>На страницу вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>На страницу вправо</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
         <translation>На страницу вниз</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Scroll left</source>
         <translation>Прокрутить влево</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Прокрутить вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Прокрутить вправо</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Прокрутить вниз</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1979"/>
         <source>JavaScript Alert - %1</source>
         <translation>JavaScript: Предупреждение - %1</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>JavaScript Confirm - %1</source>
         <translation>JavaScript: Подтверждение - %1</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>JavaScript Prompt - %1</source>
         <translation>JavaScript: Запрос - %1</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>JavaScript Problem - %1</source>
         <translation>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>Сбой выполнения сценария на данной странице. Желаете остановить выполение сценария?</translation>
     </message>
     <message>
-        <location line="+376"/>
         <source>Move the cursor to the next character</source>
         <translation>Переместить указатель к следующему символу</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous character</source>
         <translation>Переместить указатель к предыдущему символу</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next word</source>
         <translation>Переместить указатель к следующему слову</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous word</source>
         <translation>Переместить указатель к предыдущему слову</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next line</source>
         <translation>Переместить указатель на следующую строку</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous line</source>
         <translation>Переместить указатель на предыдущую строку</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the line</source>
         <translation>Переместить указатель в начало строки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the line</source>
         <translation>Переместить указатель в конец строки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the block</source>
         <translation>Переместить указатель в начало блока</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the block</source>
         <translation>Переместить указатель в конец блока</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the document</source>
         <translation>Переместить указатель в начало документа</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the document</source>
         <translation>Переместить указатель в конец документа</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select all</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next character</source>
         <translation>Выделить до следующего символа</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous character</source>
         <translation>Выделить до предыдущего символа</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next word</source>
         <translation>Выделить до следующего слова</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous word</source>
         <translation>Выделить до предыдущего слова</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next line</source>
         <translation>Выделить до следующей строки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous line</source>
         <translation>Выделить до предыдущей строки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the line</source>
         <translation>Выделить до начала строки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the line</source>
         <translation>Выделить до конца строки</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the block</source>
         <translation>Выделить до начала блока</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the block</source>
         <translation>Выделить до конца блока</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the document</source>
         <translation>Выделить до начала документа</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the document</source>
         <translation>Выделить до конца документа</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the start of the word</source>
         <translation>Удалить до начала слова</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the end of the word</source>
         <translation>Удалить до конца слова</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Insert a new paragraph</source>
         <translation>Вставить новый параграф</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert a new line</source>
         <translation>Вставить новую строку</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste and Match Style</source>
         <translation>Вставить, сохранив стиль</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Remove formatting</source>
         <translation>Удалить форматирование</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Strikethrough</source>
         <translation>Зачёркнутый</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Subscript</source>
         <translation>Подстрочный</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Superscript</source>
         <translation>Надстрочный</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Bulleted List</source>
         <translation>Вставить маркированный список</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Numbered List</source>
         <translation>Вставить нумерованный список</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Indent</source>
         <translation>Увеличить отступ</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Outdent</source>
         <translation>Уменьшить отступ</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Center</source>
         <translation>По центру</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Justify</source>
         <translation>По ширине</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Align Left</source>
         <translation>По левому краю</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Align Right</source>
         <translation>По правому краю</translation>
     </message>
     <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>Отправить</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>Отправить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reset</source>
         <comment>default label for Reset buttons in forms on web pages</comment>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location line="+11"/>
         <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>Индекс поиска. Введите ключевые слова для поиска: </translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Choose File</source>
         <comment>title for file button used in HTML forms</comment>
         <translation>Обзор...</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>Файл не указан</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open in New Window</source>
         <comment>Open in New Window context menu item</comment>
         <translation>Открыть в новом окне</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Save Link...</source>
         <comment>Download Linked File context menu item</comment>
         <translation>Сохранить по ссылке как...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy Link</source>
         <comment>Copy Link context menu item</comment>
         <translation>Копировать адрес ссылки</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Image</source>
         <comment>Open Image in New Window context menu item</comment>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Save Image</source>
         <comment>Download Image context menu item</comment>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy Image</source>
         <comment>Copy Link context menu item</comment>
-        <translation>Копировать изображение в буффер обмена</translation>
+        <translation>Копировать изображение</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Frame</source>
         <comment>Open Frame in New Window context menu item</comment>
         <translation>Открыть фрейм</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy</source>
         <comment>Copy context menu item</comment>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Go Back</source>
         <comment>Back context menu item</comment>
         <translation>Назад</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Go Forward</source>
         <comment>Forward context menu item</comment>
         <translation>Вперёд</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Stop</source>
         <comment>Stop context menu item</comment>
         <translation>Остановить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reload</source>
         <comment>Reload context menu item</comment>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
         <comment>Cut context menu item</comment>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Paste</source>
         <comment>Paste context menu item</comment>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>No Guesses Found</source>
         <comment>No Guesses Found context menu item</comment>
         <translation type="unfinished">Совпадений не найдено</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Ignore</source>
         <comment>Ignore Spelling context menu item</comment>
         <translatorcomment>?Пропускать</translatorcomment>
         <translation type="unfinished">Пропустить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Add To Dictionary</source>
         <comment>Learn Spelling context menu item</comment>
         <translation>Добавить в словарь</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Search The Web</source>
         <comment>Search The Web context menu item</comment>
         <translation type="unfinished">Искать в Интернет</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Look Up In Dictionary</source>
         <comment>Look Up in Dictionary context menu item</comment>
         <translation type="unfinished">Искать в словаре</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Link</source>
         <comment>Open Link context menu item</comment>
         <translation>Открыть ссылку</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Ignore</source>
         <comment>Ignore Grammar context menu item</comment>
         <translatorcomment>?Пропускать</translatorcomment>
         <translation type="unfinished">Пропустить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Spelling</source>
         <comment>Spelling and Grammar context sub-menu item</comment>
         <translation>Орфография</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Show Spelling and Grammar</source>
         <comment>menu item title</comment>
         <translation type="unfinished">Показать панель проверки правописания</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Spelling and Grammar</source>
         <comment>menu item title</comment>
         <translation type="unfinished">Скрыть панель проверки правописания</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Spelling</source>
         <comment>Check spelling context menu item</comment>
         <translation>Проверка орфографии</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Spelling While Typing</source>
         <comment>Check spelling while typing context menu item</comment>
         <translation>Проверять орфографию при наборе текста</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Grammar With Spelling</source>
         <comment>Check grammar with spelling context menu item</comment>
         <translation>Проверять грамматику с орфографией</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Fonts</source>
         <comment>Font context sub-menu item</comment>
         <translation>Шрифты</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Bold</source>
         <comment>Bold context menu item</comment>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Italic</source>
         <comment>Italic context menu item</comment>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Underline</source>
         <comment>Underline context menu item</comment>
         <translation>Подчёркнутый</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Outline</source>
         <comment>Outline context menu item</comment>
         <translation>Перечёркнутый</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Direction</source>
         <comment>Writing direction context sub-menu item</comment>
         <translation>Направление письма</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Text Direction</source>
         <comment>Text direction context sub-menu item</comment>
         <translation>Направление текста</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Default</source>
         <comment>Default writing direction context menu item</comment>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Left to Right</source>
         <comment>Left to Right context menu item</comment>
         <translation>Слева направо</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Right to Left</source>
         <comment>Right to Left context menu item</comment>
         <translation>Справа налево</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Inspect</source>
         <comment>Inspect Element context menu item</comment>
         <translation>Проверить</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>История поиска пуста</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>История поиска</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>Очистить историю поиска</translation>
     </message>
     <message>
-        <location line="+80"/>
         <source>Missing Plug-in</source>
         <comment>Label text to be used when a plug-in is missing</comment>
         <translation>Модуль отсутствует</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Unknown</source>
         <comment>Unknown filesize FTP directory listing item</comment>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 (%2x%3 pixels)</source>
         <comment>Title string for images</comment>
         <translation>%1 (%2x%3 px)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Loading...</source>
         <comment>Media controller status message when the media is loading</comment>
         <translation>Загрузка...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Live Broadcast</source>
         <comment>Media controller status message when watching a live broadcast</comment>
         <translation>Потоковое вещание</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Audio Element</source>
         <comment>Media controller element</comment>
         <translation>Аудио-элемент</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video Element</source>
         <comment>Media controller element</comment>
         <translation>Видео-элемент</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mute Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Отключить звук&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unmute Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Включить звук&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Play Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Воспроизведение&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pause Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Пауза&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Slider</source>
         <comment>Media controller element</comment>
         <translation>Регулятор</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Slider Thumb</source>
         <comment>Media controller element</comment>
         <translation>Указатель регулятора</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rewind Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Перемотка назад&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Return to Real-time Button</source>
         <comment>Media controller element</comment>
         <translation type="unfinished">Кнопка &quot;Вернуть в реальное время&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Elapsed Time</source>
         <comment>Media controller element</comment>
         <translation>Прошло времени</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remaining Time</source>
         <comment>Media controller element</comment>
         <translation>Осталось времени</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Status Display</source>
         <comment>Media controller element</comment>
         <translation>Отображение состояния</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Fullscreen Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;На весь экран&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek Forward Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Перемотка вперёд&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek Back Button</source>
         <comment>Media controller element</comment>
         <translation>Кнопка &quot;Перемотка назад&quot;</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Audio element playback controls and status display</source>
         <comment>Media controller element</comment>
         <translation>Элементы управления воспроизведением звука и отображением состояния</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video element playback controls and status display</source>
         <comment>Media controller element</comment>
         <translation>Элементы управления воспроизведением видео и отображением состояния</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mute audio tracks</source>
         <comment>Media controller element</comment>
         <translation>Отключить звуковые дорожки</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unmute audio tracks</source>
         <comment>Media controller element</comment>
         <translation>Включить звуковые дорожки</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Begin playback</source>
         <comment>Media controller element</comment>
         <translation>Начать воспроизведение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pause playback</source>
         <comment>Media controller element</comment>
         <translation>Приостановить воспроизведение</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Movie time scrubber</source>
         <comment>Media controller element</comment>
         <translation type="unfinished">Перемотка</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Movie time scrubber thumb</source>
         <comment>Media controller element</comment>
         <translation type="unfinished">Позиция перемотки</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rewind movie</source>
         <comment>Media controller element</comment>
         <translation>Перемотка в начало</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Return streaming movie to real-time</source>
         <comment>Media controller element</comment>
         <translation type="unfinished">Возвращает потоковое видео к воспроизведению в реальном времени</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Current movie time</source>
         <comment>Media controller element</comment>
         <translation>Текущее время фильма</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remaining movie time</source>
         <comment>Media controller element</comment>
         <translation>Оставшееся время фильма</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Current movie status</source>
         <comment>Media controller element</comment>
         <translation>Текущее состояние фильма</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Play movie in full-screen mode</source>
         <comment>Media controller element</comment>
-        <translation>Воспроизведение фильма в режиме отображения на весь экран</translation>
+        <translation>Воспроизведение в режиме отображения на весь экран</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek quickly back</source>
         <comment>Media controller element</comment>
         <translation>Быстрая перемотка назад</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek quickly forward</source>
         <comment>Media controller element</comment>
         <translation>Быстрая перемотка вперёд</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Indefinite time</source>
         <comment>Media time description</comment>
         <translation>Время не определено</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 days %2 hours %3 minutes %4 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 дней %2 часов %3 минут %4 секунд</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 hours %2 minutes %3 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 часов %2 минут %3 секунд</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 minutes %2 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 минут %2 секунд</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>%1 seconds</source>
         <comment>Media time description</comment>
         <translation>%1 секунд</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>
@@ -9447,7 +7527,6 @@ Please choose a different file name.</source>
 <context>
     <name>QWhatsThisAction</name>
     <message>
-        <location filename="../src/gui/kernel/qwhatsthis.cpp" line="+527"/>
         <source>What&apos;s This?</source>
         <translation>Что это?</translation>
     </message>
@@ -9455,7 +7534,6 @@ Please choose a different file name.</source>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5802"/>
         <source>*</source>
         <translation>*</translation>
     </message>
@@ -9463,57 +7541,46 @@ Please choose a different file name.</source>
 <context>
     <name>QWizard</name>
     <message>
-        <location filename="../src/gui/dialogs/qwizard.cpp" line="+701"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Назад</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Finish</source>
         <translation>&amp;Завершить</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>Go Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Commit</source>
         <translation>Передать</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>&amp;Next</source>
         <translation>&amp;Далее</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Далее &gt;</translation>
     </message>
@@ -9521,69 +7588,54 @@ Please choose a different file name.</source>
 <context>
     <name>QWorkspace</name>
     <message>
-        <location filename="../src/gui/widgets/qworkspace.cpp" line="+1089"/>
         <source>&amp;Restore</source>
         <translation>&amp;Восстановить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Move</source>
         <translation>&amp;Переместить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Размер</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mi&amp;nimize</source>
         <translation>&amp;Свернуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>Р&amp;аспахнуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stay on &amp;Top</source>
         <translation>Оставаться &amp;сверху</translation>
     </message>
     <message>
-        <location line="-988"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Restore Down</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+993"/>
-        <location line="+1059"/>
         <source>Sh&amp;ade</source>
         <translation>Св&amp;ернуть в заголовок</translation>
     </message>
     <message>
-        <location line="-278"/>
-        <location line="+60"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
     <message>
-        <location line="+214"/>
         <source>&amp;Unshade</source>
         <translation>В&amp;осстановить из заголовка</translation>
     </message>
@@ -9591,117 +7643,94 @@ Please choose a different file name.</source>
 <context>
     <name>QXml</name>
     <message>
-        <location filename="../src/xml/sax/qxml.cpp" line="+58"/>
         <source>no error occurred</source>
         <translation>ошибки отсутствуют</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error triggered by consumer</source>
         <translation>ошибка вызвана пользователем</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected end of file</source>
         <translation>неожиданный конец файла</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>more than one document type definition</source>
         <translation>указано более одного типа документа</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing element</source>
         <translation>ошибка разбора элемента</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>tag mismatch</source>
         <translation>тэг не совпадает</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing content</source>
         <translation>ошибка разбора документа</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected character</source>
         <translation>неожиданный символ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid name for processing instruction</source>
         <translation>некорректное имя директивы разбора</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>version expected while reading the XML declaration</source>
         <translation>в объявлении XML ожидается параметр version</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>wrong value for standalone declaration</source>
         <translation>некорректное значение параметра standalone</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>error occurred while parsing document type definition</source>
         <translation>ошибка разбора объявления типа документа</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>letter is expected</source>
         <translation>ожидалась буква</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing comment</source>
         <translation>ошибка разбора комментария</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing reference</source>
         <translation>ошибка разбора ссылки</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>internal general entity reference not allowed in DTD</source>
         <translation>внутренняя ссылка на общий объект недопустима в DTD</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in attribute value</source>
         <translation>внешняя ссылка на общий объект недопустима в значении атрибута</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in DTD</source>
         <translation>внешняя ссылка на общий объект недопустима в DTD</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unparsed entity reference in wrong context</source>
         <translation>неразобранная ссылка на объект в неправильном контексте</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>recursive entities</source>
         <translation>рекурсивные объекты</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error in the text declaration of an external entity</source>
         <translation>ошибка в объявлении внешнего объекта</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
         <translation>в объявлении XML ожидаются параметры encoding или standalone</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>standalone declaration expected while reading the XML declaration</source>
         <translation>в объявлении XML ожидается параметр standalone</translation>
     </message>
@@ -9709,27 +7738,22 @@ Please choose a different file name.</source>
 <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>Предупреждение в %1, в строке %2, столбце %3: %4</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Warning in %1: %2</source>
         <translation>Предупреждение в %1: %2</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Unknown location</source>
         <translation>Неизвестное расположение</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Error %1 in %2, at line %3, column %4: %5</source>
         <translation>Ошибка %1 в %2, в строке %3, столбце %4: %5</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Error %1 in %2: %3</source>
         <translation>Ошибка %1 в %2: %3</translation>
     </message>
@@ -9737,184 +7761,142 @@ Please choose a different file name.</source>
 <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>Лишние данные в конце документа.</translation>
     </message>
     <message>
-        <location line="+271"/>
         <source>Invalid entity value.</source>
         <translation>Некорректное значение объекта.</translation>
     </message>
     <message>
-        <location line="+109"/>
         <source>Invalid XML character.</source>
         <translation>Некорректный символ XML.</translation>
     </message>
     <message>
-        <location line="+259"/>
         <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
         <translation>Последовательность &quot;]]&gt;&quot; недопустима в содержимом.</translation>
     </message>
     <message>
-        <location line="+309"/>
         <source>Namespace prefix &apos;%1&apos; not declared</source>
         <translation>Префикс пространства имён &quot;%1&quot; не объявлен</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>Attribute redefined.</source>
         <translation>Атрибут переопределён.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unexpected character &apos;%1&apos; in public id literal.</source>
         <translation>Неожиданный символ &quot;%1&quot; в литерале открытого идентификатора.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Invalid XML version string.</source>
         <translation>Некорректная строка версии XML.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unsupported XML version.</source>
         <translation>Неподдерживаемая версия XML.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>%1 is an invalid encoding name.</source>
         <translation>%1 - не является корректным названием кодировки.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Encoding %1 is unsupported</source>
         <translation>Кодировка %1 не поддерживается</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Standalone accepts only yes or no.</source>
         <translation>Псевдоатрибут &quot;standalone&quot; может принимать только значения &quot;yes&quot; или &quot;no&quot;.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid attribute in XML declaration.</source>
         <translation>Некорректный атрибут в объявлении XML.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Premature end of document.</source>
         <translation>Неожиданный конец документа.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid document.</source>
         <translation>Некорректный документ.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Expected </source>
         <translation>Ожидалось </translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>, but got &apos;</source>
         <translation>, получили &apos;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unexpected &apos;</source>
         <translation>Неожиданное &apos;</translation>
     </message>
     <message>
-        <location line="+225"/>
         <source>Expected character data.</source>
         <translation>Ожидаются символьные данные.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="-995"/>
         <source>Recursive entity detected.</source>
         <translation>Обнаружен рекурсивный объект.</translation>
     </message>
     <message>
-        <location line="+516"/>
         <source>Start tag expected.</source>
         <translation>Ожидается открывающий тэг.</translation>
     </message>
     <message>
-        <location line="+222"/>
         <source>XML declaration not at start of document.</source>
         <translation>Объявление XML находится не в начале документа.</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>NDATA in parameter entity declaration.</source>
         <translation>NDATA в объявлении параметра.</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>%1 is an invalid processing instruction name.</source>
         <translation>%1 не является корректным названием обрабатываемой инструкции.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Invalid processing instruction name.</source>
         <translation>Некорректное название обрабатываемой инструкции.</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>Некорректное объявление пространства имён.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+15"/>
         <source>Invalid XML name.</source>
         <translation>Некорректное имя XML.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Opening and ending tag mismatch.</source>
         <translation>Открывающий тэг не совпадает с закрывающим.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Reference to unparsed entity &apos;%1&apos;.</source>
         <translation>Ссылка на необработанный объект &quot;%1&quot;.</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location line="+61"/>
-        <location line="+40"/>
         <source>Entity &apos;%1&apos; not declared.</source>
         <translation>Объект &quot;%1&quot; не объявлен.</translation>
     </message>
     <message>
-        <location line="-26"/>
         <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
         <translation>Ссылка на внешний объект &quot;%1&quot; в значении атрибута.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Invalid character reference.</source>
         <translation>Некорректная символьная ссылка.</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>Обнаружено некорректно закодированное содержимое.</translation>
     </message>
     <message>
-        <location line="+274"/>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
         <translation>Псевдоатрибут &quot;standalone&quot; должен находиться после указания кодировки.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+562"/>
         <source>%1 is an invalid PUBLIC identifier.</source>
         <translation>%1 - некорректный идентификатор PUBLIC.</translation>
     </message>
@@ -9922,702 +7904,558 @@ Please choose a different file name.</source>
 <context>
     <name>QtXmlPatterns</name>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractduration.cpp" line="+99"/>
-        <location line="+15"/>
         <source>At least one component must be present.</source>
         <translation>Должна присутствовать как минимум одна компонента.</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 не является правильным значением типа %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>При преобразовании %2 в %1 исходное значение не может быть %3.</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>Булево значение не может быть вычислено для последовательностей, которые содержат два и более атомарных значения.</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>Данные обрабатываемой инструкции не могут содержать строку &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor_p.h" line="+168"/>
-        <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+69"/>
         <source>%1 is an invalid %2</source>
         <translation>%1 некоррекно для %2</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 недопустим для XML 1.0.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qerrorfn.cpp" line="+61"/>
         <source>%1 was called.</source>
         <translation>%1 было вызвано.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="+133"/>
         <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
         <translation>В замещаемой строке &quot;%1&quot; должно сопровождаться как минимум одной цифрой, если неэкранировано.</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>В замещаемой строке символ &quot;%1&quot; может использоваться только для экранирования самого себя или &quot;%2&quot;, но не &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="+92"/>
         <source>%1 matches newline characters</source>
         <translation>%1 соответствует символам конца строки</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Matches are case insensitive</source>
         <translation>Соответствия регистронезависимы</translation>
     </message>
     <message>
-        <location line="+104"/>
         <source>%1 is an invalid regular expression pattern: %2</source>
         <translation>%1 - некорректный шаблон регулярного выражения: %2</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+346"/>
         <source>It will not be possible to retrieve %1.</source>
         <translation>Будет невозможно восстановить %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencegeneratingfns.cpp" line="+266"/>
         <source>The default collection is undefined</source>
         <translation>Набор по умолчанию не определён</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>%1 cannot be retrieved</source>
         <translation>%1 не может быть восстановлен</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>Элемент %1 не соответствует необходимому типу %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 является схемой неизвестного типа.</translation>
     </message>
     <message>
-        <location line="-7254"/>
         <source>A template with name %1 has already been declared.</source>
         <translation>Шаблон с именем %1 уже был объявлен.</translation>
     </message>
     <message>
-        <location line="+213"/>
         <source>Only one %1 declaration can occur in the query prolog.</source>
         <translation>Только одно объявление %1 может присутствовать в прологе запроса.</translation>
     </message>
     <message>
-        <location line="+188"/>
         <source>The initialization of variable %1 depends on itself</source>
         <translation>Инициализация переменной %1 зависит от себя самой</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qparsercontext.cpp" line="+93"/>
         <source>The variable %1 is unused</source>
         <translation>Переменная %1 не используется</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>Версия %1 не поддерживается. Поддерживается XQuery версии 1.0.</translation>
     </message>
     <message>
-        <location line="+71"/>
         <source>No function with signature %1 is available</source>
         <translation>Функция с сигнатурой %1 отсутствует</translation>
     </message>
     <message>
-        <location line="+303"/>
         <source>It is not possible to redeclare prefix %1.</source>
         <translation>Невозможно переопределить префикс %1.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Prefix %1 is already declared in the prolog.</source>
         <translation>Префикс %1 уже объявлен в прологе.</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>Название опции должно содержать префикс. Нет пространства имён по умолчанию для опций.</translation>
     </message>
     <message>
-        <location line="+171"/>
         <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
         <translation>Возможность импорта схем не поддерживается, следовательно, объявлений %1 быть не должно.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>The target namespace of a %1 cannot be empty.</source>
         <translation>Целевое пространство имён %1 не может быть пустым.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The module import feature is not supported</source>
         <translation>Возможность импорта модулей не поддерживается</translation>
     </message>
     <message>
-        <location line="+178"/>
         <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>Пространство имён пользовательской функции в модуле библиотеки должен соответствовать пространству имён модуля. Другими словами, он должен быть %1 вместо %2</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>A function already exists with the signature %1.</source>
         <translation>Функция с сигнатурой %1 уже существует.</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>Внешние функции не поддерживаются. Все поддерживаемые функции могут использоваться напрямую без первоначального объявления их в качестве внешних</translation>
     </message>
     <message>
-        <location line="+1709"/>
         <source>The %1-axis is unsupported in XQuery</source>
         <translation>Ось %1 не поддерживается в XQuery</translation>
     </message>
     <message>
-        <location line="+435"/>
         <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
         <translation>URI пространства имён не может быть пустой строкой при связывании с префиксом %1.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 is an invalid namespace URI.</source>
         <translation>%1 - некорректный URI пространства имён.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>It is not possible to bind to the prefix %1</source>
         <translation>Невозможно связать с префиксом %1</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Two namespace declaration attributes have the same name: %1.</source>
         <translation>Два атрибута объявления пространств имён имеют одинаковое имя: %1.</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
         <translation>URI пространства имён должен быть константой и не может содержать выражений.</translation>
     </message>
     <message>
-        <location line="+699"/>
-        <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 является объявлением атрибута вне области объявлений. Имейте в виду, возможность импорта схем не поддерживается.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qcardinality.cpp" line="+55"/>
         <source>empty</source>
         <translation>пусто</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or one</source>
         <translation>нуль или один</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>exactly one</source>
         <translation>ровно один</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>one or more</source>
         <translation>один или более</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or more</source>
         <translation>нуль или более</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="+156"/>
         <source>The focus is undefined.</source>
         <translation>Фокус не определён.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/utils/qoutputvalidator.cpp" line="+93"/>
         <source>An attribute by name %1 has already been created.</source>
         <translation>Атрибут с именем %1 уже существует.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qiodevicedelegate.cpp" line="+84"/>
         <source>Network timeout.</source>
         <translation>Время ожидания сети истекло.</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>Элемент %1 не может быть сериализован, так как расположен вне документа.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractdatetime.cpp" line="+80"/>
         <source>Year %1 is invalid because it begins with %2.</source>
         <translation>Год %1 неверен, так как начинается с %2.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Day %1 is outside the range %2..%3.</source>
         <translation>День %1 вне диапазона %2..%3.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Month %1 is outside the range %2..%3.</source>
         <translation>Месяц %1 вне диапазона %2..%3.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Overflow: Can&apos;t represent date %1.</source>
         <translation>Переполнение: Не удаётся представить дату %1.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Day %1 is invalid for month %2.</source>
         <translation>День %1 неверен для месяца %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>Время 24:%1:%2.%3 некорректно. 24 часа, но минуты, секунды и/или миллисекунды отличны от 0; </translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Time %1:%2:%3.%4 is invalid.</source>
         <translation>Время %1:%2:%3.%4 некорректно.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Overflow: Date can&apos;t be represented.</source>
         <translation>Переполнение: невозможно представить дату.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractduration.cpp" line="-7"/>
         <source>At least one time component must appear after the %1-delimiter.</source>
         <translation>Как минимум одна компонента времени должна следовать за разделителем &apos;%1&apos;.</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>Деление числа типа %1 на %2 (не числовое выражение) недопустимо.</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>Деление числа типа %1 на %2 или %3 (плюс или минус нуль) недопустимо.</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>Умножение числа типа %1 на %2 или %3 (плюс-минус бесконечность) недопустимо.</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>Значение типа %1 не может быть булевым значением.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qderivedinteger_p.h" line="+402"/>
         <source>Value %1 of type %2 exceeds maximum (%3).</source>
         <translation>Значение %1 типа %2 больше максимума (%3).</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Value %1 of type %2 is below minimum (%3).</source>
         <translation>Значение %1 типа %2 меньше минимума (%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>Значение типа %1 должно содержать четное количество цифр. Значение %2 этому требованию не удовлетворяет.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>%1 is not valid as a value of type %2.</source>
         <translation>Значение %1 некорректно для типа %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qarithmeticexpression.cpp" line="+207"/>
         <source>Operator %1 cannot be used on type %2.</source>
         <translation>Оператор %1 не может использоваться для типа %2.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
         <translation>Оператор %1 не может использоваться для атомарных значений типов %2 и %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>URI пространства имён в названии рассчитываемого атрибута не может быть %1.</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>Название расчитываемого атрибута не может иметь URI пространства имён %1 с локальным именем %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+88"/>
         <source>Type error in cast, expected %1, received %2.</source>
         <translation>Ошибка типов в преобразовании, ожидалось %1, получено %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>При преобразовании в %1 или производные от него типы исходное значение должно быть того же типа или строковым литералом. Тип %2 недопустим.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+67"/>
         <source>A comment cannot contain %1</source>
         <translation>Комментарий не может содержать %1</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>A comment cannot end with a %1.</source>
         <translation>Комментарий не может оканчиваться на %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>Узел-атрибут не может быть потомком узла-документа. Атрибут %1 неуместен.</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>Модуль библиотеки не может использоваться напрямую. Он должен быть импортирован из основного модуля.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>No template by name %1 exists.</source>
         <translation>Шаблон с именем %1 отсутствует.</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>Значение типа %1 не может быть условием. Условием могут являться числовой и булевый типы.</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>A positional predicate must evaluate to a single numeric value.</source>
         <translation>Позиционный предикат должен вычисляться как числовое выражение.</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>Целевое имя в обрабатываемой инструкции не может быть %1 в любой комбинации нижнего и верхнего регистров. Имя %2 некорректно.</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 некорректное целевое имя в обрабатываемой инструкции. Имя должно быть значением типа %2, например: %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>Последняя часть пути должна содержать узлы или атомарные значения, но не может содержать и то, и другое одновременно.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor.cpp" line="+82"/>
         <source>No namespace binding exists for the prefix %1</source>
         <translation>Отсутствует привязка к пространству имён для префикса %1</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor_p.h" line="-12"/>
         <source>No namespace binding exists for the prefix %1 in %2</source>
         <translation>Отсутствует привязка к пространству имён для префикса %1 в %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>Первый аргумент %1 не может быть типа %2. Он должен быть числового типа, типа xs:yearMonthDuration или типа 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>Первый аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %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>Второй аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5.</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>Если оба значения имеют региональные смещения, смещения должны быть одинаковы. %1 и %2 не одинаковы.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="-65"/>
         <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source>
         <translation>&quot;%1&quot; должно сопровождаться &quot;%2&quot; или &quot;%3&quot;, но не в конце замещаемой строки.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="-110"/>
         <source>%1 and %2 match the start and end of a line.</source>
         <translation>%1 и %2 соответствуют началу и концу строки.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Whitespace characters are removed, except when they appear in character classes</source>
         <translation>Символы пробелов удалены (за исключением тех, что были в символах классов)</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
         <translation>%1 - некорректный флаг регулярного выражения. Допустимые флаги:</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>Префикс не должен быть указан, если первый параметр - пустая последовательность или пустая строка (вне пространства имён). Был указан префикс %1.</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>Форма нормализации %1 не поддерживается. Поддерживаются только %2, %3, %4, %5 и пустая, т.е. пустая строка (без нормализации).</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>Региональное смещение должно быть в переделах от %1 до %2 включительно. %3 выходит за допустимые пределы.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/janitors/qcardinalityverifier.cpp" line="+58"/>
         <source>Required cardinality is %1; got cardinality %2.</source>
         <translation>Необходимо %1 элементов, получено %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="-3944"/>
         <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>Имя кодировки %1 некорректно. Имя кодировки должно содержать только символы латиницы без пробелов и должно удовлетворять регулярному выражению %2.</translation>
     </message>
     <message>
-        <location line="+260"/>
         <source>The keyword %1 cannot occur with any other mode name.</source>
         <translation>Ключевое слово %1 не может встречаться с любым другим названием режима.</translation>
     </message>
     <message>
-        <location line="-3117"/>
         <source>No variable with name %1 exists</source>
         <translation>Переменная с именем %1 отсутствует</translation>
     </message>
     <message>
-        <location line="+3146"/>
         <source>The value of attribute %1 must be of type %2, which %3 isn&apos;t.</source>
         <translation>Значение атрибута %1 должно быть типа %2, но %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>Не удаётся связать префикс %1. По умолчанию префикс связан с пространством имён %2.</translation>
     </message>
     <message>
-        <location line="+312"/>
         <source>A variable with name %1 has already been declared.</source>
         <translation>Переменная с именем %1 уже объявлена.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>No value is available for the external variable with name %1.</source>
         <translation>Отсутствует значение для внешней переменной с именем %1.</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>A stylesheet function must have a prefixed name.</source>
         <translation>Функция стилей должна иметь имя с префиксом.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <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>Пространтсво имён %1 зарезервировано, поэтому пользовательские функции не могут его использовать. Попробуйте предопределённый префикс %2, который существует для подобных ситуаций.</translation>
     </message>
     <message>
-        <location line="+106"/>
         <source>An argument with name %1 has already been declared. Every argument name must be unique.</source>
         <translation>Аргумент с именем %1 уже объявлен. Имя каждого аргумента должно быть уникальным.</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>Если функция %1 используется для сравнения внутри шаблона, аргумент должен быть ссылкой на переменную или строковым литералом.</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>В шаблоне XSL-T первый аргумент функции %1 должен быть строковым литералом, если функция используется для сравнения.</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>В шаблоне XSL-T первый аргумент функции %1 должен быть литералом или ссылкой на переменную, если функция используется для сравнения.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
         <translation>В шаблоне XSL-T у функции %1 не должно быть третьего аргумента.</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>В шаблоне XSL-T только функции %1 и %2 могут использоваться для сравнения, но не %3.</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>В шаблоне XSL-T не может быть использована ось %1 - только оси %2 или %3.</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 is an invalid template mode name.</source>
         <translation>%1 не является корректным шаблоном имени режима.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <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>Имя переменной, связанной с выражением for, должно отличаться от позиционной переменной. Две переменные с именем %1 конфликтуют.</translation>
     </message>
     <message>
-        <location line="+778"/>
         <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
         <translation>Возможность проверки по схеме не поддерживается. Выражения %1 не могут использоваться.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
         <translation>Ни одно из выражений pragma не поддерживается. Должно существовать запасное выражение</translation>
     </message>
     <message>
-        <location line="+269"/>
         <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
         <translation>Имя каждого параметра шаблона должно быть уникальным, но %1 повторяется.</translation>
     </message>
     <message>
-        <location line="+462"/>
         <source>No function with name %1 is available.</source>
         <translation>Функция с именем %1 отсутствует.</translation>
     </message>
     <message>
-        <location line="-6235"/>
         <source>%1 is not a valid numeric literal.</source>
         <translation>%1 не является корректным числовым литералом.</translation>
     </message>
     <message>
-        <location line="-152"/>
         <source>W3C XML Schema identity constraint selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>W3C XML Schema identity constraint field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>A construct was encountered which is disallowed in the current language(%1).</source>
         <translation>Встречена конструкция, запрещённая для текущего языка (%1).</translation>
     </message>
     <message>
-        <location line="+6502"/>
         <source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
         <translation>Пространство имён %1 может быть связано только с %2 (в данном случае уже предопределено).</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>Префикс %1 может быть связан только с %2 (в данном случае уже предопределено).</translation>
     </message>
     <message>
-        <location line="+120"/>
         <source>An attribute with name %1 has already appeared on this element.</source>
         <translation>Атрибут с именем %1 уже существует для данного элемента.</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
         <translation>Прямой конструктор элемента составлен некорректно. %1 заканчивается на %2.</translation>
     </message>
     <message>
-        <location line="+458"/>
         <source>The name %1 does not refer to any schema type.</source>
         <translation>Название %1 не соответствует ни одному типу схемы.</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 - сложный тип. Преобразование к сложным типам невозможно. Однако, преобразование к атомарным типам как %2 работает.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
         <translation>%1 - не атомарный тип. Преобразование возможно только к атомарным типам.</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>%1 is not a valid name for a processing-instruction.</source>
         <translation>%1 не является корректным названием инструкции обработки.</translation>
     </message>
     <message>
-        <location line="+188"/>
         <source>The name of an extension expression must be in a namespace.</source>
         <translation>Название выражения расширения должно быть в пространстве имён.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="-93"/>
         <source>Required type is %1, but %2 was found.</source>
         <translation>Требуется тип %1, но обнаружен %2.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Promoting %1 to %2 may cause loss of precision.</source>
         <translation>Преобразование %1 к %2 может снизить точность.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/utils/qoutputvalidator.cpp" line="-7"/>
         <source>It&apos;s not possible to add attributes after any other kind of node.</source>
         <translation>Невозможно добавлять атрибуты после любого другого вида узла.</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>Поддерживается только Unicode Codepoint Collation (%1). %2 не поддерживается.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="-180"/>
         <source>Integer division (%1) by zero (%2) is undefined.</source>
         <translation>Целочисленное деление (%1) на нуль (%2) не определено.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Division (%1) by zero (%2) is undefined.</source>
         <translation>Деление (%1) на нуль (%2) не определено.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
         <translation>Деление по модулю (%1) на нуль (%2) не определено.</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 принимает не более %n аргумента. Следовательно, %2 некорректно.</numerusform>
@@ -10626,7 +8464,6 @@ Please choose a different file name.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+11"/>
         <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source>
         <translation>
             <numerusform>%1 принимает не менее %n аргумента. Следовательно, %2 некорректно.</numerusform>
@@ -10635,1655 +8472,1258 @@ Please choose a different file name.</source>
         </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>Корневой узел второго аргумента функции %1 должен быть документом. %2 не является документом.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="-3172"/>
         <source>The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)</source>
         <translation>Пространство имён для пользовательских функций не может быть пустым (попробуйте предопределённый префикс %1, который существует для подобных ситуаций)</translation>
     </message>
     <message>
-        <location line="-693"/>
-        <location line="+10"/>
         <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
         <translation>Объявление пространство имён по умолчанию должно быть до объявления функций, переменных и опций.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace declarations must occur before function, variable, and option declarations.</source>
         <translation>Объявление пространства имён должно быть до объявления функций, переменных и опций.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Module imports must occur before function, variable, and option declarations.</source>
         <translation>Импортируемые модули должны быть указаны до объявления функций, переменных и опций.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+12"/>
         <source>%1 is not a whole number of minutes.</source>
         <translation>%1 не является полным количеством минут.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+60"/>
         <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
         <translation>Атрибут %1 не может быть сериализован, так как присутствует на верхнем уровне.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp" line="+344"/>
         <source>%1 is an unsupported encoding.</source>
         <translation>Кодировка %1 не поддерживается.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
         <translation>%1 содержит октеты, которые недопустимы в требуемой кодировке %2.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
         <translation>Символ с кодом %1, присутствующий в %2 при использовании кодировки %3, не является допустимым символом XML.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qapplytemplate.cpp" line="+119"/>
         <source>Ambiguous rule match.</source>
         <translation>Неоднозначное соответствие правилу.</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>В конструкторе пространства имён значение пространства имён не может быть пустой строкой.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The prefix must be a valid %1, which %2 is not.</source>
         <translation>Префикс должен быть корректным %1, но %2 им не является.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>The prefix %1 cannot be bound.</source>
         <translation>Префикс%1 не может быть связан.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
         <translation>Только префикс %1 может быть связан с %2 и наоборот.</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>Необходим параметр %1 , но соответствующего %2 не передано.</translation>
     </message>
     <message>
-        <location line="-71"/>
         <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
         <translation>Передан параметр %1 , но соответствующего %2 не существует.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qunparsedtextfn.cpp" line="+65"/>
         <source>The URI cannot have a fragment</source>
         <translation>URI не может содержать фрагмент</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qxslttokenizer.cpp" line="+519"/>
         <source>Element %1 is not allowed at this location.</source>
         <translation>Элемент %1 недопустим в этом месте.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Text nodes are not allowed at this location.</source>
         <translation>Текстовые узлы недопустимы в этом месте.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Parse error: %1</source>
         <translation>Ошибка разбора: %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>Значение атрибута версии XSL-T должно быть типа %1, но %2 им не является.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Running an XSL-T 1.0 stylesheet with a 2.0 processor.</source>
         <translation>Выполняется таблица стилей XSL-T 1.0 с обработчиком версии 2.0.</translation>
     </message>
     <message>
-        <location line="+108"/>
         <source>Unknown XSL-T attribute %1.</source>
         <translation>Неизвествный атрибут XSL-T %1.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 and %2 are mutually exclusive.</source>
         <translation>Атрибуты %1 и %2 взаимоисключающие.</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>In a simplified stylesheet module, attribute %1 must be present.</source>
         <translation>В модуле упрощённой таблицы стилей обязан присутствовать атрибут %1.</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
         <translation>Если элемент %1 не имеет атрибут %2, у него не может быть атрибутов %3 и %4.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Element %1 must have at least one of the attributes %2 or %3.</source>
         <translation>Элемент %1 должен иметь как минимум один из атрибутов %2 или %3.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>At least one mode must be specified in the %1-attribute on element %2.</source>
         <translation>Как минимум один режим должен быть указан в атрибуте %1 элемента %2.</translation>
     </message>
     <message>
-        <location line="+123"/>
         <source>Element %1 must come last.</source>
         <translation>Элемент %1 должен идти последним.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>At least one %1-element must occur before %2.</source>
         <translation>Как минимум один элемент %1 должен быть перед %2.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Only one %1-element can appear.</source>
         <translation>Должен быть только один элемент %1.</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>At least one %1-element must occur inside %2.</source>
         <translation>Как минимум один элемент %1 должен быть внутри %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
         <translation>Если %2 содержит атрибут %1, конструктор последовательности не может быть использован.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
         <translation>Элемент %1 должен иметь атрибут %2 или конструктор последовательности.</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>Если параметр необходим, значение по умолчание не может быть передано через атрибут %1 или конструктор последовательности.</translation>
     </message>
     <message>
-        <location line="+270"/>
         <source>Element %1 cannot have children.</source>
         <translation>Элемент %1 не может иметь потомков.</translation>
     </message>
     <message>
-        <location line="+434"/>
         <source>Element %1 cannot have a sequence constructor.</source>
         <translation type="unfinished">Элемент %1 не может иметь конструктор последовательности.</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>У %2 не может быть атрибута %1, когда он является потомком %3.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>A parameter in a function cannot be declared to be a tunnel.</source>
         <translation type="unfinished">Параметр функции не может быть объявлен туннелем.</translation>
     </message>
     <message>
-        <location line="+149"/>
         <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
         <translation type="unfinished">Данный обработчик не работает со схемами, следовательно, %1 не может использоваться.</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>Элементы верхнего уровня таблицы стилей должны быть в пространстве имен, которым %1 не является.</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>Значение атрибута %1 элемента %2 должно быть или %3, или %4, но не %5.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Attribute %1 cannot have the value %2.</source>
         <translation>Атрибут %1 не может принимать значение %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>The attribute %1 can only appear on the first %2 element.</source>
         <translation>Атрибут %1 может быть только у первого элемента %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>At least one %1 element must appear as child of %2.</source>
         <translation>Как минимум один элемент %1 должен быть в %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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+24"/>
         <source>Circular inheritance of base type %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Circular inheritance of union %1.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Base type of simple type %1 cannot be complex type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Simple type %1 cannot have direct base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location line="+9"/>
         <source>Simple type %1 is not allowed to have base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Simple type %1 can only have simple atomic type as base type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+484"/>
         <source>Variety of item type of %1 must be either atomic or union.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-474"/>
-        <location line="+483"/>
         <source>Variety of member types of %1 must be atomic.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-431"/>
         <source>Simple type %1 is only allowed to have %2 facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Base type of simple type %1 must have variety of type list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Item type of base type does not match item type of %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+93"/>
         <source>Simple type %1 contains not allowed facet type %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
         <source>%1 is not allowed to have any facets.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Base type %1 of simple type %2 must have variety of union.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Complex type %1 has duplicated element %2 in its content model.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Complex type %1 has non-deterministic content.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Complex type %1 must have simple content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Complex type %1 must have the same simple type as its base class %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Complex type %1 cannot be derived from base type %2%3.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Complex type %1 with simple content cannot be derived from complex base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Item type of simple type %1 cannot be a complex type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Member type of simple type %1 cannot be a complex type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 is not allowed to have a member type with the same name as itself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
-        <location line="+29"/>
-        <location line="+34"/>
         <source>%1 facet collides with %2 facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>%1 facet must have the same value as %2 facet of base type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>%1 facet must be equal or greater than %2 facet of base type.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-389"/>
         <source>%1 facet contains invalid regular expression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unknown notation %1 used in %2 facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1 facet contains invalid value %2: %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1 facet cannot be %2 or %3 if %4 facet of base type is %5.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>%1 facet cannot be %2 if %3 facet of base type is %4.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
-        <location line="+79"/>
         <source>%1 facet and %2 facet cannot appear together.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
-        <location line="+58"/>
         <source>%1 facet must be less than %2 facet.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Simple type contains not allowed facet %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Only %1 and %2 facets are allowed when derived by union.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <location line="+16"/>
         <source>%1 contains %2 facet with invalid data: %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Attribute group %1 contains attribute %2 twice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute group %1 contains two different attributes that both have types derived from %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Complex type %1 contains attribute %2 twice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Complex type %1 contains two different attributes that both have types derived from %2.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+11"/>
         <source>Value constraint of element %1 is not of elements type: %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Type of element %1 cannot be derived from type of substitution group affiliation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Value constraint of attribute %1 is not of attributes type: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute %1 has value constraint but has type derived from %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>%1 attribute in derived complex type must be %2 like in base type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 in derived complex type must have %2 value constraint like in base type.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Attribute %1 in derived complex type must have %2 value constraint.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>processContent of base wildcard must be weaker than derived wildcard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+15"/>
         <source>Element %1 exists twice with different types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Particle contains non-deterministic wildcards.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
         <source>Type of derived attribute %1 cannot be validly derived from type of base attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Value constraint of derived attribute %1 does not match value constraint of base attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived attribute %1 does not exist in the base definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Derived attribute %1 does not match the wildcard in the base definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Base attribute %1 is required but missing in derived definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Derived definition contains an %1 element that does not exists in the base definition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived wildcard is not a subset of the base wildcard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 of derived wildcard is not a valid restriction of %2 of base wildcard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 from base type is missing in derived type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Type of derived attribute %1 differs from type of base attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Base definition contains an %1 element that is missing in the derived definition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemaresolver.cpp" line="+354"/>
         <source>%1 references unknown %2 or %3 element %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 references identity constraint %2 that is no %3 or %4 element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 has a different number of fields from the identity constraint %2 that it references.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Base type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Item type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Member type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+415"/>
-        <location line="+30"/>
         <source>Type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-423"/>
         <source>Base type %1 of complex type cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 cannot have complex base type that has a %2.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Type of %1 element must be a simple type, %2 is not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Substitution group %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Substitution group %1 has circular definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
-        <location line="+7"/>
         <source>Duplicated element names %1 in %2 element.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
         <source>Circular group reference for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 element is not allowed in this scope</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 element cannot have %2 attribute with value other than %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 element cannot have %2 attribute with value other than %3 or %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Attribute group %1 has circular reference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>%1 attribute in %2 must have %3 use like in base type %4.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 has attribute wildcard but its base type %2 has not.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Enumeration facet contains invalid content: {%1} is not a value of type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace prefix of qualified name %1 is not defined.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdparticlechecker.cpp" line="+165"/>
         <source>Empty particle cannot be derived from non-empty particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Derived particle is missing element %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Derived element %1 is missing value constraint as defined in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived element %1 has weaker value constraint than base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Fixed value constraint of element %1 differs from value constraint in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Derived element %1 cannot be nillable as base element is not nillable.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Simple type of derived element %1 cannot be validly derived from base element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Complex type of derived element %1 cannot be validly derived from base element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Element %1 is missing in derived particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Element %1 does not match namespace constraint of wildcard in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
         <source>Derived particle allows content that is not allowed in the base particle.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 is not allowed in this scope, possible elements are: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Child element is missing in that scope, possible child elements are: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
         <source>Document is not a XML schema.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>%1 attribute of %2 element contains invalid content: {%3}.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 element without %2 attribute is not allowed inside schema without target namespace.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
         <source>%1 attribute of %2 element must be %3 or %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>%1 attribute of %2 element must have a value of %3.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-215"/>
-        <location line="+222"/>
         <source>%1 attribute of %2 element must not be %3.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
         <source>Specifying use=&apos;prohibited&apos; inside an attribute group has no effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
         <source>%1 element must have either %2 or %3 attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>%1 element must have either %2 attribute or %3 or %4 as child element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>%1 element requires either %2 or %3 attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Text or entity references not allowed inside %1 element</source>
         <translation type="unfinished">Текст или ссылка на объект недопустимы в качестве содержимого элемента %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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 element is not allowed in this context.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1 attribute of %2 element has larger value than %3 attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Prefix of qualified name %1 is not defined.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>Component with ID %1 has been defined previously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Element %1 already defined.</source>
         <translation>Элемент %1 уже определён.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 already defined.</source>
         <translation>Атрибут %1 уже определён.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Type %1 already defined.</source>
         <translation>Тип %1 уже определён.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute group %1 already defined.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Element group %1 already defined.</source>
         <translation>Группа элементов %1 уже определёна.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Notation %1 already defined.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Identity constraint %1 already defined.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Duplicated facets in simple type %1.</source>
         <translation type="unfinished"></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>
         <translation>%1 некорректно в соответствии с %2.</translation>
     </message>
     <message>
-        <location line="+167"/>
         <source>String content does not match the length facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>String content does not match the minLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>String content does not match the maxLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>String content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>String content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Signed integer content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Signed integer content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Signed integer content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Signed integer content does not match in the totalDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unsigned integer content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Unsigned integer content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Unsigned integer content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unsigned integer content does not match in the totalDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Double content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Double content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Double content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Decimal content does not match in the fractionDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Decimal content does not match in the totalDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Date time content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Date time content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Date time content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Duration content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Duration content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Duration content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Boolean content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Binary content does not match the length facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Binary content does not match the minLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Binary content does not match the maxLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Binary content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Invalid QName content: %1.</source>
         <translation>Некорректное содержимое QName: %1.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>QName content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>QName content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Notation content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>List content does not match length facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>List content does not match minLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>List content does not match maxLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>List content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>List content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Union content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Union content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Data of type %1 are not allowed to be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp" line="+160"/>
         <source>Element %1 is missing child element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>There is one IDREF value with no corresponding ID: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Loaded schema file is invalid.</source>
         <translation>Загруженный файл схемы некорректен.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains invalid data.</source>
         <translation>%1 содержит некорректные данные.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.</source>
         <translation type="unfinished">Пространство имён xsi:schemaLocation %1 уже встречалось ранее в данном документе.</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.</source>
         <translation type="unfinished">xsi:noNamespaceSchemaLocation не может встречаться после первого не-`namespace` элемента или атрибута.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>No schema defined for validation.</source>
         <translation>Схема для проверки не определена.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>No definition for element %1 available.</source>
         <translation>Отсутствует определение элемента %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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
         <source>Element %1 is not defined in this scope.</source>
         <translation>Элемент %1 не определён в данном контексте.</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Declaration for element %1 does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Element %1 contains invalid content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>Element %1 is declared as abstract.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 is not nillable.</source>
         <translation>Элемент %1 необнуляемый.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Attribute %1 contains invalid data: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Element contains content although it is nillable.</source>
         <translation>Элемент необнуляемый, т.к. имеет содержимое.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Fixed value constraint not allowed if element is nillable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
         <source>Element %1 cannot contain other elements, as it has a fixed content.</source>
         <translation type="unfinished">Элемент %1 не может содержать другие элементы, т.к. имеет статическое содержимое.</translation>
     </message>
     <message>
-        <location line="-198"/>
         <source>Specified type %1 is not validly substitutable with element type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Complex type %1 is not allowed to be abstract.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Element %1 contains not allowed attributes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+97"/>
         <source>Element %1 contains not allowed child element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-76"/>
-        <location line="+93"/>
         <source>Content of element %1 does not match its type definition: %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-73"/>
         <source>Element %1 contains not allowed child content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Element %1 contains not allowed text content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>Element %1 is missing required attribute %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Attribute %1 does not match the attribute wildcard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Declaration for attribute %1 does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Element %1 contains two attributes of type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 contains invalid content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 contains unknown attribute %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+46"/>
         <source>Content of attribute %1 does not match its type definition: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
-        <location line="+46"/>
         <source>Content of attribute %1 does not match defined value constraint.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Non-unique value found for constraint %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Key constraint %1 contains absent fields.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>More than one value found for field %1.</source>
         <translation>Для поля %1 найдено более одного значения.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Field %1 has no simple type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>ID value &apos;%1&apos; is not unique.</source>
         <translation>Значение ID &quot;%1&quot; неуникально.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&apos;%1&apos; attribute contains invalid QName content: %2.</source>
         <translation type="unfinished">Атрибут `%1` имеет некорректное содержимое QName: %2.</translation>
     </message>
diff --git a/translations/qt_sl.ts b/translations/qt_sl.ts
index 6c42bb8..e0cee0f 100644
--- a/translations/qt_sl.ts
+++ b/translations/qt_sl.ts
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="sl">
+    <extra-po-header-po_revision_date>2010-08-05 12:59+0200</extra-po-header-po_revision_date>
+    <extra-po-headers>MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator</extra-po-headers>
+    <extra-po-header-x_generator>Lokalize 1.1</extra-po-header-x_generator>
+    <extra-po-header-language_team>Slovenian &lt;lugos-slo@lugos.si&gt;</extra-po-header-language_team>
+    <extra-po-header-project_id_version></extra-po-header-project_id_version>
+    <extra-po-header_comment># Jure Repinc &lt;jlp@holodeck1.com&gt;, 2010.</extra-po-header_comment>
+    <extra-po-header-last_translator>Jure Repinc &lt;jlp@holodeck1.com&gt;</extra-po-header-last_translator>
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2245"/>
         <source>Close Tab</source>
         <translation>Zapri zavihek</translation>
     </message>
@@ -12,45 +18,68 @@
 <context>
     <name>FakeReply</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2193"/>
         <source>Fake error !</source>
         <translation>Lažna napaka.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid URL</source>
         <translation>Neveljaven URL</translation>
     </message>
 </context>
 <context>
+    <name>MAC_APPLICATION_MENU</name>
+    <message>
+        <source>Services</source>
+        <translation>Storitve</translation>
+    </message>
+    <message>
+        <source>Hide %1</source>
+        <translation>Skrij %1</translation>
+    </message>
+    <message>
+        <source>Hide Others</source>
+        <translation>Skrij druge</translation>
+    </message>
+    <message>
+        <source>Show All</source>
+        <translation>Prikaži vse</translation>
+    </message>
+    <message>
+        <source>Preferences...</source>
+        <translation>Nastavitve ...</translation>
+    </message>
+    <message>
+        <source>Quit %1</source>
+        <translation>Končaj %1</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>O %1</translation>
+    </message>
+</context>
+<context>
     <name>Phonon::</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/phononnamespace.cpp" line="+55"/>
         <source>Notifications</source>
         <translation>Obvestila</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Music</source>
         <translation>Glasba</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Communication</source>
         <translation>Komunikacija</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Games</source>
         <translation>Igre</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Accessibility</source>
         <translation>Dostopnost</translation>
     </message>
@@ -58,32 +87,31 @@
 <context>
     <name>Phonon::AudioOutput</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+377"/>
         <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;Naprava za predvajanje zvoka &lt;b&gt;%1&lt;/b&gt; ne deluje.&lt;br/&gt;Preklapljanje na &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+13"/>
         <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;Preklapljanje na napravo za predvajanje zvoka &lt;b&gt;%1&lt;/b&gt;,&lt;br/&gt;ki je ravnokar postala dostopna in ima višjo preferenco.&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Revert back to device &apos;%1&apos;</source>
         <translation>Povrni nazaj na napravo »%1«</translation>
     </message>
+    <message>
+        <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;Preklapljanje na napravo za predvajanje zvoka &lt;b&gt;%1&lt;/b&gt;,&lt;br/&gt;ki ima višjo preferenco ali pa je posebej nastavljena za ta tok.&lt;/html&gt;</translation>
+    </message>
 </context>
 <context>
     <name>Phonon::Gstreamer::Backend</name>
     <message>
-        <location filename="../src/3rdparty/phonon/gstreamer/backend.cpp" line="+171"/>
         <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.
           Some video features have been disabled.</source>
         <translation>Opozorilo: kot kaže paket gstreamer0.10-plugins-good ni nameščen.
           Nekatere možnosti predvajanja videa so onemogočene.</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>Opozorilo: kot kaže osnovni vstavki za GStreamer niso nameščeni.
@@ -93,10 +121,9 @@
 <context>
     <name>Phonon::Gstreamer::MediaObject</name>
     <message>
-        <location filename="../src/3rdparty/phonon/gstreamer/mediaobject.cpp" line="+90"/>
         <source>Cannot start playback. 
 
-Check your Gstreamer installation and make sure you 
+Check your GStreamer installation and make sure you 
 have libgstreamer-plugins-base installed.</source>
         <translation>Ni moč začeti predvajanja.
 
@@ -104,39 +131,34 @@ Preverite namestitev GStreamerja in se prepričajte,
 da je nameščen paket libgstreamer-plugins-base.</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <source>Missing codec helper script assistant.</source>
+        <translation>Manjka pomožni skript pomočnika za kodeke.</translation>
+    </message>
+    <message>
+        <source>Plugin codec installation failed for codec: %0</source>
+        <translation>Namesitev vstavka s kodekom ni uspela: %0</translation>
+    </message>
+    <message>
         <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source>
         <translation>Manjka potreben kodek. Za predvajanje te vsebine morate namestiti sledeče kodeke: %0</translation>
     </message>
     <message>
-        <location line="+681"/>
-        <location line="+8"/>
-        <location line="+15"/>
-        <location line="+22"/>
-        <location line="+6"/>
-        <location line="+19"/>
-        <location line="+339"/>
-        <location line="+24"/>
         <source>Could not open media source.</source>
         <translation>Ni moč odpreti večpredstavnostnega vira.</translation>
     </message>
     <message>
-        <location line="-420"/>
         <source>Invalid source type.</source>
         <translation>Neveljavna vrsta vira.</translation>
     </message>
     <message>
-        <location line="+394"/>
         <source>Could not locate media source.</source>
         <translation>Ni moč najti večpredstavnostnega vira.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Could not open audio device. The device is already in use.</source>
         <translation>Ni moč odpreti zvočne naprave. Naprava je že v uporabi.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Could not decode media source.</source>
         <translation>Ni moč dekodirati večpredstavnostnega vira.</translation>
     </message>
@@ -144,82 +166,323 @@ da je nameščen paket libgstreamer-plugins-base.</translation>
 <context>
     <name>Phonon::MMF</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+108"/>
         <source>Audio Output</source>
         <translation>Predvajanje zvoka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>The audio output device</source>
         <translation>Naprava za predvajanje zvoka</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Brez napake</translation>
+    </message>
+    <message>
+        <source>Not found</source>
+        <translation>Ni najdeno</translation>
+    </message>
+    <message>
+        <source>Out of memory</source>
+        <translation>Zmanjkalo pomnilnika</translation>
+    </message>
+    <message>
+        <source>Not supported</source>
+        <translation>Ni podprto</translation>
+    </message>
+    <message>
+        <source>Overflow</source>
+        <translation>Prekoračitev zgornje meje</translation>
+    </message>
+    <message>
+        <source>Underflow</source>
+        <translation>Prekoračitev spodnje meje</translation>
+    </message>
+    <message>
+        <source>Already exists</source>
+        <translation>Že obstaja</translation>
+    </message>
+    <message>
+        <source>Path not found</source>
+        <translation>Pot ni najdena</translation>
+    </message>
+    <message>
+        <source>In use</source>
+        <translation>V uporabi</translation>
+    </message>
+    <message>
+        <source>Not ready</source>
+        <translation>Ni pripravljeno</translation>
+    </message>
+    <message>
+        <source>Access denied</source>
+        <translation>Dostop zavrnjen</translation>
+    </message>
+    <message>
+        <source>Could not connect</source>
+        <translation>Povezava ni mogoča</translation>
+    </message>
+    <message>
+        <source>Disconnected</source>
+        <translation>Povezava prekinjena</translation>
+    </message>
+    <message>
+        <source>Permission denied</source>
+        <translation>Ni dovoljenja</translation>
+    </message>
+    <message>
+        <source>Insufficient bandwidth</source>
+        <translation>Pasovna širina ni zadostna</translation>
+    </message>
+    <message>
+        <source>Network unavailable</source>
+        <translation>Omrežje ni na voljo</translation>
+    </message>
+    <message>
+        <source>Network communication error</source>
+        <translation>Napaka komunikacije prek omrežja</translation>
+    </message>
+    <message>
+        <source>Streaming not supported</source>
+        <translation>Pretakanje ni podprto</translation>
+    </message>
+    <message>
+        <source>Server alert</source>
+        <translation>Opozorilo strežnika</translation>
+    </message>
+    <message>
+        <source>Invalid protocol</source>
+        <translation>Neveljaven protokol</translation>
+    </message>
+    <message>
+        <source>Invalid URL</source>
+        <translation>Neveljaven URL</translation>
+    </message>
+    <message>
+        <source>Multicast error</source>
+        <translation>Napaka oddajanja večim</translation>
+    </message>
+    <message>
+        <source>Proxy server error</source>
+        <translation>Napaka posredniškega strežnika</translation>
+    </message>
+    <message>
+        <source>Proxy server not supported</source>
+        <translation>Posredniški strežnik ni podprt</translation>
+    </message>
+    <message>
+        <source>Audio output error</source>
+        <translation>Napaka predvajanja zvoka</translation>
+    </message>
+    <message>
+        <source>Video output error</source>
+        <translation>Napaka prevajanja videa</translation>
+    </message>
+    <message>
+        <source>Decoder error</source>
+        <translation>Napaka dekodirnika</translation>
+    </message>
+    <message>
+        <source>Audio or video components could not be played</source>
+        <translation>Zvočne ali video komponente ni bilo moč predvajati</translation>
+    </message>
+    <message>
+        <source>DRM error</source>
+        <translation>Napaka upravljanja z omejitvami</translation>
+    </message>
+    <message>
+        <source>Unknown error (%1)</source>
+        <translation>Neznana napaka (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AbstractMediaPlayer</name>
+    <message>
+        <source>Not ready to play</source>
+        <translation>Ni pripravljen na predvajanje</translation>
+    </message>
+    <message>
+        <source>Error opening file</source>
+        <translation>Napaka pri odpiranju datoteke</translation>
+    </message>
+    <message>
+        <source>Error opening URL</source>
+        <translation>Napaka pri odpiranju URL-ja</translation>
+    </message>
+    <message>
+        <source>Error opening resource</source>
+        <translation>Napaka pri odpiranju vira</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource not opened</source>
+        <translation>Napaka pri odporanju vira: vir ni bil odprt</translation>
+    </message>
+    <message>
+        <source>Setting volume failed</source>
+        <translation>Nastavljanje glasnosti ni uspelo</translation>
+    </message>
+    <message>
+        <source>Loading clip failed</source>
+        <translation>Nalaganje posnetka ni uspelo</translation>
+    </message>
+    <message>
+        <source>Playback complete</source>
+        <translation>Predvajanje je zaključeno</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AbstractVideoPlayer</name>
+    <message>
+        <source>Pause failed</source>
+        <translation>Prekinitev ni uspela</translation>
+    </message>
+    <message>
+        <source>Seek failed</source>
+        <translation>Pomik ni uspel</translation>
+    </message>
+    <message>
+        <source>Getting position failed</source>
+        <translation>Pridobivanje položaja ni uspelo</translation>
+    </message>
+    <message>
+        <source>Opening clip failed</source>
+        <translation>Odpiranje posnetka ni uspelo</translation>
+    </message>
 </context>
 <context>
     <name>Phonon::MMF::AudioEqualizer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audioequalizer.cpp" line="+75"/>
-        <source>Frequency band, %1 Hz</source>
-        <translation>Frekvenčni pas, %1 Hz</translation>
+        <source>%1 Hz</source>
+        <translation>%1 Hz</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AudioPlayer</name>
+    <message>
+        <source>Getting position failed</source>
+        <translation>Pridobivanje položaja ni uspelo</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::DsaVideoPlayer</name>
+    <message>
+        <source>Video display error</source>
+        <translation>Napaka prikaza videa</translation>
     </message>
 </context>
 <context>
     <name>Phonon::MMF::EffectFactory</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/effectfactory.cpp" line="+65"/>
-        <source>audio equalizer</source>
-        <translation>izenačevalnik zvoka</translation>
+        <source>Enabled</source>
+        <translation>Omogočeno</translation>
     </message>
+</context>
+<context>
+    <name>Phonon::MMF::EnvironmentalReverb</name>
     <message>
-        <location line="+2"/>
-        <source>Bass boost</source>
-        <translation>Ojačanje basov</translation>
+        <source>Decay HF ratio (%)</source>
+        <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime.
+</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Distance Attenuation</source>
-        <translation>Utišanje zaradi razdalje</translation>
+        <source>Decay time (ms)</source>
+        <extracomment>DecayTime: Time over which reverberation is diminished.
+</extracomment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+2"/>
-        <source>Environmental Reverb</source>
-        <translation>Okoljsko odmevanje</translation>
+        <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>Gostota (%)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Loudness</source>
-        <translation>Glasnost</translation>
+        <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>Razpršitev (%)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Source Orientation</source>
-        <translation>Usmerjenost vira</translation>
+        <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>Zamik odbojev (ms)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Stereo Widening</source>
-        <translation>Razširitev sterea</translation>
+        <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>Glasnost odbojev (mB)</translation>
+    </message>
+    <message>
+        <source>Reverb delay (ms)</source>
+        <extracomment>ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation.
+</extracomment>
+        <translation>Zamik odmeva (ms)</translation>
+    </message>
+    <message>
+        <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>Glasnost odmeva (ms)</translation>
+    </message>
+    <message>
+        <source>Room HF level</source>
+        <extracomment>RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound.
+</extracomment>
+        <translation>VF glasnost prostora</translation>
+    </message>
+    <message>
+        <source>Room level (mB)</source>
+        <extracomment>RoomLevel: Master volume control for all reflected sound.
+</extracomment>
+        <translation>Glasnost prostora (mB)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::MediaObject</name>
+    <message>
+        <source>Error opening source: type not supported</source>
+        <translation>Napaka pri odpiranju vira: vrsta ni podprta</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource is compressed</source>
+        <translation>Napaka pri odporanju vira: vir je stisnjen</translation>
+    </message>
+    <message>
+        <source>Error opening source: resource not valid</source>
+        <translation>Napaka pri odporanju vira: vir ni veljaven</translation>
+    </message>
+    <message>
+        <source>Error opening source: media type could not be determined</source>
+        <translation>Napaka pri odpiranju vira: ni bilo moč ugotoviti vrste večpredstavnostne datoteke</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::StereoWidening</name>
+    <message>
+        <source>Level (%)</source>
+        <translation>Stopnja (%)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::SurfaceVideoPlayer</name>
+    <message>
+        <source>Video display error</source>
+        <translation>Napaka prikaza videa</translation>
     </message>
 </context>
 <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>Glasnost: %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>Uporabite ta drsnik, da nastavite glasnost. Skrajno levi položaj je 0 %, skrajno desni pa %1 %.</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Muted</source>
         <translation>Utišan</translation>
     </message>
@@ -227,12 +490,10 @@ da je nameščen paket 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 ni definiran</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Ambiguous %1 not handled</source>
         <translation>Brez rokovanja z dvoumnim %1</translation>
     </message>
@@ -240,27 +501,22 @@ da je nameščen paket libgstreamer-plugins-base.</translation>
 <context>
     <name>Q3DataTable</name>
     <message>
-        <location filename="../src/qt3support/sql/q3datatable.cpp" line="+285"/>
         <source>True</source>
         <translation>Pravilno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>False</source>
         <translation>Napačno</translation>
     </message>
     <message>
-        <location line="+505"/>
         <source>Insert</source>
         <translation>Vstavi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Update</source>
         <translation>Posodobi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
@@ -268,313 +524,238 @@ da je nameščen paket libgstreamer-plugins-base.</translation>
 <context>
     <name>Q3FileDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+829"/>
         <source>Copy or Move a File</source>
         <translation>Skopiraj ali premakni datoteko</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Read: %1</source>
         <translation>Branje: %1</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+30"/>
         <source>Write: %1</source>
         <translation>Pisanje: %1</translation>
     </message>
     <message>
-        <location line="-22"/>
-        <location line="+1579"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location line="-157"/>
-        <location line="+49"/>
-        <location line="+2149"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+112"/>
         <source>All Files (*)</source>
         <translation>Vse datoteke (*)</translation>
     </message>
     <message>
-        <location line="-2085"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Attributes</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+2027"/>
         <source>&amp;OK</source>
         <translation>&amp;V redu</translation>
     </message>
     <message>
-        <location line="-1987"/>
         <source>Look &amp;in:</source>
         <translation>Išči &amp;v:</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+1977"/>
-        <location line="+16"/>
         <source>File &amp;name:</source>
         <translation>Ime &amp;datoteke:</translation>
     </message>
     <message>
-        <location line="-1992"/>
         <source>File &amp;type:</source>
         <translation>&amp;Vrsta datoteke:</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Back</source>
         <translation>Nazaj</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>One directory up</source>
         <translation>Za eno mapo navzgor</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Create New Folder</source>
         <translation>Ustvari novo mapo</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>List View</source>
         <translation>Prikaz seznama</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Detail View</source>
         <translation>Prikaz podrobnosti</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Preview File Info</source>
         <translation>Podatki ogleda datoteke</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Preview File Contents</source>
         <translation>Vsebina ogleda datoteke</translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Read-write</source>
         <translation>Branje in pisanje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Read-only</source>
         <translation>Samo za branje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write-only</source>
         <translation>Samo za pisanje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Inaccessible</source>
         <translation>Nedostopno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Symlink to File</source>
         <translation>Simbolna povezava do datoteke</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Symlink to Directory</source>
         <translation>Simbolna povezava do mape</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Symlink to Special</source>
         <translation>Simbolna povezava do posebnega</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dir</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Special</source>
         <translation>Posebno</translation>
     </message>
     <message>
-        <location line="+704"/>
-        <location line="+1999"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+209"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
-        <location line="-1889"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+71"/>
         <source>Save As</source>
         <translation>Shrani kot</translation>
     </message>
     <message>
-        <location line="+642"/>
-        <location line="+5"/>
-        <location line="+355"/>
         <source>&amp;Open</source>
         <translation>&amp;Odpri</translation>
     </message>
     <message>
-        <location line="-357"/>
-        <location line="+341"/>
         <source>&amp;Save</source>
         <translation>&amp;Shrani</translation>
     </message>
     <message>
-        <location line="-334"/>
         <source>&amp;Rename</source>
         <translation>Pre&amp;imenuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Delete</source>
         <translation>&amp;Izbriši</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>R&amp;eload</source>
         <translation>&amp;Znova naloži</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Sort by &amp;Name</source>
         <translation>Razvrsti po &amp;imenu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Sort by &amp;Size</source>
         <translation>Razvrsti po &amp;velikosti</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sort by &amp;Date</source>
         <translation>Razvrsti po &amp;datumu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Unsorted</source>
         <translation>&amp;Brez razvrščanja</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Sort</source>
         <translation>Razvrsti</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Show &amp;hidden files</source>
         <translation>Prikaži &amp;skrite datoteke</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>the file</source>
         <translation>datoteko</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>the directory</source>
         <translation>mapo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>the symlink</source>
         <translation>simbolno povezavo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete %1</source>
         <translation>Izbriši %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Are you sure you wish to delete %1 &quot;%2&quot;?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Ali res želite izbrisati %1 »%2«?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Yes</source>
         <translation>&amp;Da</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>New Folder 1</source>
         <translation>Nova mapa 1</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder</source>
         <translation>Nova mapa</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder %1</source>
         <translation>Nova mapa %1</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>Find Directory</source>
         <translation>Najdi mapo</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+108"/>
         <source>Directories</source>
         <translation>Mape</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Directory:</source>
         <translation>Mapa:</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+1009"/>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
-        <location line="-1008"/>
         <source>%1
 File not found.
 Check path and filename.</source>
@@ -583,17 +764,14 @@ Datoteke ni moč najti.
 Preverite pot in ime datoteke.</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="-191"/>
         <source>All Files (*.*)</source>
         <translation>Vse datoteke (*.*)</translation>
     </message>
     <message>
-        <location line="+264"/>
         <source>Open </source>
         <translation>Odpri </translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Select a Directory</source>
         <translation>Izberite mapo</translation>
     </message>
@@ -601,29 +779,24 @@ Preverite pot in ime datoteke.</translation>
 <context>
     <name>Q3LocalFs</name>
     <message>
-        <location filename="../src/qt3support/network/q3localfs.cpp" line="+130"/>
-        <location line="+10"/>
         <source>Could not read directory
 %1</source>
         <translation>Ni bilo moč brati mape
 %1</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Could not create directory
 %1</source>
         <translation>Ni bilo moč ustvariti mape
 %1</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Could not remove file or directory
 %1</source>
         <translation>Ni bilo moč odstraniti datoteke ali mape
 %1</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Could not rename
 %1
 to
@@ -634,14 +807,12 @@ v
 %2</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Could not open
 %1</source>
         <translation>Ni moč odpreti
 %1</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Could not write
 %1</source>
         <translation>Ni bilo moč zapisati
@@ -651,12 +822,10 @@ v
 <context>
     <name>Q3MainWindow</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3mainwindow.cpp" line="+2051"/>
         <source>Line up</source>
         <translation>V vrsto</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Customize...</source>
         <translation>Prilagodi ...</translation>
     </message>
@@ -664,7 +833,6 @@ v
 <context>
     <name>Q3NetworkProtocol</name>
     <message>
-        <location filename="../src/qt3support/network/q3networkprotocol.cpp" line="+854"/>
         <source>Operation stopped by the user</source>
         <translation>Dejanje zaustavil uporabnik</translation>
     </message>
@@ -672,8 +840,6 @@ v
 <context>
     <name>Q3ProgressDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3progressdialog.cpp" line="+224"/>
-        <location line="+61"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
@@ -681,28 +847,22 @@ v
 <context>
     <name>Q3TabDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3tabdialog.cpp" line="+190"/>
-        <location line="+824"/>
         <source>OK</source>
         <translation>V redu</translation>
     </message>
     <message>
-        <location line="-366"/>
         <source>Apply</source>
         <translation>Uveljavi</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Defaults</source>
         <translation>Privzetosti</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
@@ -710,38 +870,30 @@ v
 <context>
     <name>Q3TextEdit</name>
     <message>
-        <location filename="../src/qt3support/text/q3textedit.cpp" line="+5429"/>
         <source>&amp;Undo</source>
         <translation>&amp;Razveljavi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Redo</source>
         <translation>&amp;Uveljavi</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Izreži</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiraj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Paste</source>
         <translation>Pri&amp;lepi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Clear</source>
         <translation>Počisti</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+2"/>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
@@ -749,67 +901,54 @@ v
 <context>
     <name>Q3TitleBar</name>
     <message>
-        <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+246"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore up</source>
         <translation>Obnovi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Minimize</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore down</source>
         <translation>Obnovi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maximize</source>
         <translation>Razpni</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Contains commands to manipulate the window</source>
         <translation>Vsebuje ukaze za upravljanje z oknom</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Puts a minimized window back to normal</source>
         <translation>Obnovi pomanjšano okno na običajno velikost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Moves the window out of the way</source>
         <translation>Umakne okno, da ni v napoto</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Puts a maximized window back to normal</source>
         <translation>Obnovi razpeto okno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Makes the window full screen</source>
         <translation>Razpne okno čez ves zaslon</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Closes the window</source>
         <translation>Zapre okno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Displays the name of the window and contains controls to manipulate it</source>
         <translation>Prikazuje ime okna in vsebuje gumbe za nadzor okna</translation>
     </message>
@@ -817,7 +956,6 @@ v
 <context>
     <name>Q3ToolBar</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3toolbar.cpp" line="+692"/>
         <source>More...</source>
         <translation>Več ...</translation>
     </message>
@@ -825,51 +963,38 @@ v
 <context>
     <name>Q3UrlOperator</name>
     <message>
-        <location filename="../src/qt3support/network/q3urloperator.cpp" line="+386"/>
-        <location line="+260"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; is not supported</source>
         <translation>Protokol »%1« ni podprt.</translation>
     </message>
     <message>
-        <location line="-260"/>
         <source>The protocol `%1&apos; does not support listing directories</source>
         <translation>Protokol »%1« ne podpira izpisa seznama map.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support creating new directories</source>
         <translation>Protokol »%1« ne podpira ustvarjanja novih map.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support removing files or directories</source>
         <translation>Protokol »%1« ne podpira odstranjevanja datotek ali map.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support renaming files or directories</source>
         <translation>Protokol »%1« ne podpira preimenovanja datotek ali map.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support getting files</source>
         <translation>Protokol »%1« ne podpira prejemanja datotek.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support putting files</source>
         <translation>Protokol »%1« ne podpira pošiljanja datotek.</translation>
     </message>
     <message>
-        <location line="+243"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
         <translation>Protokol »%1« ne podpira kopiranja ali premikanja datotek ali map.</translation>
     </message>
     <message>
-        <location line="+237"/>
-        <location line="+1"/>
         <source>(unknown)</source>
         <translation>(neznano)</translation>
     </message>
@@ -877,27 +1002,22 @@ v
 <context>
     <name>Q3Wizard</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3wizard.cpp" line="+177"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; Na&amp;zaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Naprej &gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Finish</source>
         <translation>&amp;Končaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
@@ -905,44 +1025,30 @@ v
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+890"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+633"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+661"/>
-        <location line="+26"/>
         <source>Host not found</source>
         <translation>Ni moč najti gostitelja</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+3"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+4"/>
         <source>Connection refused</source>
         <translation>Povezava je zavrnjena</translation>
     </message>
     <message>
-        <location line="+142"/>
         <source>Connection timed out</source>
         <translation>Čas za povezavo je potekel</translation>
     </message>
     <message>
-        <location line="-548"/>
-        <location line="+789"/>
-        <location line="+208"/>
         <source>Operation on socket is not supported</source>
         <translation>Dejanje na vtičnici ni podprto</translation>
     </message>
     <message>
-        <location line="+200"/>
         <source>Socket operation timed out</source>
         <translation>Čas za dejanje na vtičnici je potekel</translation>
     </message>
     <message>
-        <location line="+380"/>
         <source>Socket is not connected</source>
         <translation>Vtičnica ni povezana.</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-8"/>
         <source>Network unreachable</source>
         <translation>Omrežje ni dosegljivo</translation>
     </message>
@@ -950,17 +1056,14 @@ v
 <context>
     <name>QAbstractSpinBox</name>
     <message>
-        <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1217"/>
         <source>&amp;Step up</source>
         <translation>Korak &amp;gor</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Step &amp;down</source>
         <translation>Korak &amp;dol</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Select All</source>
         <translation>Izberi &amp;vse</translation>
     </message>
@@ -968,7 +1071,6 @@ v
 <context>
     <name>QAccessibleButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+250"/>
         <source>Press</source>
         <translation>Pritisni</translation>
     </message>
@@ -976,28 +1078,23 @@ v
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+376"/>
         <source>Activate</source>
         <translation>Aktiviraj</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>Izvršljiva datoteka »%1« potrebuje Qt %2, najden pa je bil Qt %3.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Incompatible Qt Library Error</source>
         <translation>Napaka nezdružljivosti knjižnice Qt</translation>
     </message>
     <message>
-        <location filename="../src/gui/kernel/qapplication.cpp" line="+2290"/>
         <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>
     </message>
     <message>
-        <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+2"/>
         <source>Activates the program&apos;s main window</source>
         <translation>Aktivira glavno okno programa</translation>
     </message>
@@ -1005,22 +1102,18 @@ v
 <context>
     <name>QAxSelect</name>
     <message>
-        <location filename="../src/activeqt/container/qaxselect.ui"/>
         <source>Select ActiveX Control</source>
         <translation>Izberite kontrolnik ActiveX</translation>
     </message>
     <message>
-        <location/>
         <source>OK</source>
         <translation>V redu</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
     <message>
-        <location/>
         <source>COM &amp;Object:</source>
         <translation>&amp;Objekt COM:</translation>
     </message>
@@ -1028,17 +1121,14 @@ v
 <context>
     <name>QCheckBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-136"/>
         <source>Uncheck</source>
         <translation>Odznači</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Check</source>
         <translation>Označi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Toggle</source>
         <translation>Preklopi</translation>
     </message>
@@ -1046,57 +1136,46 @@ v
 <context>
     <name>QColorDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1349"/>
         <source>Hu&amp;e:</source>
         <translation>&amp;Odtenek:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Sat:</source>
         <translation>&amp;Zasičenost:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Val:</source>
         <translation>&amp;Vrednost:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Red:</source>
         <translation>&amp;Rdeča:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Green:</source>
         <translation>&amp;Zelena:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bl&amp;ue:</source>
         <translation>&amp;Modra:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A&amp;lpha channel:</source>
         <translation>Kanal &amp;alfa:</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Select Color</source>
         <translation>Izberite barvo</translation>
     </message>
     <message>
-        <location line="+180"/>
         <source>&amp;Basic colors</source>
         <translation>&amp;Osnovne barve</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Custom colors</source>
         <translation>Barve po &amp;meri</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Add to Custom Colors</source>
         <translation>&amp;Dodaj lastnim barvam</translation>
     </message>
@@ -1104,23 +1183,18 @@ v
 <context>
     <name>QComboBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+1771"/>
-        <location line="+65"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+556"/>
         <source>False</source>
         <translation>Napačno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>True</source>
         <translation>Pravilno</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+0"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
@@ -1128,43 +1202,36 @@ v
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="+119"/>
         <source>%1: key is empty</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: ključ je prazen</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: unable to make key</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: ni moč ustvariti ključa</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1: ftok failed</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: funkcija ftok ni uspela</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_symbian.cpp" line="+65"/>
         <source>%1: already exists</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: že obstaja</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: does not exist</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: ne obstaja</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1: out of resources</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: zmanjkalo je virov</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: unknown error %2</source>
         <comment>QSystemSemaphore</comment>
         <translation>%1: neznana napaka %2</translation>
@@ -1173,22 +1240,18 @@ v
 <context>
     <name>QDB2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1254"/>
         <source>Unable to connect</source>
         <translation>Ni moč vzpostaviti povezave</translation>
     </message>
     <message>
-        <location line="+298"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to set autocommit</source>
         <translation>Ni moč nastaviti samodejnega udejanjanja</translation>
     </message>
@@ -1196,33 +1259,26 @@ v
 <context>
     <name>QDB2Result</name>
     <message>
-        <location line="-1031"/>
-        <location line="+240"/>
         <source>Unable to execute statement</source>
         <translation>Ni moč izvesti izjave</translation>
     </message>
     <message>
-        <location line="-203"/>
         <source>Unable to prepare statement</source>
         <translation>Ni moč pripraviti izjave</translation>
     </message>
     <message>
-        <location line="+193"/>
         <source>Unable to bind variable</source>
         <translation>Ni moč prikleniti spremenljivke</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>Unable to fetch record %1</source>
         <translation>Ni moč pridobiti zapisa %1</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch next</source>
         <translation>Ni moč pridobiti sledečega</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Unable to fetch first</source>
         <translation>Ni moč pridobiti prvega</translation>
     </message>
@@ -1230,40 +1286,910 @@ v
 <context>
     <name>QDateTimeEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qdatetimeedit.cpp" line="+2287"/>
         <source>AM</source>
         <translation>dop.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>am</source>
         <translation>dop.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>PM</source>
         <translation>pop.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>pm</source>
         <translation>pop.</translation>
     </message>
 </context>
 <context>
+    <name>QDeclarativeAbstractAnimation</name>
+    <message>
+        <source>Cannot animate non-existent property &quot;%1&quot;</source>
+        <translation>Neobstoječe lastnosti »%1« ni moč animirati</translation>
+    </message>
+    <message>
+        <source>Cannot animate read-only property &quot;%1&quot;</source>
+        <translation>Lastnosti »%1«, ki je samo za branje, ni moč animirati</translation>
+    </message>
+    <message>
+        <source>Animation is an abstract class</source>
+        <translation>Animacija je abstrakten razred</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeAnchorAnimation</name>
+    <message>
+        <source>Cannot set a duration of &lt; 0</source>
+        <translation>Trajanja, ki je krajše od 0, ni moč nastaviti</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeAnchors</name>
+    <message>
+        <source>Possible anchor loop detected on fill.</source>
+        <translation type="unfinished">Ob zapolnjevanju je bila zaznana možna zanka sidra.</translation>
+    </message>
+    <message>
+        <source>Possible anchor loop detected on centerIn.</source>
+        <translation type="unfinished">Ob usrediščanju je bila zaznana možna zanka sidra.</translation>
+    </message>
+    <message>
+        <source>Cannot anchor to an item that isn&apos;t a parent or sibling.</source>
+        <translation type="unfinished">Na objekt, ki ni nadrejen ali enakovreden, se ni moč zasidrati.</translation>
+    </message>
+    <message>
+        <source>Possible anchor loop detected on vertical anchor.</source>
+        <translation type="unfinished">Ob navpičnem sidru je bila zaznana možna zanka sidra.</translation>
+    </message>
+    <message>
+        <source>Possible anchor loop detected on horizontal anchor.</source>
+        <translation type="unfinished">Ob vodoravnem sidru je bila zaznana možna zanka sidra.</translation>
+    </message>
+    <message>
+        <source>Cannot specify left, right, and hcenter anchors.</source>
+        <translation type="unfinished">Levih, desnih in vodoravno sredinskih sider ni moč določiti.</translation>
+    </message>
+    <message>
+        <source>Cannot anchor to a null item.</source>
+        <translation type="unfinished">Na ničelni objekt se ni moč zasidrati.</translation>
+    </message>
+    <message>
+        <source>Cannot anchor a horizontal edge to a vertical edge.</source>
+        <translation type="unfinished">Vodoravnega roba ni moč zasidrati na navpični rob.</translation>
+    </message>
+    <message>
+        <source>Cannot anchor item to self.</source>
+        <translation type="unfinished">Objekta ni moč zasidrati samega nase.</translation>
+    </message>
+    <message>
+        <source>Cannot specify top, bottom, and vcenter anchors.</source>
+        <translation type="unfinished">Vrhnjih, spodnjih in navpično sredinskih sider ni moč določiti.</translation>
+    </message>
+    <message>
+        <source>Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.</source>
+        <translation type="unfinished">Sidra na osnovnici ni moč uporabiti skupaj z vrhnjimi, spodnjimi ali navpično sredinskimi sidri.</translation>
+    </message>
+    <message>
+        <source>Cannot anchor a vertical edge to a horizontal edge.</source>
+        <translation type="unfinished">Navpičnega roba ni moč zasidrati na vodoravni rob.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeAnimatedImage</name>
+    <message>
+        <source>Qt was built without support for QMovie</source>
+        <translation type="unfinished">Qt je bil zgrajen brez podpore za QMovie</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeBehavior</name>
+    <message>
+        <source>Cannot change the animation assigned to a Behavior.</source>
+        <translation type="unfinished">Animacije, ki je prirejena obnašanju, ni moč spremeniti.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeBinding</name>
+    <message>
+        <source>Binding loop detected for property &quot;%1&quot;</source>
+        <translation type="unfinished">Za lastnost »%1« je bila zaznana zanka vezave</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeCompiledBindings</name>
+    <message>
+        <source>Binding loop detected for property &quot;%1&quot;</source>
+        <translation type="unfinished">Za lastnost »%1« je bila zaznana zanka vezave</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeCompiler</name>
+    <message>
+        <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: »%1« je lastnost, ki je samo za branje</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: unknown enumeration</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: neznano oštevilčenje</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: string expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je niz</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: url expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je URL</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: unsigned int expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovano je nepredznačeno celo število</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: int expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovano je celo število</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: number expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovano je število</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: color expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovana je barva</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: date expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je datum</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: time expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je čas</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: datetime expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovana sta datum in čas</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: point expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovana je točka</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: size expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovana je velikost</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: rect expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je pravokotnik</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: boolean expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovana je logična vrednost</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: 3D vector expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je 3D vektor</translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: unsupported type &quot;%1&quot;</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: nepodprta vrsta »%1«</translation>
+    </message>
+    <message>
+        <source>Element is not creatable.</source>
+        <translation type="unfinished">Elementa ni moč ustvariti.</translation>
+    </message>
+    <message>
+        <source>Component elements may not contain properties other than id</source>
+        <translation type="unfinished">Elementi komponent ne smejo vsebovati drugih lastnosti kot ID</translation>
+    </message>
+    <message>
+        <source>Invalid component id specification</source>
+        <translation type="unfinished">Neveljavno določen ID komponente</translation>
+    </message>
+    <message>
+        <source>id is not unique</source>
+        <translation type="unfinished">ID ni edinstven</translation>
+    </message>
+    <message>
+        <source>Invalid component body specification</source>
+        <translation type="unfinished">Neveljavno določeno telo komponente</translation>
+    </message>
+    <message>
+        <source>Component objects cannot declare new properties.</source>
+        <translation type="unfinished">Objekti komponent ne morejo deklarirati novih lastnosti.</translation>
+    </message>
+    <message>
+        <source>Component objects cannot declare new signals.</source>
+        <translation type="unfinished">Objekti komponent ne morejo deklarirati novih signalov.</translation>
+    </message>
+    <message>
+        <source>Component objects cannot declare new functions.</source>
+        <translation type="unfinished">Objekti komponent ne morejo deklarirati novih funkcij.</translation>
+    </message>
+    <message>
+        <source>Cannot create empty component specification</source>
+        <translation type="unfinished">Prazne specifikacije komponente ni moč ustvariti</translation>
+    </message>
+    <message>
+        <source>Incorrectly specified signal assignment</source>
+        <translation type="unfinished">Napačno določena prireditev signalu</translation>
+    </message>
+    <message>
+        <source>Cannot assign a value to a signal (expecting a script to be run)</source>
+        <translation type="unfinished">Signalu ni moč prirediti vrednosti (pričakovan je skript, ki bo zagnan)</translation>
+    </message>
+    <message>
+        <source>Empty signal assignment</source>
+        <translation type="unfinished">Prazna prireditev signalu</translation>
+    </message>
+    <message>
+        <source>Empty property assignment</source>
+        <translation type="unfinished">Prazna prireditev lastnosti</translation>
+    </message>
+    <message>
+        <source>Attached properties cannot be used here</source>
+        <translation type="unfinished">Pripete lastnosti tu ne morejo biti uporabljene</translation>
+    </message>
+    <message>
+        <source>Non-existent attached object</source>
+        <translation type="unfinished">Neobstoječ pripet objekt</translation>
+    </message>
+    <message>
+        <source>Invalid attached object assignment</source>
+        <translation type="unfinished">Neveljavna prireditev pripetega objekta</translation>
+    </message>
+    <message>
+        <source>Cannot assign to non-existent default property</source>
+        <translation type="unfinished">Neobstoječi privzeti lastnosti ni moč prirediti</translation>
+    </message>
+    <message>
+        <source>Cannot assign to non-existent property &quot;%1&quot;</source>
+        <translation type="unfinished">Neobstoječi lastnosti »%1« ni moč prirediti</translation>
+    </message>
+    <message>
+        <source>Invalid use of namespace</source>
+        <translation type="unfinished">Napačna raba imenskega prostora</translation>
+    </message>
+    <message>
+        <source>Not an attached property name</source>
+        <translation type="unfinished">Ni ime pripete lastnosti</translation>
+    </message>
+    <message>
+        <source>Invalid use of id property</source>
+        <translation type="unfinished">Napačna raba lastnosti ID</translation>
+    </message>
+    <message>
+        <source>Property has already been assigned a value</source>
+        <translation type="unfinished">Lastnosti je že bila prirejena vrednost</translation>
+    </message>
+    <message>
+        <source>Invalid grouped property access</source>
+        <translation type="unfinished">Neveljaven dostop do skupinske lastnosti</translation>
+    </message>
+    <message>
+        <source>Cannot assign a value directly to a grouped property</source>
+        <translation type="unfinished">Skupinski lastnosti ni moč neposredno prirediti vrednosti</translation>
+    </message>
+    <message>
+        <source>Invalid property use</source>
+        <translation type="unfinished">Neveljavna raba lastnosti</translation>
+    </message>
+    <message>
+        <source>Property assignment expected</source>
+        <translation type="unfinished">Pričakovana je prireditev lastnosti</translation>
+    </message>
+    <message>
+        <source>Single property assignment expected</source>
+        <translation type="unfinished">Pričakovana je enojna prireditev lastnosti</translation>
+    </message>
+    <message>
+        <source>Unexpected object assignment</source>
+        <translation type="unfinished">Nepričakovana prireditev objekta</translation>
+    </message>
+    <message>
+        <source>Cannot assign object to list</source>
+        <translation type="unfinished">Objekta ni moč prirediti seznamu</translation>
+    </message>
+    <message>
+        <source>Can only assign one binding to lists</source>
+        <translation type="unfinished">Seznamom je moč prirediti le eno vezavo</translation>
+    </message>
+    <message>
+        <source>Cannot assign primitives to lists</source>
+        <translation type="unfinished">Seznamom ni moč prirediti osnovnih tipov</translation>
+    </message>
+    <message>
+        <source>Cannot assign multiple values to a script property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid property assignment: script expected</source>
+        <translation type="unfinished">Neveljavna prireditev lastnosti: pričakovan je skript</translation>
+    </message>
+    <message>
+        <source>Cannot assign object to property</source>
+        <translation type="unfinished">Objekta ni moč prirediti lastnosti</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; cannot operate on &quot;%2&quot;</source>
+        <translation type="unfinished">»%1« ne more delovati na »%2«</translation>
+    </message>
+    <message>
+        <source>Duplicate default property</source>
+        <translation type="unfinished">Podvojena privzeta lastnost</translation>
+    </message>
+    <message>
+        <source>Duplicate property name</source>
+        <translation type="unfinished">Podvojeno ime lastnosti</translation>
+    </message>
+    <message>
+        <source>Property names cannot begin with an upper case letter</source>
+        <translation type="unfinished">Imena lastnosti se ne smejo začeti z veliko črko</translation>
+    </message>
+    <message>
+        <source>Illegal property name</source>
+        <translation type="unfinished">Neveljavno ime lastnosti</translation>
+    </message>
+    <message>
+        <source>Duplicate signal name</source>
+        <translation type="unfinished">Podvojeno ime signala</translation>
+    </message>
+    <message>
+        <source>Signal names cannot begin with an upper case letter</source>
+        <translation type="unfinished">Imena signalov se ne smejo začeti z veliko črko</translation>
+    </message>
+    <message>
+        <source>Illegal signal name</source>
+        <translation type="unfinished">Neveljavno ime signala</translation>
+    </message>
+    <message>
+        <source>Duplicate method name</source>
+        <translation type="unfinished">Podvojeno ime metode</translation>
+    </message>
+    <message>
+        <source>Method names cannot begin with an upper case letter</source>
+        <translation type="unfinished">Imena metod se ne smejo začeti z veliko črko</translation>
+    </message>
+    <message>
+        <source>Illegal method name</source>
+        <translation type="unfinished">Neveljavno ime metode</translation>
+    </message>
+    <message>
+        <source>Property value set multiple times</source>
+        <translation type="unfinished">Vrednost lastnosti je bila nastavljena večkrat</translation>
+    </message>
+    <message>
+        <source>Invalid property nesting</source>
+        <translation type="unfinished">Neveljavno gnezdenje lastnosti</translation>
+    </message>
+    <message>
+        <source>Cannot override FINAL property</source>
+        <translation type="unfinished">Lastnosti FINAL ni moč povoziti</translation>
+    </message>
+    <message>
+        <source>Invalid property type</source>
+        <translation type="unfinished">Neveljavna vrsta lastnosti</translation>
+    </message>
+    <message>
+        <source>Invalid empty ID</source>
+        <translation type="unfinished">Neveljaven prazen ID</translation>
+    </message>
+    <message>
+        <source>IDs cannot start with an uppercase letter</source>
+        <translation type="unfinished">ID-ji se ne smejo začeti z veliko črko</translation>
+    </message>
+    <message>
+        <source>IDs must start with a letter or underscore</source>
+        <translation type="unfinished">ID-ji se morajo začeti s črko ali podčrtajem</translation>
+    </message>
+    <message>
+        <source>IDs must contain only letters, numbers, and underscores</source>
+        <translation type="unfinished">ID-ji lahko vsebujejo le črke, števke in podčrtaje</translation>
+    </message>
+    <message>
+        <source>ID illegally masks global JavaScript property</source>
+        <translation type="unfinished">ID neveljavno zakriva globalno lastnost JavaScripta</translation>
+    </message>
+    <message>
+        <source>No property alias location</source>
+        <translation type="unfinished">Brez lokacije aliasa lastnosti</translation>
+    </message>
+    <message>
+        <source>Invalid alias location</source>
+        <translation type="unfinished">Neveljavna lokacija aliasa</translation>
+    </message>
+    <message>
+        <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt; or &lt;id&gt;.&lt;property&gt;</source>
+        <translation type="unfinished">Neveljavna referenca aliasa. Referenca aliasa mora biti določena kot &lt;id&gt; ali &lt;id&gt;.&lt;lastnost&gt;</translation>
+    </message>
+    <message>
+        <source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
+        <translation type="unfinished">Neveljavna referenca aliasa. ID-ja »%1« ni moč najti</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeComponent</name>
+    <message>
+        <source>Invalid empty URL</source>
+        <translation type="unfinished">Neveljaven prazen URL</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeCompositeTypeManager</name>
+    <message>
+        <source>Resource %1 unavailable</source>
+        <translation type="unfinished">Vir %1 ni na voljo</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation type="unfinished">Imenskega prostora %1 ni moč uporabiti kot vrste</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation type="unfinished">%1 % {1 %2?}</translation>
+    </message>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation type="unfinished">Vrsta %1 ni na voljo</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeConnections</name>
+    <message>
+        <source>Cannot assign to non-existent property &quot;%1&quot;</source>
+        <translation type="unfinished">Neobstoječi lastnosti »%1« ni moč prirediti</translation>
+    </message>
+    <message>
+        <source>Connections: nested objects not allowed</source>
+        <translation type="unfinished">Povezave: gnezdeni objekti niso dovoljeni</translation>
+    </message>
+    <message>
+        <source>Connections: syntax error</source>
+        <translation type="unfinished">Povezave: napaka v skladnji</translation>
+    </message>
+    <message>
+        <source>Connections: script expected</source>
+        <translation type="unfinished">Povezave: pričakovan je skript</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeEngine</name>
+    <message>
+        <source>executeSql called outside transaction()</source>
+        <translation type="unfinished">executeSql je bil klican izven transaction()</translation>
+    </message>
+    <message>
+        <source>Read-only Transaction</source>
+        <translation type="unfinished">Transakcija samo za branje</translation>
+    </message>
+    <message>
+        <source>Version mismatch: expected %1, found %2</source>
+        <translation type="unfinished">Neujemanje različic: pričakovana %1, najdena %2</translation>
+    </message>
+    <message>
+        <source>SQL transaction failed</source>
+        <translation type="unfinished">Transakcija SQL ni uspela</translation>
+    </message>
+    <message>
+        <source>transaction: missing callback</source>
+        <translation type="unfinished">transaction: manjka povratni klic</translation>
+    </message>
+    <message>
+        <source>SQL: database version mismatch</source>
+        <translation type="unfinished">SQL: neujemanje različice podatkovne zbirke</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeFlipable</name>
+    <message>
+        <source>front is a write-once property</source>
+        <translation type="unfinished">front je lastnost, ki se jo lahko zapiše samo enkrat</translation>
+    </message>
+    <message>
+        <source>back is a write-once property</source>
+        <translation type="unfinished">back je lastnost, ki se jo lahko zapiše samo enkrat</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeImportDatabase</name>
+    <message>
+        <source>module &quot;%1&quot; definition &quot;%2&quot; not readable</source>
+        <translation type="unfinished">definicije »%2« modula »%1« ni moč brati</translation>
+    </message>
+    <message>
+        <source>plugin cannot be loaded for module &quot;%1&quot;: %2</source>
+        <translation type="unfinished">vstavka za modul »%1« ni moč naložiti: %2</translation>
+    </message>
+    <message>
+        <source>module &quot;%1&quot; plugin &quot;%2&quot; not found</source>
+        <translation type="unfinished">vstavek »%2« modula »%1« ni bil najden</translation>
+    </message>
+    <message>
+        <source>module &quot;%1&quot; version %2.%3 is not installed</source>
+        <translation type="unfinished">modul »%1« različice %2.%3 ni nameščen</translation>
+    </message>
+    <message>
+        <source>module &quot;%1&quot; is not installed</source>
+        <translation type="unfinished">modul »%1« ni nameščen</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot;: no such directory</source>
+        <translation type="unfinished">»%1«: mapa ne obstaja</translation>
+    </message>
+    <message>
+        <source>import &quot;%1&quot; has no qmldir and no namespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>- %1 is not a namespace</source>
+        <translation type="unfinished">– %1 ni imenski prostor</translation>
+    </message>
+    <message>
+        <source>- nested namespaces not allowed</source>
+        <translation type="unfinished">– gnezdeni imenski prostori niso dovoljeni</translation>
+    </message>
+    <message>
+        <source>local directory</source>
+        <translation type="unfinished">krajevna mapa</translation>
+    </message>
+    <message>
+        <source>is ambiguous. Found in %1 and in %2</source>
+        <translation type="unfinished">je dvoumno. Najdeno v %1 in %2</translation>
+    </message>
+    <message>
+        <source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source>
+        <translation type="unfinished">je dvoumno. Najdeno v %1 v različicah %2.%3 in %4.%5</translation>
+    </message>
+    <message>
+        <source>is instantiated recursively</source>
+        <translation type="unfinished">je instanciran rekurzivno</translation>
+    </message>
+    <message>
+        <source>is not a type</source>
+        <translation type="unfinished">ni vrsta</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeKeyNavigationAttached</name>
+    <message>
+        <source>KeyNavigation is only available via attached properties</source>
+        <translation type="unfinished">KeyNavigation je na voljo samo s pripetimi lastnostmi</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeKeysAttached</name>
+    <message>
+        <source>Keys is only available via attached properties</source>
+        <translation type="unfinished">Keys je na voljo samo s pripetimi lastnostmi</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeListModel</name>
+    <message>
+        <source>remove: index %1 out of range</source>
+        <translation type="unfinished">remove: indeks %1 je izven obsega</translation>
+    </message>
+    <message>
+        <source>insert: value is not an object</source>
+        <translation type="unfinished">insert: vrednost ni objekt</translation>
+    </message>
+    <message>
+        <source>insert: index %1 out of range</source>
+        <translation type="unfinished">insert: indeks %1 je izven obsega</translation>
+    </message>
+    <message>
+        <source>move: out of range</source>
+        <translation type="unfinished">move: izven obsega</translation>
+    </message>
+    <message>
+        <source>append: value is not an object</source>
+        <translation type="unfinished">append: vrednost ni objekt</translation>
+    </message>
+    <message>
+        <source>set: value is not an object</source>
+        <translation type="unfinished">set: vrednost ni objekt</translation>
+    </message>
+    <message>
+        <source>set: index %1 out of range</source>
+        <translation type="unfinished">set: indeks %1 je izven obsega</translation>
+    </message>
+    <message>
+        <source>ListElement: cannot contain nested elements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ListElement: cannot use reserved &quot;id&quot; property</source>
+        <translation type="unfinished">ListElement: ne more uporabiti rezervirane lastnosti »id«</translation>
+    </message>
+    <message>
+        <source>ListElement: cannot use script for property value</source>
+        <translation type="unfinished">ListElement: ne more uporabiti skripta za vrednost lastnosti</translation>
+    </message>
+    <message>
+        <source>ListModel: undefined property &apos;%1&apos;</source>
+        <translation type="unfinished">ListModel: nedoločena lastnost »%1«</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeLoader</name>
+    <message>
+        <source>Loader does not support loading non-visual elements.</source>
+        <translation type="unfinished">Loader ne podpira nalaganja elementov, ki niso vidni.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeParentAnimation</name>
+    <message>
+        <source>Unable to preserve appearance under complex transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to preserve appearance under non-uniform scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to preserve appearance under scale of 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeParentChange</name>
+    <message>
+        <source>Unable to preserve appearance under complex transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to preserve appearance under non-uniform scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to preserve appearance under scale of 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeParser</name>
+    <message>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished">Neveljavno ubežno zaporedje Unicode</translation>
+    </message>
+    <message>
+        <source>Illegal character</source>
+        <translation type="unfinished">Neveljaven znak</translation>
+    </message>
+    <message>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished">Nezaprt niz na koncu vrstice</translation>
+    </message>
+    <message>
+        <source>Illegal escape squence</source>
+        <translation type="unfinished">Neveljavno ubežno zaporedje</translation>
+    </message>
+    <message>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished">Nezaprt komentar na koncu datoteke</translation>
+    </message>
+    <message>
+        <source>Illegal syntax for exponential number</source>
+        <translation type="unfinished">Neveljavna skladnja za eksponentno število</translation>
+    </message>
+    <message>
+        <source>Identifier cannot start with numeric literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid regular expression flag &apos;%0&apos;</source>
+        <translation type="unfinished">Neveljavna zastavica »%0« regularnega izraza</translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression backslash sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax error</source>
+        <translation type="unfinished">Skladenjska napaka</translation>
+    </message>
+    <message>
+        <source>Unexpected token `%1&apos;</source>
+        <translation type="unfinished">Nepričakovan žeton »%1«</translation>
+    </message>
+    <message>
+        <source>Expected token `%1&apos;</source>
+        <translation type="unfinished">Pričakovan žeton »%1«</translation>
+    </message>
+    <message>
+        <source>Property value set multiple times</source>
+        <translation type="unfinished">Vrednost lastnosti je bila nastavljena večkrat</translation>
+    </message>
+    <message>
+        <source>Expected type name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid import qualifier ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script import qualifiers must be unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script import requires a qualifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Library import requires a version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expected parameter type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid property type modifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected property type modifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expected property type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Readonly not yet supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>JavaScript declaration outside Script element</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativePauseAnimation</name>
+    <message>
+        <source>Cannot set a duration of &lt; 0</source>
+        <translation type="unfinished">Trajanja, ki je krajše od 0, ni moč nastaviti</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativePixmap</name>
+    <message>
+        <source>Error decoding: %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to get image from provider: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open: %1</source>
+        <translation type="unfinished">Ni moč odpreti %1: %2</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativePropertyAnimation</name>
+    <message>
+        <source>Cannot set a duration of &lt; 0</source>
+        <translation type="unfinished">Trajanja, ki je krajše od 0, ni moč nastaviti</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativePropertyChanges</name>
+    <message>
+        <source>PropertyChanges does not support creating state-specific objects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot assign to non-existent property &quot;%1&quot;</source>
+        <translation type="unfinished">Neobstoječi lastnosti »%1« ni moč prirediti</translation>
+    </message>
+    <message>
+        <source>Cannot assign to read-only property &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeTextInput</name>
+    <message>
+        <source>Could not load cursor delegate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not instantiate cursor delegate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeVME</name>
+    <message>
+        <source>Unable to create object of type %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot assign value %1 to property %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot assign object type %1 with no default method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot connect mismatched signal/slot %1 %vs. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot assign an object to signal property %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot assign object to list</source>
+        <translation type="unfinished">Objekta ni moč prirediti seznamu</translation>
+    </message>
+    <message>
+        <source>Cannot assign object to interface property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create attached object</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set properties on %1 as it is null</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeVisualDataModel</name>
+    <message>
+        <source>Delegate component must be Item type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeXmlListModel</name>
+    <message>
+        <source>Qt was built without support for xmlpatterns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeXmlListModelRole</name>
+    <message>
+        <source>An XmlRole query must not start with &apos;/&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeXmlRoleList</name>
+    <message>
+        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<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>SpeedoMeter</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>SliderHandle</source>
         <translation>SliderHandle</translation>
     </message>
@@ -1271,12 +2197,10 @@ v
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qdialog.cpp" line="+636"/>
         <source>What&apos;s This?</source>
         <translation>Kaj je to?</translation>
     </message>
     <message>
-        <location line="-135"/>
         <source>Done</source>
         <translation>Opravljeno</translation>
     </message>
@@ -1284,124 +2208,98 @@ v
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1872"/>
-        <location line="+464"/>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+606"/>
         <source>OK</source>
         <translation>V redu</translation>
     </message>
     <message>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+0"/>
         <source>&amp;OK</source>
         <translation>&amp;V redu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Save</source>
         <translation>&amp;Shrani</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Close</source>
         <translation>&amp;Zapri</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Apply</source>
         <translation>Uveljavi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Don&apos;t Save</source>
         <translation>Ne shrani</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Discard</source>
         <translation>Zavrzi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Yes</source>
         <translation>&amp;Da</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Yes to &amp;All</source>
         <translation>Da za &amp;vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;e za vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Save All</source>
         <translation>Shrani vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Abort</source>
         <translation>Prekini</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Retry</source>
         <translation>Poskusi znova</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ignore</source>
         <translation>Spreglej</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore Defaults</source>
         <translation>Obnovi privzete vrednosti</translation>
     </message>
     <message>
-        <location line="-29"/>
         <source>Close without Saving</source>
         <translation>Zapri brez shranjevanja</translation>
     </message>
@@ -1409,29 +2307,24 @@ v
 <context>
     <name>QDirModel</name>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+457"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Vrste</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <comment>All other platforms</comment>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Date Modified</source>
         <translation>Datum spremembe</translation>
     </message>
@@ -1439,17 +2332,14 @@ v
 <context>
     <name>QDockWidget</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblewidgets.cpp" line="+1239"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock</source>
         <translation>Zasidraj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Float</source>
         <translation>Naj lebdi</translation>
     </message>
@@ -1457,12 +2347,10 @@ v
 <context>
     <name>QDoubleSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-537"/>
         <source>More</source>
         <translation>Več</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Manj</translation>
     </message>
@@ -1470,27 +2358,22 @@ v
 <context>
     <name>QErrorMessage</name>
     <message>
-        <location filename="../src/gui/dialogs/qerrormessage.cpp" line="+208"/>
         <source>Debug Message:</source>
         <translation>Sporočilo razhroščevanja:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Warning:</source>
         <translation>Opozorilo:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Fatal Error:</source>
         <translation>Usodna napaka:</translation>
     </message>
     <message>
-        <location line="+200"/>
         <source>&amp;Show this message again</source>
         <translation>&amp;To sporočilo naslednjič spet prikaži</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;OK</source>
         <translation>&amp;V redu</translation>
     </message>
@@ -1498,38 +2381,30 @@ v
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/corelib/io/qfile.cpp" line="+697"/>
-        <location line="+155"/>
         <source>Destination file exists</source>
         <translation>Ciljna datoteka obstaja</translation>
     </message>
     <message>
-        <location line="-140"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Sekvenčna datoteka ne bo preimenovana z uporabo kopiranja blokov</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Cannot remove source file</source>
         <translation>Ni moč odstraniti izvorne datoteke</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>Cannot open %1 for input</source>
         <translation>Ni moč odpreti %1 za vhod</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Cannot open for output</source>
         <translation>Ni moč odpreti za izhod</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Failure to write block</source>
         <translation>Neuspeh pri zapisovanju bloka</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot create %1 for output</source>
         <translation>Ni moč ustvariti %1 za izhod</translation>
     </message>
@@ -1537,43 +2412,32 @@ v
 <context>
     <name>QFileDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+558"/>
-        <location line="+450"/>
         <source>All Files (*)</source>
         <translation>Vse datoteke (*)</translation>
     </message>
     <message>
-        <location line="+227"/>
         <source>Directories</source>
         <translation>Mape</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+50"/>
-        <location line="+1528"/>
         <source>&amp;Open</source>
         <translation>&amp;Odpri</translation>
     </message>
     <message>
-        <location line="-1578"/>
-        <location line="+50"/>
         <source>&amp;Save</source>
         <translation>&amp;Shrani</translation>
     </message>
     <message>
-        <location line="-741"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
-        <location line="+1508"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>%1 že obstaja.
 Ali jo želite nadomestiti?</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1
 File not found.
 Please verify the correct file name was given.</source>
@@ -1582,64 +2446,46 @@ Datoteka ni bila najdena.
 Preverite, ali je bilo podano pravilno ime datoteke.</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+402"/>
         <source>My Computer</source>
         <translation>Moj računalnik</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-1497"/>
         <source>&amp;Rename</source>
         <translation>Pre&amp;imenuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Delete</source>
         <translation>&amp;Izbriši</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show &amp;hidden files</source>
         <translation>Prikaži &amp;skrite datoteke</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Back</source>
         <translation>Nazaj</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Parent Directory</source>
         <translation>Matična mapa</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>List View</source>
         <translation>Prikaz seznama</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Detail View</source>
         <translation>Prikaz podrobnosti</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Files of type:</source>
         <translation>Datoteke vrste:</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+6"/>
-        <location line="+659"/>
         <source>Directory:</source>
         <translation>Mapa:</translation>
     </message>
     <message>
-        <location line="+776"/>
-        <location line="+862"/>
         <source>%1
 Directory not found.
 Please verify the correct directory name was given.</source>
@@ -1648,475 +2494,399 @@ Mapa ni bila najdena.
 Preverite, ali je bilo podano pravilno ime mape.</translation>
     </message>
     <message>
-        <location line="-218"/>
         <source>&apos;%1&apos; is write protected.
 Do you want to delete it anyway?</source>
         <translation>»%1« je zaščitena pred pisanjem.
 Ali jo kljub temu želite izbrisati?</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Are sure you want to delete &apos;%1&apos;?</source>
         <translation>Ali res želite izbrisati »%1«?</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Could not delete directory.</source>
         <translation>Ni bilo moč izbrisati mape.</translation>
     </message>
     <message>
-        <location line="+410"/>
         <source>Recent Places</source>
         <translation>Nedavna mesta</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog_win.cpp" line="+174"/>
         <source>All Files (*.*)</source>
         <translation>Vse datoteke (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2546"/>
         <source>Save As</source>
         <translation>Shrani kot</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+461"/>
         <source>Drive</source>
         <translation>Pogon</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>File Folder</source>
         <comment>Match Windows Explorer</comment>
         <translation>Mapa z datotekami</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Folder</source>
         <comment>All other platforms</comment>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Alias</source>
         <comment>Mac OS X Finder</comment>
         <translation>Drugo ime</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shortcut</source>
         <comment>All other platforms</comment>
         <translation>Bližnjica</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Unknown</source>
         <translation>Neznano</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-4"/>
         <source>Find Directory</source>
         <translation>Najdi mapo</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Show </source>
         <translation>Prikaži </translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Forward</source>
         <translation>Naprej</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+1963"/>
         <source>New Folder</source>
         <translation>Nova mapa</translation>
     </message>
     <message>
-        <location line="-1956"/>
         <source>&amp;New Folder</source>
         <translation>&amp;Nova mapa</translation>
     </message>
     <message>
-        <location line="+667"/>
-        <location line="+38"/>
         <source>&amp;Choose</source>
         <translation>Iz&amp;berite</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qsidebar.cpp" line="+442"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-698"/>
-        <location line="+663"/>
         <source>File &amp;name:</source>
         <translation>Ime &amp;datoteke:</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Look in:</source>
         <translation>Išči v:</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_embedded.ui"/>
         <source>Create New Folder</source>
         <translation>Ustvari novo mapo</translation>
     </message>
+    <message>
+        <source>Go back</source>
+        <translation type="unfinished">Vrni se nazaj</translation>
+    </message>
+    <message>
+        <source>Go forward</source>
+        <translation type="unfinished">Napreduj naprej</translation>
+    </message>
+    <message>
+        <source>Go to the parent directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a New Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change to list view mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change to detail view mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+828"/>
         <source>Invalid filename</source>
         <translation>Napačno ime datoteke</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;Imena »%1« ne morete uporabiti.&lt;/b&gt;&lt;p&gt;Poskusite z drugim imenom, ki vsebuje manj znakov ali pa ne vsebuje ločil.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Vrste</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <comment>All other platforms</comment>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Date Modified</source>
         <translation>Datum spremembe</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+258"/>
         <source>My Computer</source>
         <translation>Moj računalnik</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Computer</source>
         <translation>Računalnik</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="-164"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+476"/>
         <source>%1 TB</source>
         <translation>%1 TiB</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 GB</source>
         <translation>%1 GiB</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 MB</source>
         <translation>%1 MiB</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+2"/>
         <source>%1 KB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+1"/>
         <source>%1 bytes</source>
         <translation>%1 B</translation>
     </message>
+    <message>
+        <source>%1 byte(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFontDatabase</name>
     <message>
-        <location filename="../src/gui/text/qfontdatabase.cpp" line="+102"/>
-        <location line="+1335"/>
         <source>Normal</source>
         <translation>Normalno</translation>
     </message>
     <message>
-        <location line="-1332"/>
-        <location line="+12"/>
-        <location line="+1308"/>
         <source>Bold</source>
         <translation>Polkrepko</translation>
     </message>
     <message>
-        <location line="-1317"/>
-        <location line="+1319"/>
         <source>Demi Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1316"/>
-        <location line="+18"/>
-        <location line="+1294"/>
         <source>Black</source>
-        <translation type="unfinished">Črni</translation>
+        <translation type="unfinished">Črna</translation>
     </message>
     <message>
-        <location line="-1304"/>
         <source>Demi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+1304"/>
         <source>Light</source>
         <translation>Lahko</translation>
     </message>
     <message>
-        <location line="-1158"/>
-        <location line="+1161"/>
         <source>Italic</source>
         <translation>Ležeče</translation>
     </message>
     <message>
-        <location line="-1158"/>
-        <location line="+1160"/>
         <source>Oblique</source>
         <translation>Nagnjeno</translation>
     </message>
     <message>
-        <location line="+703"/>
         <source>Any</source>
         <translation>Katerikoli</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Latin</source>
         <translation>Latinska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Greek</source>
         <translation>Grška</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cyrillic</source>
         <translation>Cirilica</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Armenian</source>
         <translation>Armenska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Hebrew</source>
         <translation>Hebrejska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Arabic</source>
         <translation>Arabska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Syriac</source>
         <translation>Sirijska</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>Bengalska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gurmukhi</source>
         <translation>Gurmukhi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gujarati</source>
         <translation>Gujarati</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Oriya</source>
-        <translation type="unfinished">oriya</translation>
+        <translation>Oriya</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tamil</source>
         <translation>Tamilska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Telugu</source>
         <translation>Teluška</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Kannada</source>
-        <translation type="unfinished">kannada</translation>
+        <translation>Kannada</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Malayalam</source>
-        <translation type="unfinished">malayalam</translation>
+        <translation>Malayalam</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sinhala</source>
-        <translation type="unfinished">Sinhala</translation>
+        <translation>Sinhala</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thai</source>
         <translation>Tajska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lao</source>
         <translation>Laoška</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tibetan</source>
         <translation>Tibetanska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Myanmar</source>
         <translation>Mjanmarska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Georgian</source>
         <translation>Gruzijska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Khmer</source>
         <translation>Kmerska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Simplified Chinese</source>
         <translation>Poenostavljena kitajska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Traditional Chinese</source>
         <translation>Tradicionalna kitajska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Japanese</source>
         <translation>Japonska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Korean</source>
         <translation>Korejska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Vietnamese</source>
         <translation>Vietnamska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Symbol</source>
         <translation>Simbol</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ogham</source>
         <translation>Oghamska</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Runic</source>
         <translation>Runska</translation>
     </message>
+    <message>
+        <source>N&apos;Ko</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFontDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfontdialog.cpp" line="+776"/>
         <source>&amp;Font</source>
         <translation>&amp;Pisava</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font st&amp;yle</source>
         <translation>&amp;Slog pisave</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Velikost</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Effects</source>
         <translation>Učinki</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Stri&amp;keout</source>
         <translation>P&amp;rečrtaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Underline</source>
         <translation>Po&amp;dčrtaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sample</source>
         <translation>Vzorec</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Wr&amp;iting System</source>
         <translation>S&amp;istem pisanja</translation>
     </message>
     <message>
-        <location line="-609"/>
-        <location line="+257"/>
         <source>Select Font</source>
         <translation>Izberite pisavo</translation>
     </message>
@@ -2124,145 +2894,104 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QFtp</name>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+828"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+683"/>
         <source>Not connected</source>
         <translation>Brez povezave</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+65"/>
         <source>Host %1 not found</source>
         <translation>Gostitelj %1 ni bil najden</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+4"/>
         <source>Connection refused to host %1</source>
         <translation>Povezava z gostiteljem %1 je bila zavrnjena</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection timed out to host %1</source>
         <translation>Čas za povezavo z gostiteljem %1 je potekel</translation>
     </message>
     <message>
-        <location line="+104"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+102"/>
-        <location line="+1451"/>
         <source>Connected to host %1</source>
         <translation>Povezan z gostiteljem %1</translation>
     </message>
     <message>
-        <location line="+219"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1290"/>
         <source>Connection refused for data connection</source>
         <translation>Podatkovna povezava je bila zavrnjena</translation>
     </message>
     <message>
-        <location line="+178"/>
-        <location line="+29"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+195"/>
-        <location line="+728"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="+891"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+77"/>
         <source>Connecting to host failed:
 %1</source>
         <translation>Povezovanje z gostiteljem %1 ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Login failed:
 %1</source>
         <translation>Prijava ni uspela:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Listing directory failed:
 %1</source>
         <translation>Izpis seznama map ni uspel:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Changing directory failed:
 %1</source>
         <translation>Spreminjanje mape ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Downloading file failed:
 %1</source>
         <translation>Prejemanje datoteke ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Uploading file failed:
 %1</source>
         <translation>Pošiljanje datoteke ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Removing file failed:
 %1</source>
         <translation>Odstranjevanje datoteke ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Creating directory failed:
 %1</source>
         <translation>Ustvarjanje mape ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Removing directory failed:
 %1</source>
         <translation>Odstranjevanje mape ni uspelo:
 %1</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+25"/>
-        <location line="+250"/>
         <source>Connection closed</source>
         <translation>Povezava je bila prekinjena</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-11"/>
         <source>Host %1 found</source>
         <translation>Gostitelj %1 je bil najden</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection to %1 closed</source>
         <translation>Povezava s %1 je bila prekinjena</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Host found</source>
         <translation>Gostitelj je bil najden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Connected to host</source>
         <translation>Povezan z gostiteljem</translation>
     </message>
@@ -2270,43 +2999,33 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QHostInfo</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_p.h" line="+183"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
+    <message>
+        <source>No host name given</source>
+        <translation type="unfinished">Podano ni bilo nobeno ime gostitelja</translation>
+    </message>
 </context>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+257"/>
-        <location line="+32"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+220"/>
-        <location line="+27"/>
         <source>Host not found</source>
         <translation>Ni moč najti gostitelja</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>Neznana vrsta naslova</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-19"/>
-        <location line="+27"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-67"/>
         <source>No host name given</source>
         <translation>Podano ni bilo nobeno ime gostitelja</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Invalid hostname</source>
         <translation>Neveljavno ime gostitelja</translation>
     </message>
@@ -2314,155 +3033,110 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QHttp</name>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="+1582"/>
-        <location line="+820"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+1159"/>
-        <location line="+567"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="-568"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-370"/>
         <source>Request aborted</source>
         <translation>Zahteva prekinjena</translation>
     </message>
     <message>
-        <location line="+579"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+381"/>
         <source>No server set to connect to</source>
         <translation>Strežnik za povezavo ni nastavljen</translation>
     </message>
     <message>
-        <location line="+164"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+56"/>
         <source>Wrong content length</source>
         <translation>Napačna dolžina vsebine</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+4"/>
         <source>Server closed connection unexpectedly</source>
         <translation>Strežnik je nepričakovano prekinil povezavo</translation>
     </message>
     <message>
-        <location line="+200"/>
         <source>Unknown authentication method</source>
         <translation>Neznan način overjanja</translation>
     </message>
     <message>
-        <location line="+183"/>
         <source>Error writing response to device</source>
         <translation>Napaka pri pisanju odziva na napravo</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+569"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+38"/>
         <source>Connection refused</source>
         <translation>Povezava je zavrnjena</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-325"/>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-4"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+3"/>
         <source>Host %1 not found</source>
         <translation>Gostitelj %1 ni bil najden</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+10"/>
-        <location line="+19"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+3"/>
         <source>HTTP request failed</source>
         <translation>Zahtevek HTTP ni uspel</translation>
     </message>
     <message>
-        <location line="+94"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+69"/>
         <source>Invalid HTTP response header</source>
         <translation>Neveljavna glava odgovora HTTP</translation>
     </message>
     <message>
-        <location line="+125"/>
-        <location line="+48"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+40"/>
-        <location line="+47"/>
         <source>Invalid HTTP chunked body</source>
         <translation>Neveljavno razdeljeno telo HTTP</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+294"/>
         <source>Host %1 found</source>
         <translation>Gostitelj %1 je bil najden</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connected to host %1</source>
         <translation>Povezan z gostiteljem %1</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection to %1 closed</source>
         <translation>Povezava s %1 je bila prekinjena</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Host found</source>
         <translation>Gostitelj je bil najden</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connected to host</source>
         <translation>Povezan z gostiteljem</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-22"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+3"/>
         <source>Connection closed</source>
         <translation>Povezava je bila prekinjena</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-135"/>
         <source>Proxy authentication required</source>
         <translation>Potrebna je overitev pri posredniku</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Authentication required</source>
         <translation>Potrebna je overitev</translation>
     </message>
     <message>
-        <location line="-159"/>
         <source>Connection refused (or timed out)</source>
         <translation>Povezava je bila zavrnjena (ali pa je potekel čas)</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+6"/>
         <source>Proxy requires authentication</source>
         <translation>Posrednik zahteva overitev</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Host requires authentication</source>
         <translation>Gostitelj zahteva overitev</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Data corrupted</source>
         <translation>Podatki so okvarjeni</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unknown protocol specified</source>
         <translation>Naveden je bil neznan protokol</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>SSL handshake failed</source>
         <translation>Rokovanje SSL ni uspelo</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-2266"/>
         <source>HTTPS connection requested but SSL support not compiled in</source>
         <translation>Zahtevana je bila povezava HTTPS, a podpora za SSL ni bila vgrajena</translation>
     </message>
@@ -2470,47 +3144,38 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QHttpSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="-89"/>
         <source>Did not receive HTTP response from proxy</source>
         <translation>Od posrednika ni bil prejet odgovor HTTP</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Error parsing authentication request from proxy</source>
         <translation>Napaka pri razčlenjevanju overitvenega zahtevka od posrednika</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Authentication required</source>
         <translation>Potrebna je overitev</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Proxy denied connection</source>
         <translation>Posrednik je zavrnil povezavo</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Error communicating with HTTP proxy</source>
         <translation>Napaka pri komunikaciji s posrednikom HTTP</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Proxy server not found</source>
         <translation>Posredniški strežnik ni bil najden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection refused</source>
         <translation>Povezava s posrednikom je bila zavrnjena</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy server connection timed out</source>
         <translation>Čas za povezavo s posredniškim strežnikom je potekel</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection closed prematurely</source>
         <translation>Povezava s posrednikom je bila prekinjena predčasno</translation>
     </message>
@@ -2518,22 +3183,18 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QIBaseDriver</name>
     <message>
-        <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1491"/>
         <source>Error opening database</source>
         <translation>Napaka pri odpiranju podatkovne zbirke</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Could not start transaction</source>
         <translation>Ni bilo moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
@@ -2541,89 +3202,70 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QIBaseResult</name>
     <message>
-        <location line="-1149"/>
         <source>Unable to create BLOB</source>
         <translation>Ni moč ustvariti BLOB-a</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to write BLOB</source>
         <translation>Ni moč zapisati BLOB-a</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Unable to open BLOB</source>
         <translation>Ni moč odpreti BLOB-a</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Unable to read BLOB</source>
         <translation>Ni moč prebrati BLOB-a</translation>
     </message>
     <message>
-        <location line="+125"/>
-        <location line="+187"/>
         <source>Could not find array</source>
         <translation>Ni bilo moč najti polja</translation>
     </message>
     <message>
-        <location line="-155"/>
         <source>Could not get array data</source>
         <translation>Ni bilo moč pridobiti podatkov iz polja</translation>
     </message>
     <message>
-        <location line="+210"/>
         <source>Could not get query info</source>
         <translation>Ni bilo moč pridobiti podatkov o poizvedbi</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Could not start transaction</source>
         <translation>Ni bilo moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Could not allocate statement</source>
         <translation>Ni bilo moč dodeliti prostora za izjavo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Could not prepare statement</source>
         <translation>Ni bilo moč pripraviti izjave</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+11"/>
         <source>Could not describe input statement</source>
         <translation>Ni bilo moč opisati vhodne izjave</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Could not describe statement</source>
         <translation>Ni bilo moč opisati izjave</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unable to close statement</source>
         <translation>Ni moč zaključiti izjave</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unable to execute query</source>
         <translation>Ni moč izvesti poizvedbe</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Could not fetch next item</source>
         <translation>Ni bilo moč pridobiti sledeče postavke</translation>
     </message>
     <message>
-        <location line="+197"/>
         <source>Could not get statement info</source>
         <translation>Ni bilo moč pridobiti podatkov o izjavi</translation>
     </message>
@@ -2631,27 +3273,22 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/corelib/global/qglobal.cpp" line="+2058"/>
         <source>Permission denied</source>
         <translation>Nimate dovoljenja</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Too many open files</source>
         <translation>Preveč odprtih datotek</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No such file or directory</source>
         <translation>Ta datoteka ali mapa ne obstaja</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No space left on device</source>
         <translation>Ni prostora na napravi</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qiodevice.cpp" line="+1561"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
@@ -2659,32 +3296,26 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QInputContext</name>
     <message>
-        <location filename="../src/gui/inputmethod/qinputcontextfactory.cpp" line="+256"/>
         <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>Način za vnašanje XIM</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Windows input method</source>
         <translation>Način za vnašanje Windows</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Mac OS X input method</source>
         <translation>Način za vnašanje Mac OS X</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>S60 FEP input method</source>
         <translation>Način za vnašanje S60 FEP</translation>
     </message>
@@ -2692,7 +3323,6 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QInputDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qinputdialog.cpp" line="+223"/>
         <source>Enter a value:</source>
         <translation>Vnesite vrednost:</translation>
     </message>
@@ -2700,66 +3330,50 @@ Ali jo kljub temu želite izbrisati?</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>Ni bilo moč izvesti funkcije mmap za »%1«: %2</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>Neujemanje podatkov za potrjevanje vstavkov v »%1«</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Could not unmap &apos;%1&apos;: %2</source>
         <translation>Ni bilo moč izvesti funkcije unmap za »%1«: %2</translation>
     </message>
     <message>
-        <location line="+341"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Vstavek »%1« uporablja nezdružljivo knjižnico 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>Vstavek »%1« uporablja nezdružljivo knjižnico Qt. Pričakovan je bil ključ gradnje »%2«, dobljen je bil »%3«</translation>
     </message>
     <message>
-        <location line="+365"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="-402"/>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+343"/>
         <source>The shared library was not found.</source>
         <translation>Deljena knjižnica ni bila najdena.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
         <translation>Datoteka »%1« ni veljaven vstavek 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>Vstavek »%1« uporablja nezdružljivo knjižnico Qt. (Ni moč mešati knjižnic za razhroščevanje in izdajo.)</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>Ni moč naložiti knjižnice %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>Ni moč odstraniti knjižnice %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>Ni moč razrešiti simbola »%1« v %2: %3</translation>
     </message>
@@ -2767,37 +3381,30 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qlineedit.cpp" line="+1980"/>
         <source>&amp;Undo</source>
         <translation>&amp;Razveljavi</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Redo</source>
         <translation>&amp;Uveljavi</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Izreži</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiraj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Paste</source>
         <translation>Pri&amp;lepi</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
@@ -2805,23 +3412,18 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QLocalServer</name>
     <message>
-        <location filename="../src/network/socket/qlocalserver.cpp" line="+224"/>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+256"/>
         <source>%1: Name error</source>
         <translation>%1: napaka v imenu</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="-8"/>
         <source>%1: Permission denied</source>
         <translation>%1: nimate dovoljenja</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: Address in use</source>
         <translation>%1: naslov je že v uporabi</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1: Unknown error %2</source>
         <translation>%1: neznana napaka %2</translation>
     </message>
@@ -2829,70 +3431,46 @@ Ali jo kljub temu želite izbrisati?</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: povezava je bila zavrnjena</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Remote closed</source>
         <translation>%1: oddaljeni je prekinil</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="+80"/>
-        <location line="+45"/>
         <source>%1: Invalid name</source>
         <translation>%1: neveljavno ime</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket access error</source>
         <translation>%1: napaka pri dostopu do vtičnice</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket resource error</source>
         <translation>%1: napaka vira vtičnice</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: čas za dejanje na vtičnici je potekel</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Datagram too large</source>
         <translation>%1: datagram je prevelik</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="-50"/>
         <source>%1: Connection error</source>
         <translation>%1: napaka povezave</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: dejanje na vtičnici ni podprto</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: Unknown error</source>
         <translation>%1: neznana napaka</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: neznana napaka %2</translation>
     </message>
@@ -2900,27 +3478,22 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMYSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1261"/>
         <source>Unable to open database &apos;</source>
         <translation>Ni moč odpreti podatkovne zbirke »</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to connect</source>
         <translation>Ni moč vzpostaviti povezave</translation>
     </message>
     <message>
-        <location line="+151"/>
         <source>Unable to begin transaction</source>
         <translation>Ni moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
@@ -2928,59 +3501,46 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMYSQLResult</name>
     <message>
-        <location line="-969"/>
         <source>Unable to fetch data</source>
         <translation>Ni moč pridobiti podatkov</translation>
     </message>
     <message>
-        <location line="+183"/>
         <source>Unable to execute query</source>
         <translation>Ni moč izvesti poizvedbe</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to store result</source>
         <translation>Ni moč shraniti rezultata</translation>
     </message>
     <message>
-        <location line="+191"/>
-        <location line="+8"/>
         <source>Unable to prepare statement</source>
         <translation>Ni moč pripraviti izjave</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Unable to reset statement</source>
         <translation>Ni moč ponastaviti izjave</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>Unable to bind value</source>
         <translation>Ni moč prikleniti vrednosti</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to execute statement</source>
         <translation>Ni moč izvesti izjave</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+21"/>
         <source>Unable to bind outvalues</source>
         <translation>Ni moč prikleniti izhodnih vrednosti</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Unable to store statement results</source>
         <translation>Ni moč shraniti rezultatov izjave</translation>
     </message>
     <message>
-        <location line="-253"/>
         <source>Unable to execute next query</source>
         <translation>Ni moč izvesti sledeče poizvedbe</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Unable to store next result</source>
         <translation>Ni moč shraniti sledečega rezultata</translation>
     </message>
@@ -2988,7 +3548,6 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMdiArea</name>
     <message>
-        <location filename="../src/gui/widgets/qmdiarea.cpp" line="+290"/>
         <source>(Untitled)</source>
         <translation>(neimenovano)</translation>
     </message>
@@ -2996,92 +3555,74 @@ Ali jo kljub temu želite izbrisati?</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>Zapri</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>Minimize</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Restore Down</source>
         <translation>Obnovi navzdol</translation>
     </message>
     <message>
-        <location line="+707"/>
         <source>&amp;Restore</source>
         <translation>&amp;Obnovi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Move</source>
         <translation>&amp;Premakni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Velikost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mi&amp;nimize</source>
         <translation>Po&amp;manjšaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>&amp;Razpni</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Stay on &amp;Top</source>
         <translation>Ostani na &amp;vrhu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Close</source>
         <translation>&amp;Zapri</translation>
     </message>
     <message>
-        <location line="-787"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Maximize</source>
         <translation>Razpni</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unshade</source>
         <translation>Razvij</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Shade</source>
         <translation>Zvij</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Restore</source>
         <translation>Obnovi</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Menu</source>
         <translation>Meni</translation>
     </message>
@@ -3089,21 +3630,14 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMenu</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+157"/>
-        <location line="+225"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location line="-224"/>
-        <location line="+225"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+225"/>
-        <location line="+51"/>
         <source>Execute</source>
         <translation>Izvedi</translation>
     </message>
@@ -3111,7 +3645,6 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="../src/gui/widgets/qmenu_symbian.cpp" line="+410"/>
         <source>Actions</source>
         <translation>Dejanja</translation>
     </message>
@@ -3119,40 +3652,30 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1116"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="-848"/>
-        <location line="+847"/>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="-52"/>
-        <location line="+8"/>
         <source>OK</source>
         <translation>V redu</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;O Qt&lt;/h3&gt;&lt;p&gt;Ta program uporablja Qt različice %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>&lt;p&gt;Qt je skupek gradnikov C++ za razvoj programov, ki tečejo na več platformah.&lt;/p&gt;&lt;p&gt;Qt omogoča isto kodo prenašati med platformami Linux, Mac&amp;nbsp;OS&amp;nbsp;X, Windows in vsemi večjimi variantami UNIX-a. Qt je na voljo tudi za vgrajene naprave in sicer kot Qt for Embedded Linux in Qt for Windows CE.&lt;/p&gt;&lt;p&gt;Qt je na voljo pod tremi možnimi licenčnimi pogoji, ki ustrezajo različnim željam uporabnikov.&lt;/p&gt;&lt;p&gt;Qt pod licenco GNU General Public License različice 3.0 (&lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GPLv3.0&lt;/a&gt;) je primeren za razvoj programov Qt, ki so povsem &lt;a href=&quot;http://www.gnu.org/philosophy/free-sw.html&quot;&gt;prosti in odprto-kodni&lt;/a&gt;. S to licenco se uporabnikom programa zagotovijo vse pravice in svoboščine, kot jih je imel izdelovalec programa.&lt;/p&gt;&lt;p&gt;Qt pod licenco GNU Lesser General Public License različice 2.1 (&lt;a href=&quot;http://www.gnu.org/licenses/lgpl-2.1.html&quot;&gt;LGPLv2.1&lt;/a&gt;) omogoča tudi razvoj programov, ki uporabnikom ne zagotavljajo vseh pravic in svoboščin, kot jih je imel izdelovalec. Omogoča na primer tudi razvoj zaprto-kodnih programov.&lt;/p&gt;&lt;p&gt;Qt pod posebno komercialno licenco je namenjen razvoju lastniških in zaprto-kodnih programov, kjer izdelovalec z uporabniki noče deliti nič izvorne kode ter pravic in svoboščin, ali pa ne more ustreči pogojem licenc GPLv3.0 ali LGPLv2.1.&lt;/p&gt;&lt;p&gt;Za pregled licenčnih možnosti si oglejte spletno stran &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;Avtorske pravice © 2009 Nokia Corporation in/ali podružnice ter zunanji prispevajoči.&lt;/p&gt;&lt;p&gt;Qt je proizvod podjetja Nokia. Za dodatne podatke si oglejte &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>About Qt</source>
         <translation>O Qt</translation>
     </message>
     <message>
-        <location line="-1611"/>
         <source>Show Details...</source>
         <translation>Prikaži podrobnosti ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Details...</source>
         <translation>Skrij podrobnosti ...</translation>
     </message>
@@ -3160,7 +3683,6 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMultiInputContext</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp" line="+88"/>
         <source>Select IM</source>
         <translation>Izberite način vnašanja</translation>
     </message>
@@ -3168,12 +3690,10 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMultiInputContextPlugin</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp" line="+95"/>
         <source>Multiple input method switcher</source>
         <translation>Orodje za preklop med načini vnašanja</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Multiple input method switcher that uses the context menu of the text widgets</source>
         <translation>Orodje za preklop med več načini vnašanja, ki uporablja priročni meni besedilnih gradnikov</translation>
     </message>
@@ -3181,132 +3701,106 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNativeSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qnativesocketengine.cpp" line="+206"/>
         <source>The remote host closed the connection</source>
         <translation>Oddaljen gostitelj je prekinil povezavo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network operation timed out</source>
         <translation>Čas za omrežni postopek je potekel</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Out of resources</source>
         <translation>Zmanjkalo je virov</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unsupported socket operation</source>
         <translation>Nepodprto dejanje za vtičnico</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Protocol type not supported</source>
         <translation>Vrsta protokola ni podprta</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid socket descriptor</source>
         <translation>Neveljaven opisnik vtičnice</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Network unreachable</source>
         <translation>Omrežje ni dosegljivo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Permission denied</source>
         <translation>Nimate dovoljenja</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection timed out</source>
         <translation>Čas za povezavo je potekel</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection refused</source>
         <translation>Povezava je zavrnjena</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The bound address is already in use</source>
         <translation>Naslov za vezavo je že v uporabi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is not available</source>
         <translation>Naslov ni na voljo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is protected</source>
         <translation>Naslov je zaščiten</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to send a message</source>
         <translation>Ni moč poslati sporočila</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to receive a message</source>
         <translation>Ni moč prejeti sporočila</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to write</source>
         <translation>Ni moč zapisovati</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network error</source>
         <translation>Napaka v omrežju</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Another socket is already listening on the same port</source>
         <translation>Druga vtičnica že posluša na istih vratih</translation>
     </message>
     <message>
-        <location line="-66"/>
         <source>Unable to initialize non-blocking socket</source>
         <translation>Ni moč inicializirati ne-blokirne vtičnice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to initialize broadcast socket</source>
         <translation>Ni moč inicializirati vtičnice za oddajanje</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
         <translation>Poskus uporabe vtičnice IPv6 na platformi brez podpore za IPv6</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Host unreachable</source>
         <translation>Gostitelj ni dosegljiv</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Datagram was too large to send</source>
         <translation>Datagram je bil prevelik za pošiljanje</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Operation on non-socket</source>
         <translation>Dejanje na ne-vtičnici</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>The proxy type is invalid for this operation</source>
         <translation>Vrsta posrednika za to dejanje ni veljavna</translation>
     </message>
@@ -3314,43 +3808,55 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkAccessCacheBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesscachebackend.cpp" line="+66"/>
         <source>Error opening %1</source>
         <translation>Napaka pri odpiranju %1</translation>
     </message>
 </context>
 <context>
+    <name>QNetworkAccessDataBackend</name>
+    <message>
+        <source>Operation not supported on %1</source>
+        <translation type="unfinished">Dejanje na %1 ni podprto</translation>
+    </message>
+    <message>
+        <source>Invalid URI: %1</source>
+        <translation type="unfinished">Neveljaven URI: %1</translation>
+    </message>
+</context>
+<context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+195"/>
         <source>Write error writing to %1: %2</source>
         <translation>Napaka pri zapisovanju v %1: %2</translation>
     </message>
+    <message>
+        <source>Socket error on %1: %2</source>
+        <translation type="unfinished">Napaka vtičnice na %1: %2</translation>
+    </message>
+    <message>
+        <source>Remote host closed the connection prematurely on %1</source>
+        <translation type="unfinished">Oddaljen gostitelj je predčasno prekinil povezavo na %1</translation>
+    </message>
 </context>
 <context>
     <name>QNetworkAccessFileBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+100"/>
         <source>Request for opening non-local file %1</source>
         <translation>Zahtevek za odprtje ne-krajevne datoteke %1</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Error opening %1: %2</source>
         <translation>Napaka pri odpiranju %1: %2</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Write error writing to %1: %2</source>
         <translation>Napaka pri zapisovanju v %1: %2</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Cannot open %1: Path is a directory</source>
         <translation>Ni moč odpreti %1: pot je mapa</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Read error reading from %1: %2</source>
         <translation>Napaka pri branju iz %1: %2</translation>
     </message>
@@ -3358,27 +3864,22 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkAccessFtpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessftpbackend.cpp" line="+131"/>
         <source>No suitable proxy found</source>
         <translation>Najden ni bil noben primeren posrednik</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Cannot open %1: is a directory</source>
         <translation>Ni moč odpreti %1: to je mapa</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Logging in to %1 failed: authentication required</source>
         <translation>Prijava v %1 ni uspela: potrebna je overitev</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Error while downloading %1: %2</source>
         <translation>Napaka med prejemanjem %1: %2</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Error while uploading %1: %2</source>
         <translation>Napaka med pošiljanjem %1: %2</translation>
     </message>
@@ -3386,58 +3887,105 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+585"/>
         <source>No suitable proxy found</source>
         <translation>Najden ni bil noben primeren posrednik</translation>
     </message>
 </context>
 <context>
+    <name>QNetworkAccessManager</name>
+    <message>
+        <source>Network access is disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QNetworkReply</name>
     <message>
-        <location line="+95"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Napaka med prejemanjem %1 - strežnikov odgovor: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+77"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Neznan protokol »%1«</translation>
     </message>
+    <message>
+        <source>Network session error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temporary network failure.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QNetworkReplyImpl</name>
     <message>
-        <location line="+519"/>
-        <location line="+28"/>
         <source>Operation canceled</source>
         <translation>Postopek je bil preklican</translation>
     </message>
 </context>
 <context>
+    <name>QNetworkSession</name>
+    <message>
+        <source>Invalid configuration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkSessionPrivateImpl</name>
+    <message>
+        <source>Roaming error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session aborted by user or system</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unidentified Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown session error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The session was aborted by the user or system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The requested operation is not supported by the system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The specified configuration cannot be used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Roaming was aborted or is not possible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QOCIDriver</name>
     <message>
-        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+2076"/>
         <source>Unable to logon</source>
         <translation>Ni se moč prijaviti</translation>
     </message>
     <message>
-        <location line="-144"/>
         <source>Unable to initialize</source>
         <comment>QOCIDriver</comment>
         <translation>Ni moč inicializirati</translation>
     </message>
     <message>
-        <location line="+215"/>
         <source>Unable to begin transaction</source>
         <translation>Ni moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
@@ -3445,44 +3993,34 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QOCIResult</name>
     <message>
-        <location line="-972"/>
-        <location line="+161"/>
-        <location line="+15"/>
         <source>Unable to bind column for batch execute</source>
         <translation>Ni moč prikleniti stolpca za paketno izvršitev</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to execute batch statement</source>
         <translation>Ni moč izvesti paketne izjave</translation>
     </message>
     <message>
-        <location line="+304"/>
         <source>Unable to goto next</source>
         <translation>Ni se moč prestaviti na naslednjega</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Unable to alloc statement</source>
         <translation>Ni moč dodeliti izjave</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to prepare statement</source>
         <translation>Ni moč pripraviti izjave</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Unable to get statement type</source>
         <translation>Ni moč pridobiti vrste izjave</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to bind value</source>
         <translation>Ni moč prikleniti vrednosti</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to execute statement</source>
         <translation>Ni moč izvesti izjave</translation>
     </message>
@@ -3490,32 +4028,26 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QODBCDriver</name>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1790"/>
         <source>Unable to connect</source>
         <translation>Ni moč vzpostaviti povezave</translation>
     </message>
     <message>
-        <location line="+238"/>
         <source>Unable to disable autocommit</source>
         <translation>Ni moč onemogočiti samodejnega udejanjanja</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to enable autocommit</source>
         <translation>Ni moč omogočiti samodejnega udejanjanja</translation>
     </message>
     <message>
-        <location line="-281"/>
         <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
         <translation>Ni se moč povezati - gonilnik ne podpira vseh potrebnih zmožnosti</translation>
     </message>
@@ -3523,51 +4055,38 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QODBCResult</name>
     <message>
-        <location line="-932"/>
-        <location line="+346"/>
         <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
         <translation>QODBCResult::reset: ni moč nastaviti &apos;SQL_CURSOR_STATIC&apos; kot lastnosti izjave. Preverite nastavitve gonilnika ODBC</translation>
     </message>
     <message>
-        <location line="-329"/>
-        <location line="+623"/>
         <source>Unable to execute statement</source>
         <translation>Ni moč izvesti izjave</translation>
     </message>
     <message>
-        <location line="-547"/>
         <source>Unable to fetch next</source>
         <translation>Ni moč pridobiti sledečega</translation>
     </message>
     <message>
-        <location line="+271"/>
         <source>Unable to prepare statement</source>
         <translation>Ni moč pripraviti izjave</translation>
     </message>
     <message>
-        <location line="+268"/>
         <source>Unable to bind variable</source>
         <translation>Ni moč prikleniti spremenljivke</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+190"/>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-467"/>
-        <location line="+576"/>
         <source>Unable to fetch last</source>
         <translation>Ni moč pridobiti zadnjega</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-670"/>
         <source>Unable to fetch</source>
         <translation>Ni moč pridobiti</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Unable to fetch first</source>
         <translation>Ni moč pridobiti prvega</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch previous</source>
         <translation>Ni moč pridobiti predhodnega</translation>
     </message>
@@ -3575,46 +4094,25 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="-97"/>
-        <source>Invalid hostname</source>
-        <translation>Neveljavno ime gostitelja</translation>
+        <source>PulseAudio Sound Server</source>
+        <translation type="unfinished">Zvočni strežnik PulseAudio</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdatabackend.cpp" line="+74"/>
-        <source>Operation not supported on %1</source>
-        <translation>Dejanje na %1 ni podprto</translation>
-    </message>
-    <message>
-        <location line="+57"/>
-        <source>Invalid URI: %1</source>
-        <translation>Neveljaven URI: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+60"/>
-        <source>Socket error on %1: %2</source>
-        <translation>Napaka vtičnice na %1: %2</translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Remote host closed the connection prematurely on %1</source>
-        <translation>Oddaljen gostitelj je predčasno prekinil povezavo na %1</translation>
+        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/network/kernel/qhostinfo.cpp" line="+175"/>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+0"/>
-        <source>No host name given</source>
-        <translation>Podano ni bilo nobeno ime gostitelja</translation>
+        <source>invalid query: &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1198"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Vrednost</translation>
     </message>
@@ -3622,32 +4120,26 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QPSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/psql/qsql_psql.cpp" line="+782"/>
         <source>Unable to connect</source>
         <translation>Ni moč vzpostaviti povezave</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Could not begin transaction</source>
         <translation>Ni bilo moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Could not commit transaction</source>
         <translation>Ni bilo moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Could not rollback transaction</source>
         <translation>Ni bilo moč razveljaviti transakcije</translation>
     </message>
     <message>
-        <location line="+374"/>
         <source>Unable to subscribe</source>
         <translation>Ni se moč naročiti</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Unable to unsubscribe</source>
         <translation>Ni moč preklicati naročnine</translation>
     </message>
@@ -3655,12 +4147,10 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QPSQLResult</name>
     <message>
-        <location line="-1085"/>
         <source>Unable to create query</source>
         <translation>Ni moč ustvariti poizvedbe</translation>
     </message>
     <message>
-        <location line="+372"/>
         <source>Unable to prepare statement</source>
         <translation>Ni moč pripraviti izjave</translation>
     </message>
@@ -3668,102 +4158,82 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QPageSetupWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="+304"/>
         <source>Centimeters (cm)</source>
         <translation>Centimetri (cm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Millimeters (mm)</source>
         <translation>Milimetri (mm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Inches (in)</source>
         <translation>Palci (in)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Points (pt)</source>
         <translation>Pike (pt)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupwidget.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Paper</source>
         <translation>Papir</translation>
     </message>
     <message>
-        <location/>
         <source>Page size:</source>
         <translation>Velikost strani:</translation>
     </message>
     <message>
-        <location/>
         <source>Width:</source>
         <translation>Širina:</translation>
     </message>
     <message>
-        <location/>
         <source>Height:</source>
         <translation>Višina:</translation>
     </message>
     <message>
-        <location/>
         <source>Paper source:</source>
         <translation>Vir papirja:</translation>
     </message>
     <message>
-        <location/>
         <source>Orientation</source>
         <translation>Usmeritev</translation>
     </message>
     <message>
-        <location/>
         <source>Portrait</source>
         <translation>Pokončno</translation>
     </message>
     <message>
-        <location/>
         <source>Landscape</source>
         <translation>Ležeče</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse landscape</source>
         <translation>Obrnjeno ležeče</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse portrait</source>
         <translation>Obrnjeno pokončno</translation>
     </message>
     <message>
-        <location/>
         <source>Margins</source>
         <translation>Robovi</translation>
     </message>
     <message>
-        <location/>
         <source>top margin</source>
         <translation>vrhnji rob</translation>
     </message>
     <message>
-        <location/>
         <source>left margin</source>
         <translation>levi rob</translation>
     </message>
     <message>
-        <location/>
         <source>right margin</source>
         <translation>desni rob</translation>
     </message>
     <message>
-        <location/>
         <source>bottom margin</source>
         <translation>spodnji rob</translation>
     </message>
@@ -3771,12 +4241,10 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QPluginLoader</name>
     <message>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+24"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="-113"/>
         <source>The plugin was not loaded.</source>
         <translation>Vstavek ni bil naložen.</translation>
     </message>
@@ -3784,428 +4252,344 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+108"/>
         <source>locally connected</source>
         <translation>krajevno povezan</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <location line="+225"/>
         <source>Aliases: %1</source>
         <translation>Vzdevki: %1</translation>
     </message>
     <message>
-        <location line="+223"/>
-        <location line="+199"/>
         <source>unknown</source>
         <translation>neznano</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+329"/>
         <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 palcev)</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="+1"/>
         <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="+1"/>
         <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 palcev)</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="+1"/>
         <source>B10 (31 x 44 mm)</source>
         <translation>B10 (31 x 44 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <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 line="+1"/>
         <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source>
         <translation>Executive (7,5 x 10 palcev, 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 palcev, 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 palcev, 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/qprintdialog_win.cpp" line="+266"/>
+        <source>Print current page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>OK</source>
         <translation>V redu</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qabstractprintdialog.cpp" line="+112"/>
-        <location line="+13"/>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="-2"/>
         <source>Print</source>
         <translation>Natisni</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-357"/>
         <source>Print To File ...</source>
         <translation>Natisni v datoteko ...</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+19"/>
         <source>Print range</source>
         <translation>Natisni obseg</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Print all</source>
         <translation>Natisni vse</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+80"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
         <translation>V datoteko %1 ni moč pisati.
 Izberite drugo ime datoteke.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 already exists.
 Do you want to overwrite it?</source>
         <translation>%1 že obstaja.
 Ali jo želite nadomestiti?</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-227"/>
         <source>File exists</source>
         <translation>Datoteka obstaja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Do you want to overwrite it?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Ali jo želite nadomestiti?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location line="+227"/>
         <source>Print selection</source>
         <translation>Natisni izbor</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-8"/>
         <source>%1 is a directory.
 Please choose a different file name.</source>
         <translation>%1 je mapa.
 Izberite drugo ime datoteke.</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>Po meri</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-524"/>
-        <location line="+68"/>
         <source>&amp;Options &gt;&gt;</source>
         <translation>&amp;Možnosti »</translation>
     </message>
     <message>
-        <location line="-63"/>
         <source>&amp;Print</source>
         <translation>Na&amp;tisni</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>&amp;Options &lt;&lt;</source>
         <translation>&amp;Možnosti «</translation>
     </message>
     <message>
-        <location line="+253"/>
         <source>Print to File (PDF)</source>
         <translation>Natisni v datoteko (PDF)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print to File (Postscript)</source>
         <translation>Natisni v datoteko (PostScript)</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>Local file</source>
         <translation>Krajevna datoteka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write %1 file</source>
         <translation>Zapiši datoteko %1</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>Vrednost »Od« ne more biti večja od vrednosti »Do«.</translation>
     </message>
@@ -4213,103 +4597,86 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QPrintPreviewDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qabstractpagesetupdialog.cpp" line="+68"/>
-        <location line="+12"/>
         <source>Page Setup</source>
         <translation>Nastavitve strani</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+246"/>
         <source>%1%</source>
         <translation>%1 %</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Print Preview</source>
         <translation>Ogled tiskanja</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Next page</source>
         <translation>Naslednja stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous page</source>
         <translation>Predhodna stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>First page</source>
         <translation>&amp;Prva stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Last page</source>
         <translation>&amp;Zadnja stran</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Fit width</source>
         <translation>Prilagodi &amp;širini</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Fit page</source>
         <translation>Prilagodi strani</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Zoom in</source>
         <translation>Povečaj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom out</source>
         <translation>Zmanjšaj</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Portrait</source>
         <translation>Pokončno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Landscape</source>
         <translation>Ležeče</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Show single page</source>
         <translation>Prikaži enojno stran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show facing pages</source>
         <translation>Prikaži dve strani</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show overview of all pages</source>
         <translation>Prikaži ogled vseh strani</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Print</source>
         <translation>Natisni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page setup</source>
         <translation>Nastavitve strani</translation>
     </message>
     <message>
-        <location line="+150"/>
+        <source>Close</source>
+        <translation type="unfinished">Zapri</translation>
+    </message>
+    <message>
         <source>Export to PDF</source>
         <translation>Izvozi v PDF</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Export to PostScript</source>
         <translation>Izvozi v PostScript</translation>
     </message>
@@ -4317,17 +4684,14 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QPrintPropertiesWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpropertieswidget.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Page</source>
         <translation>Stran</translation>
     </message>
     <message>
-        <location/>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
@@ -4335,145 +4699,121 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QPrintSettingsOutput</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintsettingsoutput.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Copies</source>
         <translation>Izvodi</translation>
     </message>
     <message>
-        <location/>
         <source>Print range</source>
         <translation>Obseg tiskanja</translation>
     </message>
     <message>
-        <location/>
         <source>Print all</source>
         <translation>Natisni vse</translation>
     </message>
     <message>
-        <location/>
         <source>Pages from</source>
         <translation>Strani od</translation>
     </message>
     <message>
-        <location/>
         <source>to</source>
         <translation>do</translation>
     </message>
     <message>
-        <location/>
         <source>Selection</source>
         <translation>Izbor</translation>
     </message>
     <message>
-        <location/>
         <source>Output Settings</source>
         <translation>Nastavitve izpisa</translation>
     </message>
     <message>
-        <location/>
         <source>Copies:</source>
         <translation>Izvodi:</translation>
     </message>
     <message>
-        <location/>
         <source>Collate</source>
         <translation>Združi</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse</source>
         <translation>V nasprotno smer</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location/>
         <source>Color Mode</source>
         <translation>Barvni način</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location/>
         <source>Grayscale</source>
         <translation>Sivinsko</translation>
     </message>
     <message>
-        <location/>
         <source>Duplex Printing</source>
         <translation>Dvostransko tiskanje</translation>
     </message>
     <message>
-        <location/>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
-        <location/>
         <source>Long side</source>
         <translation>Dolga stranica</translation>
     </message>
     <message>
-        <location/>
         <source>Short side</source>
         <translation>Kratka stranica</translation>
     </message>
+    <message>
+        <source>Current Page</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPrintWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintwidget.ui"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location/>
         <source>Printer</source>
         <translation>Tiskalnik</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Ime:</translation>
     </message>
     <message>
-        <location/>
         <source>P&amp;roperties</source>
         <translation>&amp;Lastnosti ...</translation>
     </message>
     <message>
-        <location/>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Ogled</translation>
     </message>
     <message>
-        <location/>
         <source>Type:</source>
         <translation>Vrsta:</translation>
     </message>
     <message>
-        <location/>
         <source>Output &amp;file:</source>
         <translation>Izhodna d&amp;atoteka:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4481,62 +4821,38 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QProcess</name>
     <message>
-        <location filename="../src/corelib/io/qprocess_unix.cpp" line="+402"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+137"/>
         <source>Could not open input redirection for reading</source>
         <translation>Preusmeritve vhoda ni bilo moč odpreti za branje</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>Preusmeritve izhoda ni bilo moč odpreti za pisanje</translation>
     </message>
     <message>
-        <location line="+239"/>
         <source>Resource error (fork failure): %1</source>
         <translation>Napaka vira (spodletela odcepitev): %1</translation>
     </message>
     <message>
-        <location line="+252"/>
-        <location line="+52"/>
-        <location line="+74"/>
-        <location line="+66"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+406"/>
-        <location line="+50"/>
-        <location line="+75"/>
-        <location line="+42"/>
-        <location line="+54"/>
         <source>Process operation timed out</source>
         <translation>Čas za dejanje procesa je potekel</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess.cpp" line="+855"/>
-        <location line="+52"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-211"/>
-        <location line="+50"/>
         <source>Error reading from process</source>
         <translation>Napaka pri branju iz procesa</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+826"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+140"/>
         <source>Error writing to process</source>
         <translation>Napak pri pisanju v proces</translation>
     </message>
     <message>
-        <location line="-756"/>
         <source>Process crashed</source>
         <translation>Program se je sesul</translation>
     </message>
     <message>
-        <location line="+959"/>
         <source>No program defined</source>
         <translation>Določenega ni nobenega programa</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-360"/>
         <source>Process failed to start: %1</source>
         <translation>Proces se ni uspel zagnati: %1</translation>
     </message>
@@ -4544,7 +4860,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QProgressDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprogressdialog.cpp" line="+196"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
@@ -4552,7 +4867,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-8"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
@@ -4560,7 +4874,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QRadioButton</name>
     <message>
-        <location line="+12"/>
         <source>Check</source>
         <translation>Označi</translation>
     </message>
@@ -4568,57 +4881,46 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QRegExp</name>
     <message>
-        <location filename="../src/corelib/tools/qregexp.cpp" line="+65"/>
         <source>no error occurred</source>
         <translation>ni nobene napake</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>disabled feature used</source>
         <translation>uporabljena onemogočena zmožnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad char class syntax</source>
         <translation>napačna sintaksa znakovnega razreda</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad lookahead syntax</source>
         <translation>napačna sintaksa pogleda naprej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad repetition syntax</source>
         <translation>napačna sintaksa ponavljanja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid octal value</source>
         <translation>neveljavna osmiška vrednost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>missing left delim</source>
         <translation>manjkajoč levi razmejitelj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected end</source>
         <translation>nepričakovan konece</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>met internal limit</source>
         <translation>dosežena notranja omejitev</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid interval</source>
         <translation>neveljaven interval</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid category</source>
         <translation>neveljavna kategorija</translation>
     </message>
@@ -4626,22 +4928,18 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSQLite2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+391"/>
         <source>Error opening database</source>
         <translation>Napaka pri odpiranju podatkovne zbirke</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Unable to begin transaction</source>
         <translation>Ni moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
@@ -4649,12 +4947,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSQLite2Result</name>
     <message>
-        <location line="-319"/>
         <source>Unable to fetch results</source>
         <translation>Ni moč pridobiti rezultatov</translation>
     </message>
     <message>
-        <location line="+143"/>
         <source>Unable to execute statement</source>
         <translation>Ni moč izvesti izjave</translation>
     </message>
@@ -4662,27 +4958,22 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSQLiteDriver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+544"/>
         <source>Error opening database</source>
         <translation>Napaka pri odpiranju podatkovne zbirke</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Error closing database</source>
         <translation>Napaka pri zapiranju podatkovne zbirke</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to begin transaction</source>
         <translation>Ni moč začeti transakcije</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to commit transaction</source>
         <translation>Ni moč udejaniti transakcije</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to rollback transaction</source>
         <translation>Ni moč razveljaviti transakcije</translation>
     </message>
@@ -4690,34 +4981,26 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSQLiteResult</name>
     <message>
-        <location line="-408"/>
-        <location line="+66"/>
-        <location line="+8"/>
         <source>Unable to fetch row</source>
         <translation>Ni moč pridobiti vrstice</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Unable to execute statement</source>
         <translation>Ni moč izvesti izjave</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to reset statement</source>
         <translation>Ni moč ponastaviti izjave</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Unable to bind parameters</source>
         <translation>Ni moč prikleniti parametrov</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Parameter count mismatch</source>
         <translation>Neujemanje v številu parametrov</translation>
     </message>
     <message>
-        <location line="-204"/>
         <source>No query</source>
         <translation>Brez poizvedbe</translation>
     </message>
@@ -4725,32 +5008,26 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptBreakpointsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointsmodel.cpp" line="+455"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Condition</source>
         <translation>Pogoj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ignore-count</source>
         <translation>Število prezrtij</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Single-shot</source>
         <translation>Enojen zadetek</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Hit-count</source>
         <translation>Število zadetkov</translation>
     </message>
@@ -4758,12 +5035,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptBreakpointsWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointswidget.cpp" line="+298"/>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
@@ -4771,143 +5046,114 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+885"/>
-        <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Pojdi v vrstico</translation>
     </message>
     <message>
-        <location line="-1012"/>
         <source>Line:</source>
         <translation>Vrstica:</translation>
     </message>
     <message>
-        <location line="+791"/>
         <source>Interrupt</source>
         <translation>Prekini</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F5</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F5</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F5</source>
-        <translation type="unfinished"></translation>
+        <translation>F5</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Into</source>
         <translation>Vstopi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F11</source>
-        <translation type="unfinished"></translation>
+        <translation>F11</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Over</source>
         <translation>Prestopi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F10</source>
-        <translation type="unfinished"></translation>
+        <translation>F10</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Step Out</source>
         <translation>Izstopi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F11</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F11</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Run to Cursor</source>
         <translation>Zaženi do kazalca</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ctrl+F10</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+F10</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Run to New Script</source>
         <translation>Zaženi do novega skripta</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Toggle Breakpoint</source>
         <translation>Preklopi prekinitveno točko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>F9</source>
-        <translation type="unfinished"></translation>
+        <translation>F9</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Clear Debug Output</source>
         <translation>Počisti razhroščevalni izhod</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Clear Error Log</source>
         <translation>Počisti dnevnik napak</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Clear Console</source>
         <translation>Počisti konzolo</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>&amp;Find in Script...</source>
         <translation>Najdi v &amp;skriptu ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+F</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Find &amp;Next</source>
         <translation>Najdi &amp;naslednje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>F3</source>
-        <translation type="unfinished"></translation>
+        <translation>F3</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Find &amp;Previous</source>
         <translation>Najdi &amp;predhodno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Shift+F3</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F3</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Debug</source>
         <translation>Razhrošči</translation>
     </message>
@@ -4915,32 +5161,26 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptDebuggerCodeFinderWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp" line="+141"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Previous</source>
         <translation>Predhodno</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Next</source>
         <translation>Naslednje</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Case Sensitive</source>
         <translation>Občutljivo na velikost črk</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Whole words</source>
         <translation>Cele besede</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;Iskanje se nadaljuje na drugem koncu</translation>
     </message>
@@ -4948,12 +5188,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+872"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Vrednost</translation>
     </message>
@@ -4961,17 +5199,14 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptDebuggerStackModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerstackmodel.cpp" line="+161"/>
         <source>Level</source>
         <translation>Stopnja</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -4979,22 +5214,18 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptEdit</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptedit.cpp" line="+411"/>
         <source>Toggle Breakpoint</source>
         <translation>Preklopi prekinitveno točko</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Disable Breakpoint</source>
         <translation>Onemogoči prekinitveno točko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable Breakpoint</source>
         <translation>Omogoči prekinitveno točko</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Breakpoint Condition:</source>
         <translation>Pogoj za prelomno točko:</translation>
     </message>
@@ -5002,52 +5233,42 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptEngineDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptenginedebugger.cpp" line="+523"/>
         <source>Loaded Scripts</source>
         <translation>Naloženi skripti</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Breakpoints</source>
         <translation>Prelomne točke</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stack</source>
         <translation>Sklad</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Locals</source>
         <translation>Krajevno</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Console</source>
         <translation>Konzola</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Debug Output</source>
         <translation>Razhroščevalni izhod</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Error Log</source>
         <translation>Dnevnik napak</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Search</source>
         <translation>Išči</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>View</source>
         <translation>Videz</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Qt Script Debugger</source>
         <translation>Razhroščevalnik za Qt Script</translation>
     </message>
@@ -5055,7 +5276,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptNewBreakpointWidget</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptbreakpointswidget.cpp" line="-223"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
@@ -5063,84 +5283,66 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScrollBar</name>
     <message>
-        <location filename="../src/gui/widgets/qscrollbar.cpp" line="+454"/>
         <source>Scroll here</source>
         <translation>Premakni sem</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Left edge</source>
         <translation>Levi rob</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
         <translation>Vrh</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
         <translation>Desni rob</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>Dno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Page left</source>
         <translation>Za stran levo</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+143"/>
         <source>Page up</source>
         <translation>Za stran gor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>Za stran desno</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+4"/>
         <source>Page down</source>
         <translation>Za stran dol</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Scroll left</source>
         <translation>Premakni levo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Premakni gor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Premakni desno</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Premakni dol</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-6"/>
         <source>Line up</source>
         <translation>V vrsto</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Position</source>
         <translation>Položaj</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Line down</source>
         <translation>Za vrstico dol</translation>
     </message>
@@ -5148,111 +5350,78 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSharedMemory</name>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="+223"/>
         <source>%1: unable to set key on lock</source>
         <translation>%1: ni moč nastaviti ključa na zaklep</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>%1: create size is less then 0</source>
         <translation>%1: velikost je manjša 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: ni moč zakleniti</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1: unable to unlock</source>
         <translation>%1: ni moč odkleniti</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_symbian.cpp" line="+83"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+80"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+87"/>
         <source>%1: permission denied</source>
         <translation>%1: nimate dovoljenja</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: že obstaja</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: doesn&apos;t exists</source>
         <translation>%1: ne obstaja</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: zmanjkalo je virov</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: neznana napaka %2</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+21"/>
         <source>%1: key is empty</source>
         <translation>%1: ključ je prazen</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>%1: ftok failed</source>
         <translation>%1: funkcija ftok ni uspela</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: ni moč ustvariti ključa</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: ne obstaja</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>%1: UNIX key file doesn&apos;t exist</source>
         <translation>%1: UNIX-ova zaklepna datoteka ne obstaja</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: sistemsko vsiljene omejitve velikosti</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1: not attached</source>
         <translation>%1: ni pripeto</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: neveljavna velikost</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+63"/>
         <source>%1: key error</source>
         <translation>%1: napaka ključa</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+32"/>
         <source>%1: size query failed</source>
         <translation>%1: poizvedba po velikosti ni uspela</translation>
     </message>
@@ -5260,466 +5429,894 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+393"/>
         <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>Preslednica</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backtab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backspace</source>
         <translation>Vračalka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Return</source>
         <translation>Return</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enter</source>
         <translation>Vnesi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ins</source>
         <translation>Ins</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pause</source>
         <translation>Premor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print</source>
         <translation>Natisni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SysReq</source>
         <translation>SysReq</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Home</source>
         <translation>Začetek</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Left</source>
         <translation>Levo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right</source>
         <translation>Desno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CapsLock</source>
         <translation>CapsLock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>NumLock</source>
         <translation>NumLock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ScrollLock</source>
         <translation>ScrollLock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Menu</source>
         <translation>Meni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Back</source>
         <translation>Predhodna</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Forward</source>
         <translation>Naslednja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Stop</source>
         <translation>Ustavi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Refresh</source>
         <translation>Osveži</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Down</source>
         <translation>Tiše</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Mute</source>
         <translation>Tiho</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Up</source>
         <translation>Glasneje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Boost</source>
         <translation>Ojačanje basov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Up</source>
         <translation>Več basov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Down</source>
         <translation>Manj basov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Treble Up</source>
         <translation>Več visokih tonov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Treble Down</source>
         <translation>Manj visokih tonov</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Play</source>
         <translation>Predvajaj večpredstavnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Stop</source>
         <translation>Ustavi večpredstavnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Previous</source>
         <translation>Predhodna večpredstavnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Next</source>
         <translation>Naslednja večpredstavnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Record</source>
         <translation>Snemaj večpredstavnost</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>Media Pause</source>
+        <extracomment>Media player pause button
+</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Media Play/Pause</source>
+        <extracomment>Media player button to toggle between playing and paused
+</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Favorites</source>
         <translation>Priljubljeno</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search</source>
         <translation>Išči</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Standby</source>
         <translation>V pripravljenost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open URL</source>
         <translation>Odpri URL</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Mail</source>
         <translation>Zaženi pošto</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Media</source>
         <translation>Zaženi večpredstavnost</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (0)</source>
         <translation>Zaženi (0)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (1)</source>
         <translation>Zaženi (1)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (2)</source>
         <translation>Zaženi (2)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (3)</source>
         <translation>Zaženi (3)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (4)</source>
         <translation>Zaženi (4)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (5)</source>
         <translation>Zaženi (5)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (6)</source>
         <translation>Zaženi (6)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (7)</source>
         <translation>Zaženi (7)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (8)</source>
         <translation>Zaženi (8)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (9)</source>
         <translation>Zaženi (9)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (A)</source>
         <translation>Zaženi (A)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (B)</source>
         <translation>Zaženi (B)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (C)</source>
         <translation>Zaženi (C)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (D)</source>
         <translation>Zaženi (D)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (E)</source>
         <translation>Zaženi (E)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (F)</source>
         <translation>Zaženi (F)</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <source>Monitor Brightness Up</source>
+        <translation type="unfinished">Povečaj svetlost zaslon</translation>
+    </message>
+    <message>
+        <source>Monitor Brightness Down</source>
+        <translation type="unfinished">Zmanjšaj svetlost zaslona</translation>
+    </message>
+    <message>
+        <source>Keyboard Light On/Off</source>
+        <translation type="unfinished">Vklop/izklop lučk na tipkovnici</translation>
+    </message>
+    <message>
+        <source>Keyboard Brightness Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyboard Brightness Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Power Off</source>
+        <translation type="unfinished">Izklopi</translation>
+    </message>
+    <message>
+        <source>Wake Up</source>
+        <translation type="unfinished">Zbudi se</translation>
+    </message>
+    <message>
+        <source>Eject</source>
+        <translation type="unfinished">Izvrzi</translation>
+    </message>
+    <message>
+        <source>Screensaver</source>
+        <translation type="unfinished">Ohranjevalnik zaslona</translation>
+    </message>
+    <message>
+        <source>WWW</source>
+        <translation type="unfinished">WWW</translation>
+    </message>
+    <message>
+        <source>Sleep</source>
+        <translation type="unfinished">V pripravljenost</translation>
+    </message>
+    <message>
+        <source>LightBulb</source>
+        <translation type="unfinished">Žarnica</translation>
+    </message>
+    <message>
+        <source>Shop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished">Zgodovina</translation>
+    </message>
+    <message>
+        <source>Add Favorite</source>
+        <translation type="unfinished">Dodaj najljubšo</translation>
+    </message>
+    <message>
+        <source>Hot Links</source>
+        <translation type="unfinished">Vroče povezave</translation>
+    </message>
+    <message>
+        <source>Adjust Brightness</source>
+        <translation type="unfinished">Prilagodi svetlost</translation>
+    </message>
+    <message>
+        <source>Finance</source>
+        <translation type="unfinished">Finance</translation>
+    </message>
+    <message>
+        <source>Community</source>
+        <translation type="unfinished">Skupnost</translation>
+    </message>
+    <message>
+        <source>Audio Rewind</source>
+        <translation type="unfinished">Samodejno previj</translation>
+    </message>
+    <message>
+        <source>Back Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Book</source>
+        <translation type="unfinished">Knjiga</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Calculator</source>
+        <translation type="unfinished">Računalo</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Počisti</translation>
+    </message>
+    <message>
+        <source>Clear Grab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Zapri</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished">Kopiraj</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished">Izreži</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished">Prikaz</translation>
+    </message>
+    <message>
+        <source>DOS</source>
+        <translation type="unfinished">DOS</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Dokumenti</translation>
+    </message>
+    <message>
+        <source>Spreadsheet</source>
+        <translation type="unfinished">Preglednica</translation>
+    </message>
+    <message>
+        <source>Browser</source>
+        <translation type="unfinished">Brskalnik</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished">Igra</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished">Pojdi</translation>
+    </message>
+    <message>
+        <source>iTouch</source>
+        <translation type="unfinished">iTouch</translation>
+    </message>
+    <message>
+        <source>Logoff</source>
+        <translation type="unfinished">Odjava</translation>
+    </message>
+    <message>
+        <source>Market</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Meeting</source>
+        <translation type="unfinished">Srečanje</translation>
+    </message>
+    <message>
+        <source>Keyboard Menu</source>
+        <translation type="unfinished">Meni tipkovnice</translation>
+    </message>
+    <message>
+        <source>Menu PB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Sites</source>
+        <translation type="unfinished">Moje strani</translation>
+    </message>
+    <message>
+        <source>News</source>
+        <translation type="unfinished">Novice</translation>
+    </message>
+    <message>
+        <source>Home Office</source>
+        <translation type="unfinished">Domača pisarna</translation>
+    </message>
+    <message>
+        <source>Option</source>
+        <translation type="unfinished">Možnost</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished">Prilepi</translation>
+    </message>
+    <message>
+        <source>Phone</source>
+        <translation type="unfinished">Telefon</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="unfinished">Odgovori</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation type="unfinished">Znova naloži</translation>
+    </message>
+    <message>
+        <source>Rotate Windows</source>
+        <translation type="unfinished">Zavrti okna</translation>
+    </message>
+    <message>
+        <source>Rotation PB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Shrani</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished">Pošlji</translation>
+    </message>
+    <message>
+        <source>Spellchecker</source>
+        <translation type="unfinished">Črkovalnik</translation>
+    </message>
+    <message>
+        <source>Split Screen</source>
+        <translation type="unfinished">Razdeli zaslon</translation>
+    </message>
+    <message>
+        <source>Support</source>
+        <translation type="unfinished">Podpora</translation>
+    </message>
+    <message>
+        <source>Task Panel</source>
+        <translation type="unfinished">Opravilna vrstica</translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished">Terminal</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation type="unfinished">Orodja</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Potovanje</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished">Video</translation>
+    </message>
+    <message>
+        <source>Word Processor</source>
+        <translation type="unfinished">Urejevalnik besedila</translation>
+    </message>
+    <message>
+        <source>XFer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">Približaj</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Oddalji</translation>
+    </message>
+    <message>
+        <source>Away</source>
+        <translation type="unfinished">Odsoten</translation>
+    </message>
+    <message>
+        <source>Messenger</source>
+        <translation type="unfinished">Sporočilnik</translation>
+    </message>
+    <message>
+        <source>WebCam</source>
+        <translation type="unfinished">Spletna kamera</translation>
+    </message>
+    <message>
+        <source>Mail Forward</source>
+        <translation type="unfinished">Posreduj sporočilo naprej</translation>
+    </message>
+    <message>
+        <source>Pictures</source>
+        <translation type="unfinished">Slike</translation>
+    </message>
+    <message>
+        <source>Music</source>
+        <translation type="unfinished">Glasba</translation>
+    </message>
+    <message>
+        <source>Battery</source>
+        <translation type="unfinished">Baterija</translation>
+    </message>
+    <message>
+        <source>Bluetooth</source>
+        <translation type="unfinished">Bluetooth</translation>
+    </message>
+    <message>
+        <source>Wireless</source>
+        <translation type="unfinished">Brezžično</translation>
+    </message>
+    <message>
+        <source>Ultra Wide Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio Random Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subtitle</source>
+        <translation type="unfinished">Podnaslov</translation>
+    </message>
+    <message>
+        <source>Audio Cycle Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished">Čas</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished">Pogled</translation>
+    </message>
+    <message>
+        <source>Top Menu</source>
+        <translation type="unfinished">Vrhnji meni</translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation type="unfinished">Ustavi</translation>
+    </message>
+    <message>
+        <source>Hibernate</source>
+        <translation type="unfinished">V hibernacijo</translation>
+    </message>
+    <message>
         <source>Print Screen</source>
         <translation>Natisni zaslon</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page Up</source>
         <translation>Za stran gor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page Down</source>
         <translation>Za stran dol</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Caps Lock</source>
         <translation>Caps Lock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Num Lock</source>
         <translation>Num Lock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Number Lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll Lock</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scroll Lock</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insert</source>
         <translation>Vstavi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Escape</source>
         <translation>Escape</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>System Request</source>
         <translation>Sistemska zahteva</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Select</source>
         <translation>Izberi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location line="+4"/>
         <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="+1"/>
         <source>Call</source>
+        <extracomment>Button to start a call (note: a separate button is used to end the call)
+</extracomment>
         <translation>Pokliči</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangup</source>
+        <extracomment>Button to end a call (note: a separate button is used to start the call)
+</extracomment>
         <translation>Odloži</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <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>
         <source>Flip</source>
         <translation>Obrni</translation>
     </message>
     <message>
-        <location line="+561"/>
-        <location line="+135"/>
+        <source>Voice Dial</source>
+        <extracomment>Button to trigger voice dialling
+</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Number Redial</source>
+        <extracomment>Button to redial the last number called
+</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera Shutter</source>
+        <extracomment>Button to trigger the camera shutter (take a picture)
+</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera Focus</source>
+        <extracomment>Button to focus the camera
+</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kanji</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Muhenkan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Henkan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Romaji</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hiragana</source>
+        <translation type="unfinished">Hiragana</translation>
+    </message>
+    <message>
+        <source>Katakana</source>
+        <translation type="unfinished">Katakana</translation>
+    </message>
+    <message>
+        <source>Hiragana Katakana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zenkaku</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hankaku</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zenkaku Hankaku</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Touroku</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Massyo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kana Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kana Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eisu Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eisu toggle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Code input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple Candidate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous Candidate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul Hanja</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul Jamo</source>
+        <translation type="unfinished">Hangul Jamo</translation>
+    </message>
+    <message>
+        <source>Hangul Romaja</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul Jeonja</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul Banja</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul PreHanja</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul PostHanja</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangul Special</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location line="-134"/>
-        <location line="+138"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location line="-137"/>
-        <location line="+135"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location line="-134"/>
-        <location line="+130"/>
         <source>Meta</source>
         <translation>Meta</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>F%1</source>
         <translation>F%1</translation>
     </message>
     <message>
-        <location line="-767"/>
         <source>Home Page</source>
         <translation>Domača stran</translation>
     </message>
@@ -5727,27 +6324,22 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSlider</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+151"/>
         <source>Page left</source>
         <translation>Za stran levo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
         <translation>Za stran gor</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Position</source>
         <translation>Položaj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page right</source>
         <translation>Za stran desno</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
         <translation>Za stran dol</translation>
     </message>
@@ -5755,72 +6347,58 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSocks5SocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-67"/>
         <source>Connection to proxy refused</source>
         <translation>Povezava s posrednikom je bila zavrnjena</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection to proxy closed prematurely</source>
         <translation>Povezava s posrednikom je bila prekinjena predčasno</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Proxy host not found</source>
         <translation>Ni moč najti gostitelja posrednika</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Connection to proxy timed out</source>
         <translation>Čas za povezavo s posrednikom je potekel</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Proxy authentication failed</source>
         <translation>Neuspešno overjanje posrednika</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Proxy authentication failed: %1</source>
         <translation>Neuspešno overjanje posrednika: %1</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>SOCKS version 5 protocol error</source>
         <translation>Napaka protokola SOCKS različice 5</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>General SOCKSv5 server failure</source>
         <translation>Splošna napaka strežnika SOCKSv5</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection not allowed by SOCKSv5 server</source>
         <translation>Strežnik SOCKSv5 ne dovoljuje povezave</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>TTL expired</source>
         <translation>TTL je zapadel</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>SOCKSv5 command not supported</source>
         <translation>Ukaz SOCKSv5 ni podprt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Address type not supported</source>
         <translation>Vrsta naslova ni podprta</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unknown SOCKSv5 proxy error code 0x%1</source>
         <translation>Neznana koda napake posrednika SOCKSv5: 0x%1</translation>
     </message>
     <message>
-        <location line="+685"/>
         <source>Network operation timed out</source>
         <translation>Čas za omrežni postopek je potekel</translation>
     </message>
@@ -5828,32 +6406,26 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSoftKeyManager</name>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+78"/>
         <source>Ok</source>
         <translation>V redu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select</source>
         <translation>Izbor</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Done</source>
         <translation>Opravljeno</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location line="+151"/>
         <source>Exit</source>
         <translation>Končaj</translation>
     </message>
@@ -5861,12 +6433,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-574"/>
         <source>More</source>
         <translation>Več</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Manj</translation>
     </message>
@@ -5874,56 +6444,42 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSql</name>
     <message>
-        <location filename="../src/qt3support/sql/q3sqlmanager_p.cpp" line="+890"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete this record?</source>
         <translation>Ali izbrišem ta zapis?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
-        <location line="-51"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location line="-44"/>
         <source>Insert</source>
         <translation>Vstavi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Update</source>
         <translation>Posodobi</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save edits?</source>
         <translation>&amp;Shranmi urejan?.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Confirm</source>
         <translation>Potrdi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cancel your edits?</source>
         <translation>Ali želite preklicati urejanja?</translation>
     </message>
@@ -5931,80 +6487,161 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QSslSocket</name>
     <message>
-        <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+546"/>
         <source>Unable to write data: %1</source>
         <translation>Ni moč zapisati podatkov: %1</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unable to decrypt data: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Error while reading: %1</source>
         <translation>Napaka med branjem: %1</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Error during SSL handshake: %1</source>
         <translation>Napaka med rokovanjem SSL: %1</translation>
     </message>
     <message>
-        <location line="-501"/>
         <source>Error creating SSL context (%1)</source>
         <translation>Napaka pri ustvarjanju konteksta SSL (%1)</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Invalid or empty cipher list (%1)</source>
         <translation>Neveljaven ali prazen seznam šifer (%1)</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <source>Private key does not certify public key, %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Error creating SSL session, %1</source>
         <translation>Napaka pri ustvarjanju seje SSL: %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Error creating SSL session: %1</source>
         <translation>Napaka pri ustvarjanju seje SSL: %1</translation>
     </message>
     <message>
-        <location line="-61"/>
         <source>Cannot provide a certificate with no key, %1</source>
         <translation>Ni moč priskrbeti potrdila brez ključa, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error loading local certificate, %1</source>
         <translation>Napaka pri nalaganju krajevnega potrdila, %1</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Error loading private key, %1</source>
         <translation>Napaka pri nalaganju zasebnega ključa, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Private key does not certificate public key, %1</source>
-        <translation>Zasebni ključ ne potrjuje javnega ključa, %1</translation>
+        <source>No error</source>
+        <translation type="unfinished">Brez napake</translation>
+    </message>
+    <message>
+        <source>The issuer certificate could not be found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The certificate signature could not be decrypted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The public key in the certificate could not be read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The signature of the certificate is invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The certificate is not yet valid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The certificate has expired</source>
+        <translation type="unfinished">Potrdilo je preteklo</translation>
+    </message>
+    <message>
+        <source>The certificate&apos;s notBefore field contains an invalid time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The certificate&apos;s notAfter field contains an invalid time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The certificate is self-signed, and untrusted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The issuer certificate of a locally looked up certificate could not be found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No certificates could be verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One of the CA certificates is invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The basicConstraints path length parameter has been exceeded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The supplied certificate is unsuitable for this purpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The root CA certificate is not trusted for this purpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The root CA certificate is marked to reject the specified purpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The peer did not present any certificate</source>
+        <translation type="unfinished">Vrstnik ni predložil nobenega potrdila</translation>
+    </message>
+    <message>
+        <source>The host name did not match any of the valid hosts for this certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished">Neznana napaka</translation>
     </message>
 </context>
 <context>
     <name>QStateMachine</name>
     <message>
-        <location filename="../src/corelib/statemachine/qstatemachine.cpp" line="+998"/>
         <source>Missing initial state in compound state &apos;%1&apos;</source>
         <translation>V sestavljenem stanju »%1« manjka začetno stanje</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Missing default state in history state &apos;%1&apos;</source>
         <translation>V zgodovinskem stanju »%1« manjka privzeto stanje</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>No common ancestor for targets and source of transition from state &apos;%1&apos;</source>
         <translation>Za cilje in začetek prehoda iz stanja »%1« ni skupnega prednika</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
@@ -6012,30 +6649,22 @@ Izberite drugo ime datoteke.</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: zmanjkalo je virov</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+4"/>
         <source>%1: permission denied</source>
         <translation>%1: nimate dovoljenja</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: already exists</source>
         <translation>%1: že obstaja</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: does not exist</source>
         <translation>%1: ne obstaja</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+3"/>
         <source>%1: unknown error %2</source>
         <translation>%1: neznana napaka %2</translation>
     </message>
@@ -6043,12 +6672,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QTDSDriver</name>
     <message>
-        <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+584"/>
         <source>Unable to open connection</source>
         <translation>Ni moč vzpostaviti povezave</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unable to use database</source>
         <translation>Podatkovne zbirke ni moč uporabljati</translation>
     </message>
@@ -6056,12 +6683,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QTabBar</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="-326"/>
         <source>Scroll Left</source>
         <translation>Premakni levo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll Right</source>
         <translation>Premakni desno</translation>
     </message>
@@ -6069,7 +6694,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QTcpServer</name>
     <message>
-        <location filename="../src/network/socket/qtcpserver.cpp" line="+282"/>
         <source>Operation on socket is not supported</source>
         <translation>Dejanje na vtičnici ni podprto</translation>
     </message>
@@ -6077,42 +6701,34 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QTextControl</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2007"/>
         <source>&amp;Undo</source>
         <translation>&amp;Razveljavi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Redo</source>
         <translation>&amp;Uveljavi</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Izreži</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>S&amp;kopiraj</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy &amp;Link Location</source>
         <translation>Skopiraj &amp;povezavo do lokacije</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Paste</source>
         <translation>Pri&amp;lepi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
@@ -6120,14 +6736,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QToolButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+310"/>
-        <location line="+6"/>
         <source>Press</source>
         <translation>Pritisni</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+8"/>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
@@ -6135,7 +6747,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QUdpSocket</name>
     <message>
-        <location filename="../src/network/socket/qudpsocket.cpp" line="+179"/>
         <source>This platform does not support IPv6</source>
         <translation>Ta platforma ne podpira IPv6</translation>
     </message>
@@ -6143,12 +6754,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QUndoGroup</name>
     <message>
-        <location filename="../src/gui/util/qundogroup.cpp" line="+385"/>
         <source>Undo</source>
         <translation>Razveljavi</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Redo</source>
         <translation>Uveljavi</translation>
     </message>
@@ -6156,7 +6765,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QUndoModel</name>
     <message>
-        <location filename="../src/gui/util/qundoview.cpp" line="+101"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;prazno&gt;</translation>
     </message>
@@ -6164,12 +6772,10 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QUndoStack</name>
     <message>
-        <location filename="../src/gui/util/qundostack.cpp" line="+832"/>
         <source>Undo</source>
         <translation>Razveljavi</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Redo</source>
         <translation>Uveljavi</translation>
     </message>
@@ -6177,57 +6783,46 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QUnicodeControlCharacterMenu</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+884"/>
         <source>LRM Left-to-right mark</source>
         <translation>LRM (oznaka z-leve-na-desno)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLM Right-to-left mark</source>
         <translation>RLM (oznaka z-desne-na-levo)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWJ Zero width joiner</source>
         <translation>ZWJ (združevalec s širino nič)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWNJ Zero width non-joiner</source>
         <translation>ZWNJ (ne-združevalec s širino nič)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWSP Zero width space</source>
         <translation>ZWSP (presledek s širino nič)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LRE Start of left-to-right embedding</source>
         <translation>LRE (začetek vgrajevanja z leve na desno)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLE Start of right-to-left embedding</source>
         <translation>RLE (začetek vgrajevanja z desne na levo)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LRO Start of left-to-right override</source>
         <translation>LRO (začetek nadomeščanja z leve na desno)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLO Start of right-to-left override</source>
         <translation>RLO (začetek nadomeščanja z desne na levo)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PDF Pop directional formatting</source>
         <translation>PDF (odstrani oblikovanje usmerjenosti)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Insert Unicode control character</source>
         <translation>Vstavi kontrolni znak Unicode</translation>
     </message>
@@ -6235,32 +6830,26 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QWebFrame</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+711"/>
         <source>Request cancelled</source>
         <translation>Zahtevek je bil preklican</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Request blocked</source>
         <translation>Zahtevek je bil blokiran</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cannot show URL</source>
         <translation>Lokacije ni moč prikazati</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Frame load interrupted by policy change</source>
         <translation>Nalaganje okvirja je bilo prekinjeno zaradi spremembe pravil</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot show mimetype</source>
         <translation>Vrste MIME ni moč prikazati</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File does not exist</source>
         <translation>Datoteka ne obstaja</translation>
     </message>
@@ -6268,610 +6857,515 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QWebPage</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+406"/>
+        <source>Redirection limit reached</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Bad HTTP request</source>
         <translation>Napačen zahtevek HTTP</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp" line="+42"/>
         <source>Submit</source>
         <comment>default label for Submit buttons in forms on web pages</comment>
         <translation>Pošlji</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>Pošlji</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reset</source>
         <comment>default label for Reset buttons in forms on web pages</comment>
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <location line="+11"/>
         <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 je stvarno kazalo z iskanjem. Vnesite iskane besede: </translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Choose File</source>
         <comment>title for file button used in HTML forms</comment>
         <translation>Izberite datoteko</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>Datoteka ni izbrana</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open in New Window</source>
         <comment>Open in New Window context menu item</comment>
         <translation>Odpri v novem oknu</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Save Link...</source>
         <comment>Download Linked File context menu item</comment>
         <translation>Shrani povezavo ...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy Link</source>
         <comment>Copy Link context menu item</comment>
         <translation>Skopiraj povezavo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Image</source>
         <comment>Open Image in New Window context menu item</comment>
         <translation>Odpri sliko</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Save Image</source>
         <comment>Download Image context menu item</comment>
         <translation>Shrani sliko</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy Image</source>
         <comment>Copy Link context menu item</comment>
         <translation>Kopiraj sliko</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Frame</source>
         <comment>Open Frame in New Window context menu item</comment>
         <translation>Odpri okvir</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Copy</source>
         <comment>Copy context menu item</comment>
         <translation>Skopiraj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Go Back</source>
         <comment>Back context menu item</comment>
         <translation>Pojdi nazaj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Go Forward</source>
         <comment>Forward context menu item</comment>
         <translation>Pojdi naprej</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Stop</source>
         <comment>Stop context menu item</comment>
         <translation>Ustavi</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Reload</source>
         <comment>Reload context menu item</comment>
         <translation>Znova naloži</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
         <comment>Cut context menu item</comment>
         <translation>Izreži</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Paste</source>
         <comment>Paste context menu item</comment>
         <translation>Prilepi</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>No Guesses Found</source>
         <comment>No Guesses Found context menu item</comment>
         <translation>Najdenega ni nobenega ugibanja</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Ignore</source>
         <comment>Ignore Spelling context menu item</comment>
         <translation>Prezri</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Add To Dictionary</source>
         <comment>Learn Spelling context menu item</comment>
         <translation>Dodaj v slovar</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Search The Web</source>
         <comment>Search The Web context menu item</comment>
         <translation>Iščite po spletu</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Look Up In Dictionary</source>
         <comment>Look Up in Dictionary context menu item</comment>
         <translation>Poišči v slovarju</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open Link</source>
         <comment>Open Link context menu item</comment>
         <translation>Odpri povezavo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Ignore</source>
         <comment>Ignore Grammar context menu item</comment>
         <translation>Prezri</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Spelling</source>
         <comment>Spelling and Grammar context sub-menu item</comment>
         <translation>Črkovanje</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Show Spelling and Grammar</source>
         <comment>menu item title</comment>
         <translation>Prikaži črkovanje in slovnico</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Spelling and Grammar</source>
         <comment>menu item title</comment>
         <translation>Skrij črkovanje in slovnico</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Spelling</source>
         <comment>Check spelling context menu item</comment>
         <translation>Preveri črkovanje</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Spelling While Typing</source>
         <comment>Check spelling while typing context menu item</comment>
         <translation>Preveri črkovanje med tipkanjem</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Check Grammar With Spelling</source>
         <comment>Check grammar with spelling context menu item</comment>
         <translation>Preveri slovnico in črkovanje</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Fonts</source>
         <comment>Font context sub-menu item</comment>
         <translation>Pisave</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Bold</source>
         <comment>Bold context menu item</comment>
         <translation>Polkrepko</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Italic</source>
         <comment>Italic context menu item</comment>
         <translation>Ležeče</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Underline</source>
         <comment>Underline context menu item</comment>
         <translation>Podčrtano</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Outline</source>
         <comment>Outline context menu item</comment>
         <translation>Obris</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Direction</source>
         <comment>Writing direction context sub-menu item</comment>
         <translation>Smer</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Text Direction</source>
         <comment>Text direction context sub-menu item</comment>
         <translation>Smer besedila</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Default</source>
         <comment>Default writing direction context menu item</comment>
         <translation>Privzeta</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Left to Right</source>
         <comment>Left to Right context menu item</comment>
         <translation>Z leve na desno</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Right to Left</source>
         <comment>Right to Left context menu item</comment>
         <translation>Z desne na levo</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <source>Missing Plug-in</source>
+        <comment>Label text to be used when a plug-in is missing</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Loading...</source>
         <comment>Media controller status message when the media is loading</comment>
         <translation>Nalaganje ...</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Live Broadcast</source>
         <comment>Media controller status message when watching a live broadcast</comment>
         <translation>Prenos v živo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Audio Element</source>
         <comment>Media controller element</comment>
         <translation>Zvočni element</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video Element</source>
         <comment>Media controller element</comment>
         <translation>Video element</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mute Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za utišanje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unmute Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za preklic utišanja</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Play Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za predvajanje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pause Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za premor</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Slider</source>
         <comment>Media controller element</comment>
         <translation>Drsnik</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Slider Thumb</source>
         <comment>Media controller element</comment>
         <translation>Ročka na drsniku</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rewind Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za previjanje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Return to Real-time Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za vrnitev na resnični čas</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Elapsed Time</source>
         <comment>Media controller element</comment>
         <translation>Pretečeni čas</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remaining Time</source>
         <comment>Media controller element</comment>
         <translation>Preostali čas</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Status Display</source>
         <comment>Media controller element</comment>
         <translation>Prikaz stanja</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Fullscreen Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za cel zaslon</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek Forward Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za pomik naprej</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek Back Button</source>
         <comment>Media controller element</comment>
         <translation>Gumb za pomik nazaj</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Audio element playback controls and status display</source>
         <comment>Media controller element</comment>
         <translation>Nadzor in prikaz stanja elementa za predvajanje zvoka</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video element playback controls and status display</source>
         <comment>Media controller element</comment>
         <translation>Nadzor in prikaz stanja elementa za predvajanje videa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mute audio tracks</source>
         <comment>Media controller element</comment>
         <translation>Utišaj zvočne sledi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unmute audio tracks</source>
         <comment>Media controller element</comment>
         <translation>Prekliči utišanje zvočnih sledi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Begin playback</source>
         <comment>Media controller element</comment>
         <translation>Začni predvajanje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pause playback</source>
         <comment>Media controller element</comment>
         <translation>Prekini predvajanje</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Movie time scrubber</source>
         <comment>Media controller element</comment>
-        <translation></translation>
+        <translation>Drsnik za mesto v posnetku</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Movie time scrubber thumb</source>
         <comment>Media controller element</comment>
-        <translation type="unfinished"></translation>
+        <translation>Drsnik za mesto v posnetku</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rewind movie</source>
         <comment>Media controller element</comment>
         <translation>Previj film</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Return streaming movie to real-time</source>
         <comment>Media controller element</comment>
         <translation>Povrni film na resnični čas</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Current movie time</source>
         <comment>Media controller element</comment>
         <translation>Trenutni čas filma</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Remaining movie time</source>
         <comment>Media controller element</comment>
         <translation>Preostali čas filma</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Current movie status</source>
         <comment>Media controller element</comment>
         <translation>Trenutno stanje filma</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Play movie in full-screen mode</source>
         <comment>Media controller element</comment>
         <translation>Predvajaj film čez ves zaslon</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek quickly back</source>
         <comment>Media controller element</comment>
         <translation>Hitro se pomakni nazaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Seek quickly forward</source>
         <comment>Media controller element</comment>
         <translation>Hitro se pomakni naprej</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Indefinite time</source>
         <comment>Media time description</comment>
         <translation>Nedoločen čas</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 ur %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 ur %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="-210"/>
         <source>Inspect</source>
         <comment>Inspect Element context menu item</comment>
         <translation>Preglej.</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>Ni nedavnih iskanj</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>Nedavna iskanja</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>Počisti nedavna iskanja</translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>Unknown</source>
         <comment>Unknown filesize FTP directory listing item</comment>
         <translation>Neznana</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 (%2x%3 pixels)</source>
         <comment>Title string for images</comment>
         <translation>%1 (%2×%3 pik)</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp" line="+167"/>
         <source>Web Inspector - %2</source>
         <translation>Web Inspector - %2</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp" line="+58"/>
         <source>Scroll here</source>
         <translation>Premakni sem</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Left edge</source>
         <translation>Levi rob</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
         <translation>Vrh</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
         <translation>Desni rob</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>Dno</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page left</source>
         <translation>Za stran levo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
         <translation>Za stran gor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>Za stran desno</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
         <translation>Za stran dol</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Scroll left</source>
         <translation>Premakni levo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Premakni gor</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Premakni desno</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Premakni dol</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>
@@ -6882,251 +7376,197 @@ Izberite drugo ime datoteke.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1708"/>
         <source>JavaScript Alert - %1</source>
         <translation>Opozorilo JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>JavaScript Confirm - %1</source>
         <translation>Potrditev JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>JavaScript Prompt - %1</source>
         <translation>Poziv JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>JavaScript Problem - %1</source>
         <translation>Težava 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>Kot kaže ima skript na tej strani težavo. Ali želite ustaviti skript?</translation>
     </message>
     <message>
-        <location line="+383"/>
         <source>Move the cursor to the next character</source>
         <translation>Premakni kazalec na naslednji znak</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous character</source>
         <translation>Premakni kazalec na prejšnji znak</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next word</source>
         <translation>Premakni kazalec v naslednjo besedo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous word</source>
         <translation>Premakni kazalec v prejšnjo besedo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next line</source>
         <translation>Premakni kazalec v naslednjo vrstico</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous line</source>
         <translation>Premakni kazalec v prejšnjo vrstico</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the line</source>
         <translation>Premakni kazalec na začetek vrstice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the line</source>
         <translation>Premakni kazalec na konec vrstice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the block</source>
         <translation>Premakni kazalec na začetek bloka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the block</source>
         <translation>Premakni kazalec na konec bloka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the document</source>
         <translation>Premakni kazalec na začetek dokumenta</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the document</source>
         <translation>Premakni kazalec na konec dokumenta</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select all</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next character</source>
         <translation>Izberi do naslednjega znaka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous character</source>
         <translation>Izberi do prejšnjega znaka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next word</source>
         <translation>Izberi do naslednje besede</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous word</source>
         <translation>Izberi do prejšnje besede</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next line</source>
         <translation>Izberi do naslednje vrstice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous line</source>
         <translation>Izberi do prejšnje vrstice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the line</source>
         <translation>Izberi do začetka vrstice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the line</source>
         <translation>Izberi do konca vrstice</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the block</source>
         <translation>Izberi do začetka bloka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the block</source>
         <translation>Izberi do konca bloka</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the document</source>
         <translation>Izberi do začetka dokumenta</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the document</source>
         <translation>Izberi do konca dokumenta</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the start of the word</source>
         <translation>Izbriši do začetka besede</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the end of the word</source>
         <translation>Izbriši do konca besede</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Insert a new paragraph</source>
         <translation>Vstavi nov odstavek</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert a new line</source>
         <translation>Vstavi novo vrstico</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste and Match Style</source>
         <translation>Prilepi in uskladi slog</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Remove formatting</source>
         <translation>Odstrani oblikovanje</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Strikethrough</source>
         <translation>Prečrtano</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Subscript</source>
         <translation>Podpisano</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Superscript</source>
         <translation>Nadpisano</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Bulleted List</source>
         <translation>Vstavi navadni seznam</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Numbered List</source>
         <translation>Vstavi oštevilčeni seznam</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Indent</source>
         <translation>Zamakni</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Outdent</source>
         <translation>Odzamakni</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Center</source>
         <translation>Sredinsko</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Justify</source>
         <translation>Obojestransko</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Align Left</source>
         <translation>Poravnaj levo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Align Right</source>
         <translation>Poravnaj desno</translation>
     </message>
-    <message>
-        <location filename="Obsolete_PO_entries"/>
-        <source>Remaining move time</source>
-        <comment>Media controller element</comment>
-        <translation type="obsolete">Preostali čas filma</translation>
-    </message>
 </context>
 <context>
     <name>QWhatsThisAction</name>
     <message>
-        <location filename="../src/gui/kernel/qwhatsthis.cpp" line="+527"/>
         <source>What&apos;s This?</source>
         <translation>Kaj je to?</translation>
     </message>
@@ -7134,7 +7574,6 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5672"/>
         <source>*</source>
         <translation>*</translation>
     </message>
@@ -7142,57 +7581,46 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QWizard</name>
     <message>
-        <location filename="../src/gui/dialogs/qwizard.cpp" line="+649"/>
         <source>Go Back</source>
         <translation>Pojdi nazaj</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Commit</source>
         <translation>Uveljavi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Done</source>
         <translation>Opravljeno</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; Na&amp;zaj</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Finish</source>
         <translation>&amp;Zaključi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Next</source>
         <translation>&amp;Naprej</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Naprej &gt;</translation>
     </message>
@@ -7200,69 +7628,54 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QWorkspace</name>
     <message>
-        <location filename="../src/gui/widgets/qworkspace.cpp" line="+1089"/>
         <source>&amp;Restore</source>
         <translation>&amp;Obnovi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Move</source>
         <translation>&amp;Premakni</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Velikost</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mi&amp;nimize</source>
         <translation>Po&amp;manjšaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>&amp;Razpni</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Close</source>
         <translation>&amp;Zapri</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stay on &amp;Top</source>
         <translation>Ostani na &amp;vrhu</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1059"/>
         <source>Sh&amp;ade</source>
         <translation>Zvi&amp;j</translation>
     </message>
     <message>
-        <location line="-278"/>
-        <location line="+60"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
     <message>
-        <location line="-1832"/>
         <source>Minimize</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Restore Down</source>
         <translation>Obnovi navzdol</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location line="+2048"/>
         <source>&amp;Unshade</source>
         <translation>Razv&amp;ij</translation>
     </message>
@@ -7270,302 +7683,260 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QXml</name>
     <message>
-        <location filename="../src/xml/sax/qxml.cpp" line="+58"/>
         <source>no error occurred</source>
         <translation>ni nobene napake</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error triggered by consumer</source>
         <translation>napako povzročil uporabnik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected end of file</source>
         <translation>nepričakovan konec datoteke</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>more than one document type definition</source>
         <translation>več kot ena definicija vrste dokumenta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing element</source>
         <translation>napaka med analiziranjem elementa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>tag mismatch</source>
         <translation>neprimerna oznaka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing content</source>
         <translation>napaka med analiziranje vsebine</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected character</source>
         <translation>nepričakovan znak</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid name for processing instruction</source>
         <translation>nepravilno ime za ukaz obdelave</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>version expected while reading the XML declaration</source>
         <translation>pričakovana različica med branjem deklaracije XML</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>wrong value for standalone declaration</source>
         <translation>napačna vrednost za samostojno deklaracijo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
         <translation>deklaracija kodiranja ali samostojna deklaracija je bila pričakovana med branjem deklaracije XML</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>standalone declaration expected while reading the XML declaration</source>
         <translation>samostojna deklaracija pričakovana med branjem deklaracije XML</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing document type definition</source>
         <translation>napaka med analiziranjem vrste definicije dokumenta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>letter is expected</source>
         <translation>pričakovana je črka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing comment</source>
         <translation>napaka med analiziranjem komentarja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing reference</source>
         <translation>napaka med analiziranjem reference</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>internal general entity reference not allowed in DTD</source>
         <translation>referenca notranje splošne entitete ni dovoljena v DTD</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in attribute value</source>
         <translation>referenca zunanje analizirane splošne entitete ni dovoljena v vrednosti atributa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in DTD</source>
         <translation>referenca zunanje analizirane splošne entitete ni dovoljena v DTD</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unparsed entity reference in wrong context</source>
         <translation>referenca neanalizirane entitete v napačnem kontekstu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>recursive entities</source>
         <translation>rekurzivne entitete</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error in the text declaration of an external entity</source>
         <translation>napaka v besedilni deklaraciji zunanje entitete</translation>
     </message>
 </context>
 <context>
+    <name>QXmlPatternistCLI</name>
+    <message>
+        <source>Warning in %1, at line %2, column %3: %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning in %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown location</source>
+        <translation type="unfinished">Neznana lokacija</translation>
+    </message>
+    <message>
+        <source>Error %1 in %2, at line %3, column %4: %5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error %1 in %2: %3</source>
+        <translation type="unfinished">Napaka %1 v %2: %3</translation>
+    </message>
+</context>
+<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>Dodatna vsebina na koncu dokumenta.</translation>
     </message>
     <message>
-        <location line="+271"/>
         <source>Invalid entity value.</source>
         <translation>Neveljavna vrednost entitete.</translation>
     </message>
     <message>
-        <location line="+109"/>
         <source>Invalid XML character.</source>
         <translation>Neveljaven znak XML.</translation>
     </message>
     <message>
-        <location line="+259"/>
         <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
         <translation>Zaporedje »]]&gt;« v vsebini ni dovoljeno.</translation>
     </message>
     <message>
-        <location line="+309"/>
         <source>Namespace prefix &apos;%1&apos; not declared</source>
         <translation>Predpona imenskega prostora »%1« ni deklarirana</translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>Attribute redefined.</source>
         <translation>Atribut je redefiniran.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unexpected character &apos;%1&apos; in public id literal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Invalid XML version string.</source>
         <translation>Neveljaven niz različice XML.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unsupported XML version.</source>
         <translation>Nepodprta različica XML.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>%1 is an invalid encoding name.</source>
         <translation>%1 ni veljavno ime kodiranja.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Encoding %1 is unsupported</source>
         <translation>Kodiranje %1 ni podprto</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Standalone accepts only yes or no.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid attribute in XML declaration.</source>
         <translation>Neveljaven atribut v deklaraciji XML.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Premature end of document.</source>
         <translation>Predčasen konec dokumenta.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid document.</source>
         <translation>Neveljaven dokument..</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Expected </source>
         <translation>Pričakovan</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>, but got &apos;</source>
         <translation>, vendar prejel &apos;</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unexpected &apos;</source>
         <translation>Nepričakovan &apos;</translation>
     </message>
     <message>
-        <location line="+225"/>
         <source>Expected character data.</source>
         <translation>Pričakoval znakovne podatke.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="-995"/>
         <source>Recursive entity detected.</source>
         <translation>Zaznana je bila rekurzivna entiteta.</translation>
     </message>
     <message>
-        <location line="+516"/>
         <source>Start tag expected.</source>
         <translation>Pričakovana je bila začetna oznaka.</translation>
     </message>
     <message>
-        <location line="+222"/>
         <source>XML declaration not at start of document.</source>
         <translation>Deklaracija XML ni na začetku dokumenta.</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>NDATA in parameter entity declaration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>%1 is an invalid processing instruction name.</source>
         <translation>%1 ni veljavno ime ukaza obdelave.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Invalid processing instruction name.</source>
         <translation>Neveljavno ime ukaza obdelave.</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>Neveljavna deklaracija imenskega prostora.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+15"/>
         <source>Invalid XML name.</source>
         <translation>Neveljavno ime XML.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Opening and ending tag mismatch.</source>
         <translation>Začetni in zaključni oznaki se ne ujemata.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Reference to unparsed entity &apos;%1&apos;.</source>
         <translation>Referenca na nerazčlenjeno entiteto »%1«.</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location line="+61"/>
-        <location line="+40"/>
         <source>Entity &apos;%1&apos; not declared.</source>
         <translation>Entiteta »%1« ni deklarirana.</translation>
     </message>
     <message>
-        <location line="-26"/>
         <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
         <translation>Referenca na zunanjo entiteto »%1« v vrednosti lastnosti.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Invalid character reference.</source>
         <translation>Neveljavna znakovna referenca.</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>Naletel na napačno zakodirano vsebino.</translation>
     </message>
     <message>
-        <location line="+274"/>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
         <translation>Samostojni psevdo-atribut se mora pojaviti za kodiranjem.</translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+562"/>
         <source>%1 is an invalid PUBLIC identifier.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7573,240 +7944,190 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QtXmlPatterns</name>
     <message>
-        <location filename="../src/xmlpatterns/api/qiodevicedelegate.cpp" line="+84"/>
         <source>Network timeout.</source>
         <translation>Čas za omrežje je potekel.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractdatetime.cpp" line="+80"/>
         <source>Year %1 is invalid because it begins with %2.</source>
         <translation>Leto %1 ni veljavno, ker se začne z %2.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Day %1 is outside the range %2..%3.</source>
         <translation>Dan %1 je izven obsega %2..%3.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Month %1 is outside the range %2..%3.</source>
         <translation>Mesec %1 je izven obsega %2..%3.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Overflow: Can&apos;t represent date %1.</source>
         <translation>Prekoračitev: ni moč predstaviti datuma %1.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Day %1 is invalid for month %2.</source>
         <translation>Dan %1 za mesec %2 ni veljaven.</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>Čas 24:%1:%2.%3 ni veljaven. Ura je 24, vendar minute, sekunde in milisekunde niso vse 0; </translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Time %1:%2:%3.%4 is invalid.</source>
         <translation>Čas %1:%2:%3.%4 ni veljaven.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Overflow: Date can&apos;t be represented.</source>
         <translation>Prekoračitev: datuma ni moč predstaviti.</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>Prisotna mora biti vsaj ena komponenta.</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>At least one time component must appear after the %1-delimiter.</source>
         <translation>Za razmejiteljem %1 se mora pojaviti vsaj ena časovna komponenta.</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 ni veljavna vrednost vrste %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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="+65"/>
         <source>Integer division (%1) by zero (%2) is undefined.</source>
         <translation>Deljenje celega števila (%1) z nič (%2) ni določeno.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Division (%1) by zero (%2) is undefined.</source>
         <translation>Deljenje (%1) z nič (%2) ni določeno.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
         <translation>Ostanek deljenja (%1) z nič (%2) ni določen.</translation>
     </message>
     <message>
-        <location line="+122"/>
-        <location line="+32"/>
         <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
         <translation>Deljenje vrednosti vrste %1 z %2 (ni število) ni dovoljeno.</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>Deljenje vrednosti vrste %1 z %2 ali %3 (pozitivna ali negativna nič) ni dovoljeno.</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ženje vrednosti vrste %1 z %2 ali %3 (pozitivna ali negativna neskončnost) ni dovoljeno.</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>Vrednost vrste %1 ne more imeti dejanske logične vrednosti.</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>Dejanske logične vrednosti ni moč izračunati za zaporedje, ki vsebuje dve ali več atomičnih vrednosti.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qderivedinteger_p.h" line="+402"/>
         <source>Value %1 of type %2 exceeds maximum (%3).</source>
         <translation>Vrednost %1 vrste %2 presega maksimum (%3).</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Value %1 of type %2 is below minimum (%3).</source>
         <translation>Vrednost %1 vrste %2 je pod minimumom (%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>Vrednost vrste %1 mora vsebovati sodo število števk. Vrednost %2 temu ne zadošča.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>%1 is not valid as a value of type %2.</source>
         <translation>%1 ni veljavna kot vrednost vrste %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qarithmeticexpression.cpp" line="+207"/>
         <source>Operator %1 cannot be used on type %2.</source>
         <translation>Operatorja %1 ni moč uporabiti na vrsti %2.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
         <translation>Operatorja %1 ni moč uporabiti na atomičnih vrednostih vrst %2 in %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>URI imenskega prostora v imenu izračunane lastnosti ne more biti %1.</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>Ime izračunane lastnosti ne more imeti URI-ja imenskega prostora %1 s krajevnim imenom %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+88"/>
         <source>Type error in cast, expected %1, received %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+67"/>
         <source>A comment cannot contain %1</source>
         <translation>Komentar ne more vsebovati %1</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>A comment cannot end with a %1.</source>
         <translation>Komentar se ne more končati z %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 type="unfinished"></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>Modula knjižnice ni moč ovrednotiti neposredno. Uvoziti ga je potrebno iz glavnega modula.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>No template by name %1 exists.</source>
         <translation>Predloga z imenom %1 ne obstaja.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>A positional predicate must evaluate to a single numeric value.</source>
         <translation type="unfinished"></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, is %2 invalid.</source>
+        <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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Podatki ukaza za obdelavo ne morejo vsebovati niza %1</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor.cpp" line="+82"/>
         <source>No namespace binding exists for the prefix %1</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+69"/>
         <source>%1 is an invalid %2</source>
         <translation>%1 ni veljaven %2</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 potrebuje največ %n argument. %2 zato ni veljavno.</numerusform>
@@ -7816,7 +8137,6 @@ Izberite drugo ime datoteke.</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 potrebuje najmanj %n argument. %2 zato ni veljavno.</numerusform>
@@ -7826,2399 +8146,2052 @@ Izberite drugo ime datoteke.</translation>
         </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>Prvi argument za %1 ne more biti vrste %2. Mora biti številčne vrste, xs:yearMonthDuration ali 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>Prvi argument za %1 ne more biti vrste %2. Mora biti vrste %3, %4 ali %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 za %1 ne more biti vrste %2. Mora biti vrste %3, %4 ali %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 ni veljaven znak 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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qerrorfn.cpp" line="+61"/>
         <source>%1 was called.</source>
         <translation>%1 je bila klicana.</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 type="unfinished"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="+92"/>
         <source>%1 matches newline characters</source>
         <translation>%1 se ujema z znaki za novo vrstico</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 and %2 match the start and end of a line.</source>
         <translation>%1 in %2 se ujemata z začetkom in koncem vrstice.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Matches are case insensitive</source>
         <translation>Ujemanja niso občutljiva na velikost črk</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Whitespace characters are removed, except when they appear in character classes</source>
         <translation>Znaki za presledke so odstranjeni, razen ko se pojavijo v znakovnih razredih</translation>
     </message>
     <message>
-        <location line="+100"/>
         <source>%1 is an invalid regular expression pattern: %2</source>
         <translation>%1 ni veljaven vzorec regularnega izraza: %2</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
         <translation type="unfinished"></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>Če je prvi argument prazno zaporedje, ali pa niz z dolžino nič (brez imenskega prostora), predpone ni moč določiti. Določena je bila predpona %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+346"/>
         <source>It will not be possible to retrieve %1.</source>
         <translation>%1 ne bo možno pridobiti.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencegeneratingfns.cpp" line="+266"/>
         <source>The default collection is undefined</source>
         <translation>Privzeta zbirka ni določena.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>%1 cannot be retrieved</source>
         <translation>%1 ni moč pridobiti</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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1 is not a whole number of minutes.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 ni celovito število minut,</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/janitors/qcardinalityverifier.cpp" line="+58"/>
         <source>Required cardinality is %1; got cardinality %2.</source>
         <translation type="unfinished"></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>Postavka %1 se ne ujema z zahtevano vrsto %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 ni znana vrsta sheme.</translation>
     </message>
     <message>
-        <location line="-7041"/>
+        <source>A template with name %1 has already been declared.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Only one %1 declaration can occur in the query prolog.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+188"/>
         <source>The initialization of variable %1 depends on itself</source>
         <translation>Inicializacija spremenljivke %1 je odvisna od same sebe.</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source>No variable by name %1 exists</source>
-        <translation>Spremenljivka z imenom %1 ne obstaja</translation>
-    </message>
-    <message>
-        <location filename="../src/xmlpatterns/parser/qparsercontext.cpp" line="+93"/>
         <source>The variable %1 is unused</source>
         <translation>Spremenljivka %1 ni uporabljena</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+2841"/>
         <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
         <translation>Različica %1 ni podprta. Podpra različica XQuery je 1.0.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <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>Kodiranje %1 ni veljavno. Vsebovati mora le znake latinske abecede, ne sme vsebovati presledkov in se mora ujemati z regularnim izrazom %2.</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>No function with signature %1 is available</source>
         <translation>Na voljo ni nobene funkcije s podpisom %1</translation>
     </message>
     <message>
-        <location line="+72"/>
-        <location line="+10"/>
         <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
         <translation>Deklaracije privzetega imenskega prostora se mora pojaviti pred deklaracijami funkcij, spremenljivk in možnosti.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace declarations must occur before function, variable, and option declarations.</source>
         <translation>Deklaracije imenskih prostorov se morajo pojaviti pred deklaracijami funkcij, spremenljivk in možnosti.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Module imports must occur before function, variable, and option declarations.</source>
         <translation>Uvozi modulov se morajo pojaviti pred deklaracijami funkcij, spremenljivk in možnosti.</translation>
     </message>
     <message>
-        <location line="+200"/>
         <source>It is not possible to redeclare prefix %1.</source>
         <translation>Predpone %1 ni moč znova deklarirati.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Prefix %1 is already declared in the prolog.</source>
         <translation type="unfinished"></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>Ime možnosti mora vsebovati predpono. Privzeti imenski prostor za možnosti ne obstaja.</translation>
     </message>
     <message>
-        <location line="+171"/>
         <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>The target namespace of a %1 cannot be empty.</source>
         <translation>Ciljni imenski prostor za %1 ne sme biti prazen.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The module import feature is not supported</source>
         <translation>Zmožnost uvažanja modulov ni podprta</translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>No value is available for the external variable by name %1.</source>
-        <translation>Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti.</translation>
-    </message>
-    <message>
-        <location line="-4036"/>
-        <source>A template by name %1 has already been declared.</source>
-        <translation>Predloga z imenom %1 je že bila deklarirana.</translation>
-    </message>
-    <message>
-        <location line="+3581"/>
         <source>The keyword %1 cannot occur with any other mode name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>The value of attribute %1 must of type %2, which %3 isn&apos;t.</source>
-        <translation>Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni.</translation>
-    </message>
-    <message>
-        <location line="+75"/>
-        <source>The prefix %1 can not be bound. By default, it is already bound to the namespace %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+312"/>
-        <source>A variable by name %1 has already been declared.</source>
-        <translation>Spremenljivka z imenom %1 je že bila deklarirana.</translation>
-    </message>
-    <message>
-        <location line="+135"/>
         <source>A stylesheet function must have a prefixed name.</source>
         <translation type="unfinished"></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>Imenski prostor za uporabniško določeno funkcijo ne sme biti prazen (poskusite z vnaprej določeno predpono %1, ki obstaja za take primere)</translation>
     </message>
     <message>
-        <location line="+9"/>
         <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>Imenski prostor %1 je rezerviran, zato ga uporabniško določene funkcije ne smejo uporabiti. Poskusite z vnaprej določeno predpono %2, ki obstaja za take primere.</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>Imenski prostor uporabniško določene funkcije v modulu knjižnice mora biti enak imenskemu prostoru modula. Z drugimi besedami, moral bi biti %1, namesto %2.</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>A function already exists with the signature %1.</source>
         <translation>Funkcija s podpisom %1 že obstaja.</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>Zunanje funkcije niso podprte. Vse podprte funkcije je moč uporabiti neposredno, brez da bi jih najprej deklarirali kot zunanje.</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
-        <translation>Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno.</translation>
+        <source>No variable with name %1 exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The value of attribute %1 must be of type %2, which %3 isn&apos;t.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A variable with name %1 has already been declared.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No value is available for the external variable with name %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An argument with name %1 has already been declared. Every argument name must be unique.</source>
+        <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
         <translation>V XSL-T vzorcu funkcija %1 ne more imeti tretjega argumenta.</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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 is an invalid template mode name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
         <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>Ime spremenljivke priklenjene v izrazu »for« se mora razlikovati od spremenljivke položaja. Spremenljivki z imenom %1 zato trčita.</translation>
     </message>
     <message>
-        <location line="+778"/>
         <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
         <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>The %1-axis is unsupported in XQuery</source>
         <translation>Os %1 v XQuery ni podprta</translation>
     </message>
     <message>
-        <location line="+1197"/>
+        <source>No function with name %1 is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An attribute with name %1 has already appeared on this element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 is not a valid name for a processing-instruction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7099"/>
         <source>%1 is not a valid numeric literal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
         <source>W3C XML Schema identity constraint selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>W3C XML Schema identity constraint field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>A construct was encountered which is disallowed in the current language(%1).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6380"/>
-        <source>No function by name %1 is available.</source>
-        <translation>Na voljo ni nobene funkcije z imenom %1.</translation>
-    </message>
-    <message>
-        <location line="+102"/>
         <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 is an invalid namespace URI.</source>
         <translation>%1 ni veljaven URI imenskega prostora.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>It is not possible to bind to the prefix %1</source>
         <translation type="unfinished"></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>Imenski prostor %1 je lahko navezan le na %2 (in je, v vsakem primeru, preddeklariran)</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>Predpona %1 je lahko navezana le na %2 (in je, v vsakem primeru, preddeklarirana)</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Two namespace declaration attributes have the same name: %1.</source>
         <translation>Dva atributa deklaracije imenskega prostora imata isto ime: %1</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>An attribute by name %1 has already appeared on this element.</source>
-        <translation>Atribut z imenom %1 se je v tem elementu že pojavil.</translation>
-    </message>
-    <message>
-        <location line="+61"/>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+458"/>
         <source>The name %1 does not refer to any schema type.</source>
         <translation>Ime %1 se ne nanaša na nobeno vrsto sheme.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
-        <location line="+71"/>
         <source>%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>The name of an extension expression must be in a namespace.</source>
         <translation>Ime razširitvenega izraza mora biti v imenskem prostoru.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qcardinality.cpp" line="+55"/>
         <source>empty</source>
         <translation>prazno</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or one</source>
         <translation>nič ali en</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>exactly one</source>
         <translation>točno en</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>one or more</source>
         <translation>en ali več</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or more</source>
         <translation>nič ali več</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="+63"/>
         <source>Required type is %1, but %2 was found.</source>
         <translation>Zahtevana vrsta je %1, najdena pa je bila %2.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Promoting %1 to %2 may cause loss of precision.</source>
         <translation>Povišanje %1 v %2 lahko povzroči izgubo natančnosti.</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>The focus is undefined.</source>
         <translation>Fokus ni definiran.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>An attribute by name %1 has already been created.</source>
         <translation>Atribut z imenom %1 je že bil ustvarjen.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+60"/>
         <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp" line="+344"/>
         <source>%1 is an unsupported encoding.</source>
         <translation>%1 ni podprto kodiranje.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qapplytemplate.cpp" line="+119"/>
         <source>Ambiguous rule match.</source>
         <translation>Dvoumno ujemanje s pravilom.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The prefix must be a valid %1, which %2 is not.</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>The prefix %1 cannot be bound.</source>
         <translation>Predpone %1 ni moč navezati.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
         <translation>Na %2 je lahko navezana le predpona %1 in obratno.</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>Potreben je parameter %1, vendar ustrezen %2 ni bil podan.</translation>
     </message>
     <message>
-        <location line="-71"/>
         <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
         <translation>Podan je bil parameter %1, vendar ustrezen %2 ne obstaja.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qunparsedtextfn.cpp" line="+65"/>
         <source>The URI cannot have a fragment</source>
         <translation type="unfinished"></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 na tej lokaciji ni dovoljen.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Text nodes are not allowed at this location.</source>
         <translation>Besedilna vozlišča na tej lokaciji niso dovoljena.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Parse error: %1</source>
         <translation>Napaka pri razčlenjevanju: %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>Vrednost lastnosti različice XSL-T mora biti vrednost vrste %1, %2 pa to ni.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Running an XSL-T 1.0 stylesheet with a 2.0 processor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
         <source>Unknown XSL-T attribute %1.</source>
         <translation>Neznana XSL-T lastnost %1.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 and %2 are mutually exclusive.</source>
         <translation>Lastnosti %1 in %2 sta medsebojno izključujoči.</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>In a simplified stylesheet module, attribute %1 must be present.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
         <translation>Če element %1 nima lastnosti %2, ne more imeti lastnosti %3 ali %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 mora imeti vsaj eno izmed lastnosti %2 in %3.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>At least one mode must be specified in the %1-attribute on element %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
         <source>Element %1 must come last.</source>
         <translation>Element %1 mora biti zadnji.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>At least one %1-element must occur before %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Only one %1-element can appear.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>At least one %1-element must occur inside %2.</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
         <source>Element %1 cannot have children.</source>
         <translation>Element %1 ne more imeti podelementov.</translation>
     </message>
     <message>
-        <location line="+434"/>
         <source>Element %1 cannot have a sequence constructor.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>A parameter in a function cannot be declared to be a tunnel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
         <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
         <translation type="unfinished"></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 type="unfinished"></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>Vrednost lastnosti %1 elementa %2 mora biti %3 ali %4 in ne %5.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Attribute %1 cannot have the value %2.</source>
         <translation>Lastnost %1 ne more imeti vrednosti %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>The attribute %1 can only appear on the first %2 element.</source>
         <translation>Lastnost %1 se lahko pojavi le pri prvem elementu %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>At least one %1 element must appear as child of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemachecker.cpp" line="+227"/>
         <source>%1 has inheritance loop in its base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+24"/>
         <source>Circular inheritance of base type %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Circular inheritance of union %1.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Base type of simple type %1 cannot be complex type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Simple type %1 cannot have direct base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location line="+9"/>
         <source>Simple type %1 is not allowed to have base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Simple type %1 can only have simple atomic type as base type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+484"/>
         <source>Variety of item type of %1 must be either atomic or union.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-474"/>
-        <location line="+483"/>
         <source>Variety of member types of %1 must be atomic.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-431"/>
         <source>Simple type %1 is only allowed to have %2 facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Base type of simple type %1 must have variety of type list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Item type of base type does not match item type of %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+93"/>
         <source>Simple type %1 contains not allowed facet type %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
         <source>%1 is not allowed to have any facets.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Base type %1 of simple type %2 must have variety of union.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Complex type %1 has duplicated element %2 in its content model.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Complex type %1 has non-deterministic content.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Complex type %1 must have simple content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Complex type %1 must have the same simple type as its base class %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>Complex type %1 cannot be derived from base type %2%3.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Complex type %1 with simple content cannot be derived from complex base type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Item type of simple type %1 cannot be a complex type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Member type of simple type %1 cannot be a complex type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 is not allowed to have a member type with the same name as itself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
-        <location line="+29"/>
-        <location line="+34"/>
         <source>%1 facet collides with %2 facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>%1 facet must have the same value as %2 facet of base type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>%1 facet must be equal or greater than %2 facet of base type.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-389"/>
         <source>%1 facet contains invalid regular expression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unknown notation %1 used in %2 facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1 facet contains invalid value %2: %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1 facet cannot be %2 or %3 if %4 facet of base type is %5.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>%1 facet cannot be %2 if %3 facet of base type is %4.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
-        <location line="+79"/>
         <source>%1 facet and %2 facet cannot appear together.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
-        <location line="+58"/>
         <source>%1 facet must be less than %2 facet.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>Simple type contains not allowed facet %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Only %1 and %2 facets are allowed when derived by union.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <location line="+16"/>
         <source>%1 contains %2 facet with invalid data: %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Attribute group %1 contains attribute %2 twice.</source>
         <translation>Skupina lastnosti %1 dvakrat vsebuje lastnost %2.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute group %1 contains two different attributes that both have types derived from %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Complex type %1 contains attribute %2 twice.</source>
         <translation>Kompleksna vrsta %1 dvakrat vsebuje lastnost %2.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Complex type %1 contains two different attributes that both have types derived from %2.</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+11"/>
         <source>Value constraint of element %1 is not of elements type: %2.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Type of element %1 cannot be derived from type of substitution group affiliation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Value constraint of attribute %1 is not of attributes type: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Attribute %1 has value constraint but has type derived from %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>%1 attribute in derived complex type must be %2 like in base type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 in derived complex type must have %2 value constraint like in base type.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Attribute %1 in derived complex type must have %2 value constraint.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>processContent of base wildcard must be weaker than derived wildcard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+15"/>
         <source>Element %1 exists twice with different types.</source>
         <translation>Element %1 obstaja dvakrat, z različnima vrstama.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Particle contains non-deterministic wildcards.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
         <source>Type of derived attribute %1 cannot be validly derived from type of base attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Value constraint of derived attribute %1 does not match value constraint of base attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Derived attribute %1 does not exists in the base definition.</source>
+        <source>Derived attribute %1 does not exist in the base definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Derived attribute %1 does not match the wildcard in the base definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Base attribute %1 is required but missing in derived definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Derived definition contains an %1 element that does not exists in the base definition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived wildcard is not a subset of the base wildcard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 of derived wildcard is not a valid restriction of %2 of base wildcard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 from base type is missing in derived type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Type of derived attribute %1 differs from type of base attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Base definition contains an %1 element that is missing in the derived definition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdschemaresolver.cpp" line="+354"/>
         <source>%1 references unknown %2 or %3 element %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 references identity constraint %2 that is no %3 or %4 element.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 has a different number of fields from the identity constraint %2 that it references.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Base type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Item type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Member type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+408"/>
-        <location line="+30"/>
         <source>Type %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-416"/>
         <source>Base type %1 of complex type cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 cannot have complex base type that has a %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
         <source>Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Type of %1 element must be a simple type, %2 is not.</source>
         <translation>Vrsta elementa %1 mora biti preprosta, %2 to ni.</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Substitution group %1 of %2 element cannot be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Substitution group %1 has circular definition.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
-        <location line="+7"/>
         <source>Duplicated element names %1 in %2 element.</source>
         <translation>Podvojeni imeni elementov %1 v elementu %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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
         <source>Circular group reference for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 element is not allowed in this scope</source>
         <translation>Element %1 v tem obsegu ni dovoljen</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>%1 element cannot have %2 attribute with value other than %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 element cannot have %2 attribute with value other than %3 or %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Attribute group %1 has circular reference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
         <source>%1 attribute in %2 must have %3 use like in base type %4.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 has attribute wildcard but its base type %2 has not.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Enumeration facet contains invalid content: {%1} is not a value of type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace prefix of qualified name %1 is not defined.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdparticlechecker.cpp" line="+165"/>
         <source>Empty particle cannot be derived from non-empty particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Derived particle is missing element %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Derived element %1 is missing value constraint as defined in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Derived element %1 has weaker value constraint than base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Fixed value constraint of element %1 differs from value constraint in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Derived element %1 cannot be nillable as base element is not nillable.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Simple type of derived element %1 cannot be validly derived from base element.</source>
-        <translation type="unfinished"></translation>
+        <translation>Preproste vrste izpeljanega elementa %1 ni moč veljavno izpeljati iz osnovnega elementa.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Complex type of derived element %1 cannot be validly derived from base element.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kompleksne vrste izpeljanega elementa %1 ni moč veljavno izpeljati iz osnovnega elementa.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Element %1 is missing in derived particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Element %1 v izpeljanem delcu manjka.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Element %1 does not match namespace constraint of wildcard in base particle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vzorec v izpeljanem delcu ni veljavna podmnoživa vzorca iz osnovnega razreda.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>processContent vzorca v izpeljanem delcu je šibkejši kot vzorec v osnovnem delcu.</translation>
     </message>
     <message>
-        <location line="+240"/>
         <source>Derived particle allows content that is not allowed in the base particle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Izpeljani delec dovoljuje vsebino, ki v osnovnem delcu ni dovoljena.</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>Ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 is not allowed in this scope, possible elements are: %2.</source>
         <translation>Element %1 v tem obsegu ni dovoljen, možni elementi so: %2.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Child element is missing in that scope, possible child elements are: %1.</source>
         <translation>V tem obsegu manjka podelement, možni podelementi so: %1.</translation>
     </message>
     <message>
-        <location line="+127"/>
         <source>Document is not a XML schema.</source>
         <translation>Dokument ni shema 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>Lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>%1 attribute of %2 element contains invalid content: {%3}.</source>
         <translation>Lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+237"/>
         <source>%1 element is not allowed to have the same %2 attribute value as the target namespace %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>%1 element without %2 attribute is not allowed inside schema without target namespace.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+833"/>
-        <location line="+158"/>
         <source>%1 element is not allowed inside %2 element if %3 attribute is present.</source>
         <translation>Element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %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 nima niti lastnosti %2 niti podelementa %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 s podelementom %2 ne sme imeti lastnosti %3.</translation>
     </message>
     <message>
-        <location line="-1325"/>
         <source>%1 attribute of %2 element must be %3 or %4.</source>
         <translation>Lastnost %1 elementa %2 mora biti %3 ali %4.</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>%1 attribute of %2 element must have a value of %3.</source>
         <translation>Lastnost %1 elementa %2 mora imeti vrednost %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>Lastnost %1 elementa %2 mora imeti vrednost %3 ali %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 hkrati ne sme imeti lastnosti %2 in %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>Vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3.</translation>
     </message>
     <message>
-        <location line="-215"/>
-        <location line="+222"/>
         <source>%1 attribute of %2 element must not be %3.</source>
         <translation>Lastnost %1 elementa %2 ne sme biti %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 type="unfinished"></translation>
+        <translation>Lastnost %1 elementa %2 mora imeti vrednost %3, ker je nastavljena lastnost %4.</translation>
     </message>
     <message>
-        <location line="+187"/>
         <source>Specifying use=&apos;prohibited&apos; inside an attribute group has no effect.</source>
-        <translation type="unfinished"></translation>
+        <translation>Določitev use=&apos;prohibited&apos; znotraj skupine lastnosti nima nobenega učinka.</translation>
     </message>
     <message>
-        <location line="+353"/>
         <source>%1 element must have either %2 or %3 attribute.</source>
         <translation>Element %1 mora imeti lastnost %2 ali %3.</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>%1 element must have either %2 attribute or %3 or %4 as child element.</source>
-        <translation type="unfinished"></translation>
+        <translation>Element %1 mora imeti bodisi lastnost %2 bodisi vsebovati %3 ali %4 kot podelement.</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>%1 element requires either %2 or %3 attribute.</source>
         <translation>Element %1 potrebuje vsaj lastnost %2 ali %3.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Text or entity references not allowed inside %1 element</source>
-        <translation type="unfinished"></translation>
+        <translation>Sklici na besedilo ali entiteto znotraj elementa %1 niso dovoljeni.</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 type="unfinished"></translation>
+        <translation>Lastnost %1 elementa %2 mora vsebovati %3, %4 ali pa seznam URI-jev.</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 element is not allowed in this context.</source>
         <translation>Element %1 v tem kontekstu ni dovoljen.</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1 attribute of %2 element has larger value than %3 attribute.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lastnost %1 elementa %2 ima višjo vrednost kot lastnost %3.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Prefix of qualified name %1 is not defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Predpona kvalificiranega imena %1 ni določena.</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 type="unfinished"></translation>
+        <translation>Lastnost %1 elementa %2 mora vsebovati bodisi %3 bodisi druge vrednosti.</translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Component with id %1 has been defined previously.</source>
-        <translation>Komponenta z ID-jem %1 je že bila definirana.</translation>
+        <source>Component with ID %1 has been defined previously.</source>
+        <translation type="unfinished">Komponenta z ID-jem %1 je že bila definirana.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Element %1 already defined.</source>
         <translation>Element %1 je že definiran.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 already defined.</source>
         <translation>Lastnost %1 je že definirana.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Type %1 already defined.</source>
         <translation>Vrsta %1 je že definirana.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute group %1 already defined.</source>
         <translation>Skupina lastnosti %1 je že definirana.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Element group %1 already defined.</source>
         <translation>Skupina elementov %1 je že definirana.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Notation %1 already defined.</source>
         <translation>Zapis %1 je že definiran.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Identity constraint %1 already defined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Omejitev identitete %1 je že določena.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Duplicated facets in simple type %1.</source>
         <translation type="unfinished"></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>
         <translation>%1 glede na %2 ni veljaven.</translation>
     </message>
     <message>
-        <location line="+167"/>
         <source>String content does not match the length facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>String content does not match the minLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>String content does not match the maxLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>String content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>String content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Signed integer content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Signed integer content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Signed integer content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Signed integer content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Signed integer content does not match in the totalDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unsigned integer content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unsigned integer content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Unsigned integer content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Unsigned integer content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Unsigned integer content does not match in the totalDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Double content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Double content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Double content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Double content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Decimal content does not match in the fractionDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Decimal content does not match in the totalDigits facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Date time content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Date time content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Date time content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Date time content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Duration content does not match the maxInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the maxExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the minInclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Duration content does not match the minExclusive facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Duration content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Duration content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Boolean content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Binary content does not match the length facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Binary content does not match the minLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Binary content does not match the maxLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Binary content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Invalid QName content: %1.</source>
         <translation>Neveljavna vsebina QName: %1.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>QName content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>QName content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Notation content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>List content does not match length facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>List content does not match minLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>List content does not match maxLength facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+90"/>
         <source>List content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>List content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Union content is not listed in the enumeration facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Union content does not match pattern facet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Data of type %1 are not allowed to be empty.</source>
         <translation>Podatki vrste %1 ne smejo biti prazni.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp" line="+160"/>
         <source>Element %1 is missing child element.</source>
         <translation>Elementu %1 manjka podelement.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>There is one IDREF value with no corresponding ID: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Obstaja ena vrednost IDREF brez ustreznega ID-ja: %1</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Loaded schema file is invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation>Naložena datoteka s shemo ni veljavna.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains invalid data.</source>
         <translation>%1 vsebuje neveljavne podatke.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>No schema defined for validation.</source>
-        <translation type="unfinished"></translation>
+        <translation>Določene ni nobene sheme za potrjevanje.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>No definition for element %1 available.</source>
         <translation>Definicija za element %1 ni na voljo.</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+49"/>
-        <location line="+142"/>
         <source>Specified type %1 is not known to the schema.</source>
-        <translation type="unfinished"></translation>
+        <translation>Določena vrsta %1 shemi ni znana.</translation>
     </message>
     <message>
-        <location line="-176"/>
         <source>Element %1 is not defined in this scope.</source>
         <translation>Element %1 v tem obsegu ni definiran.</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Declaration for element %1 does not exist.</source>
         <translation>Deklaracija elementa %1 ne obstaja.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Element %1 contains invalid content.</source>
         <translation>Element %1 vsebuje neveljavno vsebino.</translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>Element %1 is declared as abstract.</source>
         <translation>Element %1 je deklariran kot abstrakten.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 is not nillable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Attribute %1 contains invalid data: %2</source>
         <translation>Lastnost %1 vsebuje neveljavne podatke: %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Element contains content although it is nillable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Fixed value constrained not allowed if element is nillable.</source>
+        <source>Fixed value constraint not allowed if element is nillable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Element %1 cannot contain other elements, as it has a fixed content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Specified type %1 is not validly substitutable with element type %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Complex type %1 is not allowed to be abstract.</source>
         <translation>Kompleksna vrsta %1 ne sme biti abstraktna.</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Element %1 contains not allowed attributes.</source>
         <translation>Element %1 vsebuje nedovoljene lastnosti.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+97"/>
         <source>Element %1 contains not allowed child element.</source>
         <translation>Element %1 vsebuje nedovoljen podelement.</translation>
     </message>
     <message>
-        <location line="-76"/>
-        <location line="+93"/>
         <source>Content of element %1 does not match its type definition: %2.</source>
         <translation>Vsebina elementa %1 ne ustreza zanj določeni vrsti: %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 type="unfinished"></translation>
+        <translation>Vsebina elementa %1 ne ustreza določeni omejitvi vrednosti.</translation>
     </message>
     <message>
-        <location line="-73"/>
         <source>Element %1 contains not allowed child content.</source>
         <translation>Element %1 vsebuje nedovoljeno vsebino v podelementih.</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Element %1 contains not allowed text content.</source>
         <translation>Element %1 vsebuje nedovoljeno besedilno vsebino.</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Element %1 can not contain other elements, as it has a fixed content.</source>
-        <translation>Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino.</translation>
-    </message>
-    <message>
-        <location line="+43"/>
         <source>Element %1 is missing required attribute %2.</source>
         <translation>Elementu %1 manjka obvezna lastnost %2.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Attribute %1 does not match the attribute wildcard.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lastnost %1 ne ustreza vzorcu za lastnost.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Declaration for attribute %1 does not exist.</source>
         <translation>Deklaracija lastnosti %1 ne obstaja.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Element %1 contains two attributes of type %2.</source>
         <translation>Element %1 vsebuje dve lastnosti vrste %2.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Attribute %1 contains invalid content.</source>
         <translation>Lastnost %1 vsebuje neveljavno vsebino.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Element %1 contains unknown attribute %2.</source>
         <translation>Element %1 vsebuje neznano lastnost %2.</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+46"/>
         <source>Content of attribute %1 does not match its type definition: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vsebina lastnosti %1 ne ustreza zanjo določeni vrsti: %2.</translation>
     </message>
     <message>
-        <location line="-38"/>
-        <location line="+46"/>
         <source>Content of attribute %1 does not match defined value constraint.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vsebina lastnosti %1 ne ustreza zanjo določeni omejitvi vrednosti.</translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Non-unique value found for constraint %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Za omejitev %1 je bila najdena ne-edinstvena vrednost.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Key constraint %1 contains absent fields.</source>
-        <translation type="unfinished"></translation>
+        <translation>Omejitev ključa %1 vsebuje manjkajoča polja.</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 type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>More than one value found for field %1.</source>
         <translation>Za polje %1 je bila najdena več kot ena vrednost.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Field %1 has no simple type.</source>
         <translation>Polje %1 nima preproste vrste.</translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>ID value &apos;%1&apos; is not unique.</source>
         <translation>Vrednost ID »%1« ni edinstvena.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&apos;%1&apos; attribute contains invalid QName content: %2.</source>
         <translation>Lastnost »%1« vsebuje neveljavno vsebino QName: %2.</translation>
     </message>
+</context>
+<context>
+    <name></name>
+    <message>
+        <source>Remaining move time</source>
+        <comment>QWebPage~|Media controller element</comment>
+        <translation type="obsolete">Preostali čas filma</translation>
+    </message>
     <message>
-        <location filename="Obsolete_PO_entries"/>
         <source>attribute group %1 contains attribute %2 twice</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">skupina lastnosti %1 dvakrat vsebuje lastnost %2</translation>
     </message>
     <message>
-        <location/>
         <source>complex type %1 contains attribute %2 twice</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">kompleksna vrsta %1 dvakrat vsebuje lastnost %2</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 exists twice with different types</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 obstaja dvakrat, z različnima vrstama</translation>
     </message>
     <message>
-        <location/>
         <source>can not process unknown element %1, expected elements are: %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 is not allowed in this scope, possible elements are: %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 v tem obsegu ni dovoljen, možni elementi so: %2</translation>
     </message>
     <message>
-        <location/>
         <source>child element is missing in that scope, possible child elements are: %1</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">v tem obsegu manjka podelement, možni podelementi so: %1</translation>
     </message>
     <message>
-        <location/>
         <source>document is not a XML schema</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">dokument ni shema XML</translation>
     </message>
     <message>
-        <location/>
         <source>%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4</translation>
     </message>
     <message>
-        <location/>
         <source>%1 attribute of %2 element contains invalid content: {%3}</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3}</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element is not allowed inside %2 element if %3 attribute is present</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element has neither %2 attribute nor %3 child element</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 nima niti lastnosti %2 niti podelementa %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element with %2 child element must not have a %3 attribute</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 s podelementom %2 ne sme imeti lastnosti %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 attribute of %2 element must be %3 or %4</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 elementa %2 mora biti %3 ali %4</translation>
     </message>
     <message>
-        <location/>
         <source>%1 attribute of %2 element must have a value of %3</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 elementa %2 mora imeti vrednost %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 attribute of %2 element must have a value of %3 or %4</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 elementa %2 mora imeti vrednost %3 ali %4</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element must not have %2 and %3 attribute together</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 hkrati ne sme imeti lastnosti %2 in %3</translation>
     </message>
     <message>
-        <location/>
         <source>content of %1 attribute of %2 element must not be from namespace %3</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 attribute of %2 element must not be %3</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 elementa %2 ne sme biti %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element must have either %2 or %3 attribute</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 mora imeti lastnost %2 ali %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element requires either %2 or %3 attribute</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 potrebuje vsaj lastnost %2 ali %3</translation>
     </message>
     <message>
-        <location/>
         <source>%1 element is not allowed in this context</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 v tem kontekstu ni dovoljen</translation>
     </message>
     <message>
-        <location/>
         <source>component with id %1 has been defined previously</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">komponenta z ID-jem %1 je že bila definirana</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 already defined</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 je že definiran</translation>
     </message>
     <message>
-        <location/>
         <source>attribute %1 already defined</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 je že definirana</translation>
     </message>
     <message>
-        <location/>
         <source>type %1 already defined</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">vrsta %1 je že definirana</translation>
     </message>
     <message>
-        <location/>
         <source>attribute group %1 already defined</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">skupina lastnosti %1 je že definirana</translation>
     </message>
     <message>
-        <location/>
         <source>element group %1 already defined</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">skupina elementov %1 je že definirana</translation>
     </message>
     <message>
-        <location/>
         <source>notation %1 already defined</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">zapis %1 je že definiran</translation>
     </message>
     <message>
-        <location/>
         <source>type of %1 element must be a simple type, %2 is not</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">vrsta elementa %1 mora biti preprosta, %2 to ni</translation>
     </message>
     <message>
-        <location/>
         <source>duplicated element names %1 in %2 element</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">podvojeni imeni elementov %1 v elementu %2</translation>
     </message>
     <message>
-        <location/>
         <source>%1 is not valid according to %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">%1 glede na %2 ni veljaven</translation>
     </message>
     <message>
-        <location/>
         <source>invalid QName content: %1</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">neveljavna vsebina QName: %1</translation>
     </message>
     <message>
-        <location/>
         <source>data of type %1 are not allowed to be empty</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">podatki vrste %1 ne smejo biti prazni</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 is missing child element</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">elementu %1 manjka podelement</translation>
     </message>
     <message>
-        <location/>
         <source>%1 contains invalid data</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">%1 vsebuje neveljavne podatke</translation>
     </message>
     <message>
-        <location/>
         <source>no definition for element %1 available</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">definicija za element %1 ni na voljo</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 is not defined in this scope</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 v tem obsegu ni definiran</translation>
     </message>
     <message>
-        <location/>
         <source>declaration for element %1 does not exist</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">deklaracija elementa %1 ne obstaja</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains invalid content</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje neveljavno vsebino</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 is declared as abstract</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 je deklariran kot abstrakten</translation>
     </message>
     <message>
-        <location/>
         <source>complex type %1 is not allowed to be abstract</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">kompleksna vrsta %1 ne sme biti abstraktna</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains not allowed attributes</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje nedovoljene lastnosti</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains not allowed child element</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje nedovoljen podelement</translation>
     </message>
     <message>
-        <location/>
         <source>content of element %1 does not match its type definition: %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">vsebina elementa %1 ne ustreza zanj določeni vrsti: %2</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains not allowed child content</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje nedovoljeno vsebino v podelementih</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains not allowed text content</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje nedovoljeno besedilno vsebino</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 can not contain other elements, as it has a fixed content</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 is missing required attribute %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">elementu %1 manjka obvezna lastnost %2</translation>
     </message>
     <message>
-        <location/>
         <source>declaration for attribute %1 does not exist</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">deklaracija lastnosti %1 ne obstaja</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains two attributes of type %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje dve lastnosti vrste %2</translation>
     </message>
     <message>
-        <location/>
         <source>attribute %1 contains invalid content</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">lastnost %1 vsebuje neveljavno vsebino</translation>
     </message>
     <message>
-        <location/>
         <source>element %1 contains unknown attribute %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">element %1 vsebuje neznano lastnost %2</translation>
     </message>
     <message>
-        <location/>
         <source>more than one value found for field %1</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">za polje %1 je bila najdena več kot ena vrednost</translation>
     </message>
     <message>
-        <location/>
         <source>field %1 has no simple type</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">polje %1 nima preproste vrste</translation>
     </message>
     <message>
-        <location/>
         <source>ID value &apos;%1&apos; is not unique</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">Vrednost ID »%1« ni edinstvena</translation>
     </message>
     <message>
-        <location/>
         <source>&apos;%1&apos; attribute contains invalid QName content: %2</source>
+        <comment>QtXmlPatterns~|</comment>
         <translation type="obsolete">Lastnost »%1« vsebuje neveljavno vsebino QName: %2</translation>
     </message>
+    <message>
+        <source>Cannot start playback. 
+
+Check your Gstreamer installation and make sure you 
+have libgstreamer-plugins-base installed.</source>
+        <comment>Phonon::Gstreamer::MediaObject|</comment>
+        <translation type="obsolete">Ni moč začeti predvajanja.
+
+Preverite namestitev GStreamerja in se prepričajte, 
+da je nameščen paket libgstreamer-plugins-base.</translation>
+    </message>
+    <message>
+        <source>Frequency band, %1 Hz</source>
+        <comment>Phonon::MMF::AudioEqualizer|</comment>
+        <translation type="obsolete">Frekvenčni pas, %1 Hz</translation>
+    </message>
+    <message>
+        <source>audio equalizer</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">izenačevalnik zvoka</translation>
+    </message>
+    <message>
+        <source>Bass boost</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">Ojačanje basov</translation>
+    </message>
+    <message>
+        <source>Distance Attenuation</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">Utišanje zaradi razdalje</translation>
+    </message>
+    <message>
+        <source>Environmental Reverb</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">Okoljsko odmevanje</translation>
+    </message>
+    <message>
+        <source>Loudness</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">Glasnost</translation>
+    </message>
+    <message>
+        <source>Source Orientation</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">Usmerjenost vira</translation>
+    </message>
+    <message>
+        <source>Stereo Widening</source>
+        <comment>Phonon::MMF::EffectFactory|</comment>
+        <translation type="obsolete">Razširitev sterea</translation>
+    </message>
+    <message>
+        <source>Invalid hostname</source>
+        <comment>QObject|</comment>
+        <translation type="obsolete">Neveljavno ime gostitelja</translation>
+    </message>
+    <message>
+        <source>Operation not supported on %1</source>
+        <comment>QObject|</comment>
+        <translation type="obsolete">Dejanje na %1 ni podprto</translation>
+    </message>
+    <message>
+        <source>Invalid URI: %1</source>
+        <comment>QObject|</comment>
+        <translation type="obsolete">Neveljaven URI: %1</translation>
+    </message>
+    <message>
+        <source>Socket error on %1: %2</source>
+        <comment>QObject|</comment>
+        <translation type="obsolete">Napaka vtičnice na %1: %2</translation>
+    </message>
+    <message>
+        <source>Remote host closed the connection prematurely on %1</source>
+        <comment>QObject|</comment>
+        <translation type="obsolete">Oddaljen gostitelj je predčasno prekinil povezavo na %1</translation>
+    </message>
+    <message>
+        <source>No host name given</source>
+        <comment>QObject|</comment>
+        <translation type="obsolete">Podano ni bilo nobeno ime gostitelja</translation>
+    </message>
+    <message>
+        <source>Private key does not certificate public key, %1</source>
+        <comment>QSslSocket|</comment>
+        <translation type="obsolete">Zasebni ključ ne potrjuje javnega ključa, %1</translation>
+    </message>
+    <message>
+        <source>No variable by name %1 exists</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Spremenljivka z imenom %1 ne obstaja</translation>
+    </message>
+    <message>
+        <source>No value is available for the external variable by name %1.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti.</translation>
+    </message>
+    <message>
+        <source>A template by name %1 has already been declared.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Predloga z imenom %1 je že bila deklarirana.</translation>
+    </message>
+    <message>
+        <source>The value of attribute %1 must of type %2, which %3 isn&apos;t.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni.</translation>
+    </message>
+    <message>
+        <source>A variable by name %1 has already been declared.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Spremenljivka z imenom %1 je že bila deklarirana.</translation>
+    </message>
+    <message>
+        <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno.</translation>
+    </message>
+    <message>
+        <source>No function by name %1 is available.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Na voljo ni nobene funkcije z imenom %1.</translation>
+    </message>
+    <message>
+        <source>An attribute by name %1 has already appeared on this element.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Atribut z imenom %1 se je v tem elementu že pojavil.</translation>
+    </message>
+    <message>
+        <source>Component with id %1 has been defined previously.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Komponenta z ID-jem %1 je že bila definirana.</translation>
+    </message>
+    <message>
+        <source>Element %1 can not contain other elements, as it has a fixed content.</source>
+        <comment>QtXmlPatterns|</comment>
+        <translation type="obsolete">Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts
index 2d435e6..7137d21 100644
--- a/translations/qtconfig_ru.ts
+++ b/translations/qtconfig_ru.ts
@@ -4,151 +4,114 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../tools/qtconfig/mainwindow.cpp" line="+204"/>
         <source>Desktop Settings (Default)</source>
         <translation>Настройки рабочего стола (по умолчанию)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Choose style and palette based on your desktop settings.</source>
         <translation>Выбор стиля и палитры на основе настроек рабочего стола.</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>On The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <location line="+1"/>
-        <location line="+40"/>
-        <location line="+1"/>
         <source>Auto (default)</source>
         <translation>Автоматически (по умолчанию)</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>Choose audio output automatically.</source>
         <translation>Автоматический выбор звукового выхода.</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>aRts</source>
         <translation>aRts</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Experimental aRts support for GStreamer.</source>
         <translation>Экспериментальная поддержка aRts в GStreamer.</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Phonon GStreamer backend not available.</source>
         <translation>Модуль поддержки GStreamer недоступен.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Choose render method automatically</source>
         <translation>Автоматический выбор метода отрисовки</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Use X11 Overlays</source>
         <translation>Использовать оверлеи X11</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>OpenGL</source>
         <translation>OpenGL</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Use OpenGL if available</source>
         <translation>Использовать OpenGL, если возможно</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1"/>
         <source>Software</source>
         <translation>Программный</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Use simple software rendering</source>
         <translation>Использовать простую программную отрисовку</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>No changes to be saved.</source>
         <translation>Нет изменений для сохранения.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Saving changes...</source>
         <translation>Сохранение изменений...</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>Over The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Off The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+466"/>
         <source>Select a Directory</source>
         <translation>Выбор каталога</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;Version %2&lt;br/&gt;&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
         <translation>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;Версия %2&lt;br/&gt;&lt;br/&gt;Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения.</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
-        <location line="+8"/>
         <source>Qt Configuration</source>
         <translation>Конфигурация Qt</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Save Changes</source>
         <translation>Сохранение изменений</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save changes to settings?</source>
         <translation>Сохранить изменения настроек?</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
@@ -156,347 +119,278 @@
 <context>
     <name>MainWindowBase</name>
     <message>
-        <location filename="../tools/qtconfig/mainwindowbase.ui"/>
         <source>Qt Configuration</source>
         <translation>Конфигурация Qt</translation>
     </message>
     <message>
-        <location/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location/>
         <source>GUI Style</source>
         <translation>Стиль пользовательского графического интерфейса</translation>
     </message>
     <message>
-        <location/>
         <source>Select GUI &amp;Style:</source>
         <translation>&amp;Стиль интерфейса:</translation>
     </message>
     <message>
-        <location/>
         <source>Build Palette</source>
         <translation>Палитра</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;3-D Effects:</source>
         <translation>Эффекты &amp;3D:</translation>
     </message>
     <message>
-        <location/>
         <source>Window Back&amp;ground:</source>
         <translation>&amp;Фон окна:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Tune Palette...</source>
         <translation>&amp;Настроить палитру...</translation>
     </message>
     <message>
-        <location/>
         <source>Please use the KDE Control Center to set the palette.</source>
         <translation>Используйте Центр управления KDE для настройки цветов.</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
     <message>
-        <location/>
         <source>Select &amp;Palette:</source>
         <translation>Выбор &amp;палитры:</translation>
     </message>
     <message>
-        <location/>
         <source>Active Palette</source>
         <translation>Палитра активных элементов</translation>
     </message>
     <message>
-        <location/>
         <source>Inactive Palette</source>
         <translation>Палитра неактивных элементов</translation>
     </message>
     <message>
-        <location/>
         <source>Disabled Palette</source>
         <translation>Палитра выключенных элементов</translation>
     </message>
     <message>
-        <location/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
-        <location/>
         <source>Default Font</source>
         <translation>Шрифт по умолчанию</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Style:</source>
         <translation>&amp;Начертание:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Point Size:</source>
         <translation>&amp;Размер:</translation>
     </message>
     <message>
-        <location/>
         <source>F&amp;amily:</source>
         <translation>&amp;Шрифт:</translation>
     </message>
     <message>
-        <location/>
         <source>Sample Text</source>
         <translation>Текст для примера (Sample Text)</translation>
     </message>
     <message>
-        <location/>
         <source>Font Substitution</source>
         <translation>Подстановка шрифтов</translation>
     </message>
     <message>
-        <location/>
         <source>S&amp;elect or Enter a Family:</source>
         <translation>&amp;Выберите шрифт для замены:</translation>
     </message>
     <message>
-        <location/>
         <source>Current Substitutions:</source>
         <translation>Текущие замены:</translation>
     </message>
     <message>
-        <location/>
         <source>Up</source>
         <translation>Выше</translation>
     </message>
     <message>
-        <location/>
         <source>Down</source>
         <translation>Ниже</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location/>
         <source>Select s&amp;ubstitute Family:</source>
         <translation>&amp;Заменять на шрифт:</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location/>
         <source>Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location/>
         <source>Feel Settings</source>
         <translation type="unfinished">Настройка указателя</translation>
     </message>
     <message>
-        <location/>
         <source> ms</source>
         <translation> мс</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Double Click Interval:</source>
         <translation>&amp;Интервал двойного щелчка:</translation>
     </message>
     <message>
-        <location/>
         <source>No blinking</source>
         <translation>Без мигания</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Cursor Flash Time:</source>
         <translation>&amp;Период мигания курсора:</translation>
     </message>
     <message>
-        <location/>
         <source> lines</source>
         <translation> строк</translation>
     </message>
     <message>
-        <location/>
         <source>Wheel &amp;Scroll Lines:</source>
         <translation type="unfinished">&amp;Прокручивать строк при повороте колёсика:</translation>
     </message>
     <message>
-        <location/>
         <source>Resolve symlinks in URLs</source>
         <translation>Разрешать символьные ссылки в URL-ах</translation>
     </message>
     <message>
-        <location/>
         <source>GUI Effects</source>
         <translation type="unfinished">Эффекты пользовательского интерфейса</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Enable</source>
         <translation>&amp;Включить</translation>
     </message>
     <message>
-        <location/>
         <source>Alt+E</source>
         <translation>Alt+D</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Menu Effect:</source>
         <translation>Эффект &amp;меню:</translation>
     </message>
     <message>
-        <location/>
         <source>C&amp;omboBox Effect:</source>
         <translation type="unfinished">Эффект &amp;выпадающего списка:</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;ToolTip Effect:</source>
         <translation type="unfinished">Эффект &amp;подсказки:</translation>
     </message>
     <message>
-        <location/>
         <source>Tool&amp;Box Effect:</source>
         <translation type="unfinished">Эффект панели &amp;инструментов:</translation>
     </message>
     <message>
-        <location/>
         <source>Disable</source>
         <translation>Выключен</translation>
     </message>
     <message>
-        <location/>
         <source>Animate</source>
         <translation>Анимация</translation>
     </message>
     <message>
-        <location/>
         <source>Fade</source>
         <translation>Затухание</translation>
     </message>
     <message>
-        <location/>
         <source>Global Strut</source>
         <translation type="unfinished">Минимальные размеры</translation>
     </message>
     <message>
-        <location/>
         <source>Minimum &amp;Width:</source>
         <translation>Минимальная &amp;ширина:</translation>
     </message>
     <message>
-        <location/>
         <source>Minimum Hei&amp;ght:</source>
         <translation>Минимальная в&amp;ысота:</translation>
     </message>
     <message>
-        <location/>
         <source> pixels</source>
         <translation> пикселей</translation>
     </message>
     <message>
-        <location/>
         <source>Enhanced support for languages written right-to-left</source>
         <translation>Расширенная поддержка письма справа налево</translation>
     </message>
     <message>
-        <location/>
         <source>XIM Input Style:</source>
         <translation>Стиль ввода XIM:</translation>
     </message>
     <message>
-        <location/>
         <source>On The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Over The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Off The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Default Input Method:</source>
         <translation>Метод ввода по умолчанию:</translation>
     </message>
     <message>
-        <location/>
         <source>Printer</source>
         <translation>Принтер</translation>
     </message>
     <message>
-        <location/>
         <source>Enable Font embedding</source>
         <translation>Разрешить встраивание шрифтов</translation>
     </message>
     <message>
-        <location/>
         <source>Font Paths</source>
         <translation>Пути к шрифтам</translation>
     </message>
     <message>
-        <location/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
     <message>
-        <location/>
         <source>Press the &lt;b&gt;Browse&lt;/b&gt; button or enter a directory and press Enter to add them to the list.</source>
         <translation>Нажмите кнопку &lt;b&gt;Обзор...&lt;/b&gt; или укажите каталог и нажмите Ввод для добавления его в список.</translation>
     </message>
     <message>
-        <location/>
         <source>Phonon</source>
         <translation>Phonon</translation>
     </message>
     <message>
-        <location/>
         <source>About Phonon</source>
         <translation>О Phonon</translation>
     </message>
     <message>
-        <location/>
         <source>Current Version:</source>
         <translation>Текущая версия:</translation>
     </message>
     <message>
-        <location/>
         <source>Not available</source>
         <translation>Недоступно</translation>
     </message>
     <message>
-        <location/>
         <source>Website:</source>
         <translation>Вэб-сайт:</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -509,12 +403,10 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>About GStreamer</source>
         <translation>О GStreamer</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -527,22 +419,18 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>GStreamer backend settings</source>
         <translation>Настройки модуля GStreamer</translation>
     </message>
     <message>
-        <location/>
         <source>Preferred audio sink:</source>
         <translation>Предпочитаемое звуковое устройство:</translation>
     </message>
     <message>
-        <location/>
         <source>Preferred render method:</source>
         <translation>Предпочитаемый метод отрисовки:</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -555,57 +443,46 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Внимание: Изменение данных настроек может повлечь невозможность корректного запуска приложений.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location/>
         <source>E&amp;xit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location/>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
     </message>
     <message>
-        <location/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
@@ -613,207 +490,166 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PaletteEditorAdvancedBase</name>
     <message>
-        <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui"/>
         <source>Tune Palette</source>
         <translation>Настройка палитры</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Изменение палитры&lt;/b&gt;&lt;p&gt;Изменение палитры текущего виджета или формы.&lt;/p&gt;&lt;p&gt;Используйте сформированную палитру или выберите цвета для каждой группы цветов и каждой их роли.&lt;/p&gt;&lt;p&gt;Палитру можно проверить на виджетах в разных режимах отображения в разделе предпросмотра.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Select &amp;Palette:</source>
         <translation>Выбор &amp;палитры:</translation>
     </message>
     <message>
-        <location/>
         <source>Active Palette</source>
         <translation>Палитра активных элементов</translation>
     </message>
     <message>
-        <location/>
         <source>Inactive Palette</source>
         <translation>Палитра неактивных элементов</translation>
     </message>
     <message>
-        <location/>
         <source>Disabled Palette</source>
         <translation>Палитра выключенных элементов</translation>
     </message>
     <message>
-        <location/>
         <source>Auto</source>
         <translation>Автоматически</translation>
     </message>
     <message>
-        <location/>
         <source>Build inactive palette from active</source>
         <translation type="unfinished">Создать неактивную палитру из активной</translation>
     </message>
     <message>
-        <location/>
         <source>Build disabled palette from active</source>
         <translation type="unfinished">Создать выключенную палитру из активной</translation>
     </message>
     <message>
-        <location/>
         <source>Central color &amp;roles</source>
         <translation type="unfinished">Роли &amp;цветов</translation>
     </message>
     <message>
-        <location/>
         <source>Choose central color role</source>
         <translation type="unfinished">Выберите роль цвета</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt;&lt;li&gt;Window - основной цвет фона.&lt;/li&gt; &lt;li&gt;WindowText - основной цвет текста.&lt;/li&gt; &lt;li&gt;Base - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.&lt;/li&gt; &lt;li&gt;Text - цвет текста используемый совместно с Base. Обычно, он совпадает с WindowText, так как в этом случае получается максимальный контраст и с Window, и с Base.&lt;/li&gt; &lt;li&gt;Button - основной цвет фона кнопки, которой требуется цвет отличный от Window, например, в стиле Macintosh.&lt;/li&gt; &lt;li&gt;ButtonText - цвет текста используемый совместно с Button.&lt;/li&gt; &lt;li&gt;Highlight - цвет для обозначения выбранного или выделенного элемента.&lt;/li&gt; &lt;li&gt;HighlightedText - цвет текста контрастирующий с Highlight.&lt;/li&gt; &lt;li&gt;BrightText - цвет текста, который отличается от WindowText и хорошо контрастирует с черным.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>WindowText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>BrightText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>ButtonText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Highlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>HighlightedText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Select Color:</source>
         <translation>&amp;Выбор цвета:</translation>
     </message>
     <message>
-        <location/>
         <source>Choose a color</source>
         <translation>Выберите цвет</translation>
     </message>
     <message>
-        <location/>
         <source>Choose a color for the selected central color role.</source>
         <translation>Выберите цвет для указанной роли.</translation>
     </message>
     <message>
-        <location/>
         <source>3-D shadow &amp;effects</source>
         <translation>Эффекты т&amp;рехмерной тени</translation>
     </message>
     <message>
-        <location/>
         <source>Build &amp;from button color</source>
         <translation>Получ&amp;ить из цвета кнопки</translation>
     </message>
     <message>
-        <location/>
         <source>Generate shadings</source>
         <translation type="unfinished">Создание полутонов</translation>
     </message>
     <message>
-        <location/>
         <source>Check to let 3D-effect colors be calculated from button-color.</source>
         <translation type="unfinished">Включите, чтобы цвета эффекта трёхмерности были получены из цвета кнопки.</translation>
     </message>
     <message>
-        <location/>
         <source>Choose 3D-effect color role</source>
         <translation type="unfinished">Выбор роли цвета дял эффекта трёхмерности</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</source>
         <translation>&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt; &lt;li&gt;Light - светлее цвета Button. &lt;/li&gt; &lt;li&gt;Midlight - среднее между Light и Button. &lt;/li&gt; &lt;li&gt;Mid - среднее между Button и Dark. &lt;/li&gt; &lt;li&gt;Dark - темнее цвета Button. &lt;/li&gt; &lt;li&gt;Shadow - очень темный цвет. &lt;/li&gt; &lt;/ul&gt;</translation>
     </message>
     <message>
-        <location/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Midlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Mid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Shadow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location/>
         <source>Select Co&amp;lor:</source>
         <translation>Выбор &amp;цвета:</translation>
     </message>
     <message>
-        <location/>
         <source>Choose a color for the selected effect color role.</source>
         <translation type="unfinished">Выбор цвета для указанной роли.</translation>
     </message>
     <message>
-        <location/>
         <source>OK</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location/>
         <source>Close dialog and apply all changes.</source>
         <translation>Закрыть окно с применением изменений.</translation>
     </message>
     <message>
-        <location/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location/>
         <source>Close dialog and discard all changes.</source>
         <translation>Закрыть окно с отменой изменений.</translation>
     </message>
@@ -821,7 +657,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PreviewFrame</name>
     <message>
-        <location filename="../tools/qtconfig/previewframe.cpp" line="+81"/>
         <source>Desktop settings will only take effect after an application restart.</source>
         <translation>Настройки рабочего стола применятся после перезапуска приложения.</translation>
     </message>
@@ -829,62 +664,50 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PreviewWidgetBase</name>
     <message>
-        <location filename="../tools/qtconfig/previewwidgetbase.ui"/>
         <source>Preview Window</source>
         <translation>Окно предпросмотра</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>
     <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>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>&lt;p&gt;
 &lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
 &lt;/p&gt;
diff --git a/translations/qvfb_ru.ts b/translations/qvfb_ru.ts
index 28f7010..a1988de 100644
--- a/translations/qvfb_ru.ts
+++ b/translations/qvfb_ru.ts
@@ -4,71 +4,54 @@
 <context>
     <name>AnimationSaveWidget</name>
     <message>
-        <location filename="../tools/qvfb/qvfb.cpp" line="+868"/>
-        <location line="+204"/>
         <source>Record</source>
         <translation>Записать</translation>
     </message>
     <message>
-        <location line="-202"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Save in MPEG format (requires netpbm package installed)</source>
         <translation>Сохранить в формат MPEG (требуется установленный пакет netpbm)</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+206"/>
         <source>Click record to begin recording.</source>
         <translation>Нажмите &quot;Записать&quot; для начала записи.</translation>
     </message>
     <message>
-        <location line="-115"/>
-        <location line="+147"/>
         <source>Finished saving.</source>
         <translation>Сохранение завершено.</translation>
     </message>
     <message>
-        <location line="-63"/>
         <source>Paused. Click record to resume, or save if done.</source>
         <translation>Приостановлено. Нажмите &quot;Записать&quot; для продолжения или &quot;Сохранить&quot;, если готово.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Recording...</source>
         <translation>Идёт запись...</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Saving... </source>
         <translation>Сохранение... </translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+4"/>
         <source>Save animation...</source>
         <translation>Сохранение анимации...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Save canceled.</source>
         <translation>Сохранение отменено.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Save failed!</source>
         <translation>Сохранение не удалось!</translation>
     </message>
@@ -76,193 +59,155 @@
 <context>
     <name>Config</name>
     <message>
-        <location filename="../tools/qvfb/config.ui"/>
         <source>Configure</source>
         <translation>Настройка</translation>
     </message>
     <message>
-        <location/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location/>
         <source>176x220 &quot;SmartPhone&quot;</source>
         <translation>176x220 &quot;SmartPhone&quot;</translation>
     </message>
     <message>
-        <location/>
         <source>240x320 &quot;PDA&quot;</source>
         <translation>240x320 &quot;PDA&quot;</translation>
     </message>
     <message>
-        <location/>
         <source>320x240 &quot;TV&quot; / &quot;QVGA&quot;</source>
         <translation>320x240 &quot;TV&quot; / &quot;QVGA&quot;</translation>
     </message>
     <message>
-        <location/>
         <source>640x480 &quot;VGA&quot;</source>
         <translation>640x480 &quot;VGA&quot;</translation>
     </message>
     <message>
-        <location/>
         <source>800x480</source>
         <translation>800x480</translation>
     </message>
     <message>
-        <location/>
         <source>800x600</source>
         <translation>800x600</translation>
     </message>
     <message>
-        <location/>
         <source>1024x768</source>
         <translation>1024x768</translation>
     </message>
     <message>
-        <location/>
         <source>Custom</source>
         <translation>Особый</translation>
     </message>
     <message>
-        <location/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location/>
         <source>1 bit monochrome</source>
         <translation>1 бит (монохромный)</translation>
     </message>
     <message>
-        <location/>
         <source>2 bit grayscale</source>
         <translation>2 бита (градации серого)</translation>
     </message>
     <message>
-        <location/>
         <source>4 bit grayscale</source>
         <translation>4 бита (градации серого)</translation>
     </message>
     <message>
-        <location/>
         <source>8 bit</source>
         <translation>8 бит</translation>
     </message>
     <message>
-        <location/>
         <source>12 (16) bit</source>
         <translation>12 (16) бит</translation>
     </message>
     <message>
-        <location/>
         <source>15 bit</source>
         <translation>15 бит</translation>
     </message>
     <message>
-        <location/>
         <source>16 bit</source>
         <translation>16 бит</translation>
     </message>
     <message>
-        <location/>
         <source>18 bit</source>
         <translation>18 бит</translation>
     </message>
     <message>
-        <location/>
         <source>24 bit</source>
         <translation>24 бита</translation>
     </message>
     <message>
-        <location/>
         <source>32 bit</source>
         <translation>32 бита</translation>
     </message>
     <message>
-        <location/>
         <source>32 bit ARGB</source>
         <translation>32 бита (ARGB)</translation>
     </message>
     <message>
-        <location/>
         <source>Swap red and blue channels</source>
         <translation>Поменять синий и красный каналы</translation>
     </message>
     <message>
-        <location/>
         <source>BGR format</source>
         <translation>Формат BGR</translation>
     </message>
     <message>
-        <location/>
         <source>Skin</source>
         <translation>Обложка</translation>
     </message>
     <message>
-        <location/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location/>
         <source>Emulate touch screen (no mouse move)</source>
         <translatorcomment>указателя?</translatorcomment>
         <translation>Эмулировать тачскрин (без перемещения мыши)</translation>
     </message>
     <message>
-        <location/>
         <source>Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)</source>
         <translation>Эмулировать ж/к экран (только с 3-х кратным увеличением)</translation>
     </message>
     <message>
-        <location/>
         <source>&lt;p&gt;Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i&gt;above&lt;/i&gt;. You may freely modify the Gamma &lt;i&gt;below&lt;/i&gt;.</source>
         <translation>&lt;p&gt;Имейте в виду, что программы, использующие фрэймбуфер, будут завершены, если изменится &lt;i&gt;размер&lt;/i&gt; и/или &lt;i&gt;глубина&lt;/i&gt; экрана.</translation>
     </message>
     <message>
-        <location/>
         <source>Gamma</source>
         <translation>Гамма</translation>
     </message>
     <message>
-        <location/>
         <source>Blue</source>
         <translation>Синий</translation>
     </message>
     <message>
-        <location/>
         <source>1.0</source>
         <translation>1.0</translation>
     </message>
     <message>
-        <location/>
         <source>Green</source>
         <translation>Зеленый</translation>
     </message>
     <message>
-        <location/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location/>
         <source>Red</source>
         <translation>Красный</translation>
     </message>
     <message>
-        <location/>
         <source>Set all to 1.0</source>
         <translation>Выставить все в 1.0</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Cancel</source>
         <translation>От&amp;мена</translation>
     </message>
@@ -270,57 +215,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>Не удалось загрузить изображение &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+64"/>
         <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
         <translation>Каталог обложки &apos;%1&apos; не содержит файла настроек.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
         <translation>Не удалось открыть файл настроек обложки &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
         <translation>Не удалось прочитать файл настроек обложки &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+70"/>
         <source>Syntax error: %1</source>
         <translation>Синтаксическая ошибка: %1</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>The skin &quot;up&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Файл изображения &quot;up&quot; &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>The skin &quot;down&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Файл изображения &quot;down&quot; &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The skin &quot;closed&quot; image file &apos;%1&apos; does not exist.</source>
         <translation>Файл изображения &quot;closed&quot; &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>The skin cursor image file &apos;%1&apos; does not exist.</source>
         <translation>Файл изображения курсора &apos;%1&apos; не существует.</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Syntax error in area definition: %1</source>
         <translation>Синтаксическая ошибка в определении области: %1</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Mismatch in number of areas, expected %1, got %2.</source>
         <translation>Несовпадение количества зон: ожидается %1, указано %2.</translation>
     </message>
@@ -328,17 +262,14 @@
 <context>
     <name>QVFb</name>
     <message>
-        <location filename="../tools/qvfb/qvfb.cpp" line="-504"/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
     <message>
-        <location line="+143"/>
         <source>Load Custom Skin...</source>
         <translation>Загрузить обложку пользователя...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>All QVFB Skins (*.skin)</source>
         <translation>Все обложки QVFB (*.skin)</translation>
     </message>