update translations

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts
index 230258f..4ddeb4c 100644 (file)
--- a/translations/qt_ar.ts
+++ b/translations/qt_ar.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -672,7 +672,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1175,9 +1175,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
@@ -1202,7 +1202,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation type="unfinished"></translation>
@@ -1544,7 +1544,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1672,13 +1672,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1958,7 +1958,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2121,40 +2121,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2275,7 +2241,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2673,29 +2639,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2816,7 +2766,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2869,7 +2819,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3451,7 +3401,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 تيرا</translation>
     </message>
@@ -4126,8 +4076,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4985,7 +4935,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>لم يتم العثور على بروكسي ملائم</translation>
     </message>
@@ -4993,7 +4943,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5001,13 +4951,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5023,7 +4973,7 @@ Do you want to delete it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5040,7 +4990,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5181,17 +5131,6 @@ Do you want to delete it anyway?</source>
         <translation type="unfinished">منزل</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6211,7 +6150,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6388,7 +6327,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">الإسم</translation>
     </message>
@@ -9145,7 +9084,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 موجود مسبقا.
@@ -9381,7 +9320,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11988,7 +11927,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11996,7 +11935,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12084,7 +12023,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">الإسم</translation>
     </message>
@@ -12912,7 +12851,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14632,7 +14571,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14802,7 +14741,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15015,7 +14954,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_cs.ts b/translations/qt_cs.ts
index b1e832e..ea8a7ce 100644 (file)
--- a/translations/qt_cs.ts
+++ b/translations/qt_cs.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,7 +660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,9 +1163,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Nepodařilo se najít počítač</translation>
@@ -1183,7 +1183,7 @@
         <translation>Časový limit pro spojení byl překročen</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>Socket není spojen</translation>
     </message>
@@ -1199,7 +1199,7 @@
         <translation>Síť není dosažitelná</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="-1266"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1532,7 +1532,7 @@
         <translation>Vlastnost &apos;%1&quot; je pouze pro čtení a nelze ji proto animovat</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animace je abstraktní třída</translation>
     </message>
@@ -1660,13 +1660,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Neplatné přiřazení vlastnosti: &quot;%1&quot; je vlastnost pouze pro čtení</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Neplatné přiřazení vlastnosti: neplatná výčtová hodnota</translation>
     </message>
@@ -1946,7 +1946,7 @@
         <translation>&quot;%1&quot; nelze použít na &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Zdvojená výchozí vlastnost</translation>
     </message>
@@ -2109,40 +2109,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>&apos;executeSql&apos; byl vyvolán mimo &apos;transaction()&apos;</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Transakce pouze pro čtení</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Verzi %2 nelze používat; je třeba %1</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>Transakce SQL se nezdařila</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>Transakce: chybí callback (zavolat znovu)</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: Verze databáze neodpovídá očekávané verzi</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2263,7 +2229,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>odstranit (remove): Index %1 je mimo platnou oblast</translation>
     </message>
@@ -2661,29 +2627,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt bylo sestaveno bez podpory pro xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Vyhledávání XmlRole nesmí začínat s &apos;/&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Vyhledávání XmlListModel musí začínat s &apos;/&apos; nebo &quot;//&quot;</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2804,7 +2754,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2857,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3438,7 +3388,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+925"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+923"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
@@ -4123,8 +4073,8 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2121"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+118"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2099"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+97"/>
         <source>No such file or directory</source>
         <translation>Nepodařilo se najít žádný takový soubor nebo adresář</translation>
     </message>
@@ -4982,7 +4932,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Nepodařilo se najít žádný vhodný proxy server</translation>
     </message>
@@ -4990,7 +4940,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Přístup k síti není dovolen.</translation>
     </message>
@@ -4998,13 +4948,13 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Při stahování %1 se vyskytla chyba - Odpověď serveru je: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Protokol &quot;%1&quot; není znám</translation>
     </message>
@@ -5020,7 +4970,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
         <translation>Chyba spuštění podpůrné vrstvy.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Síť dočasně vypadla.</translation>
     </message>
@@ -5037,7 +4987,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Neplatné nastavení.</translation>
     </message>
@@ -5178,17 +5128,6 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
         <translation type="unfinished">Home</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; je již zadán jako název předchozí úlohy, a je proto vypnut.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>Neplátný dotaz: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Nepodařilo se přečíst data obrazu</translation>
@@ -6208,7 +6147,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Jít na řádek</translation>
@@ -6385,7 +6324,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
@@ -9142,7 +9081,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">Soubor %1 již existuje.
@@ -9378,7 +9317,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11979,7 +11918,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11987,7 +11926,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12075,7 +12014,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Název</translation>
     </message>
@@ -12888,7 +12827,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14605,7 +14544,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14775,7 +14714,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14988,7 +14927,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_da.ts b/translations/qt_da.ts
index 9abe251..b704632 100644 (file)
--- a/translations/qt_da.ts
+++ b/translations/qt_da.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,9 +1159,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Host blev ikke fundet</translation>
@@ -1186,7 +1186,7 @@
         <translation>Socket-operation ikke understøttet</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Socket-operation timed out</translation>
@@ -1528,7 +1528,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2105,40 +2105,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2259,7 +2225,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2657,29 +2623,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2800,7 +2750,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2853,7 +2803,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3384,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+860"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+858"/>
         <source>Invalid filename</source>
         <translation>Ugyldigt filnavn</translation>
     </message>
@@ -4119,8 +4069,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Tilladelse nægtet</translation>
     </message>
@@ -4978,7 +4928,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Ingen passende proxy blev fundet</translation>
     </message>
@@ -4986,7 +4936,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4994,13 +4944,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Der opstod fejl i at downloade %1 - serveren svarede: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Protokollen &quot;%1&quot; er ukendt</translation>
     </message>
@@ -5016,7 +4966,7 @@ Do you want to delete it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5033,7 +4983,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5174,17 +5124,6 @@ Do you want to delete it anyway?</source>
         <translation>Hjem</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6204,7 +6143,7 @@ Vælg et andet filnavn.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6381,7 +6320,7 @@ Vælg et andet filnavn.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -9138,7 +9077,7 @@ Vælg et andet filnavn.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 findes allerede.
@@ -9374,7 +9313,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11973,7 +11912,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11981,7 +11920,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12069,7 +12008,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -12877,7 +12816,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14593,7 +14532,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14763,7 +14702,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14976,7 +14915,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 4167bf0..e2541ce 100644 (file)
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,9 +1159,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Rechner konnte nicht gefunden werden</translation>
@@ -1186,7 +1186,7 @@
         <translation>Diese Socket-Operation wird nicht unterstützt</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Das Zeitlimit für die Operation wurde überschritten</translation>
@@ -1528,7 +1528,7 @@
         <translation>Die Eigenschaft &quot;%1&quot; ist schreibgeschützt und kann daher nicht animiert werden</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Die Klasse Animation ist abstrakt</translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Ungültige Zuweisung bei Eigenschaft: &quot;%1&quot; ist schreibgeschützt</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Ungültige Zuweisung bei Eigenschaft: Unbekannter Aufzählungswert</translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation>&quot;%1&quot; kann nicht auf  &quot;%2&quot; angewandt werden</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Mehrfaches Auftreten der Vorgabe-Eigenschaft</translation>
     </message>
@@ -2105,40 +2105,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>&apos;executeSql&apos; wurde außerhalb von &apos;transaction()&apos; aufgerufen</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Schreibgeschützte Transaktion</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Die Version %2 kann nicht verwendet werden; es wird %1 benötigt</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>Die SQL-Transaktion ist fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>callback fehlt bei Transaktion</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: Die Version der Datenbank entspricht nicht der erwarteten Version</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2259,7 +2225,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: Der Index %1 ist außerhalb des gültigen Bereichs</translation>
     </message>
@@ -2657,29 +2623,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Diese Version der Qt-Bibliothek wurde ohne Unterstützung für xmlpatterns erstellt</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Eine XmlRole-Abfrage darf nicht mit &apos;/&apos; beginnen</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Eine XmlListModel-Abfrage muss mit &apos;/&apos; oder &quot;//&quot; beginnen</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2800,7 +2750,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2853,7 +2803,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,7 +3385,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4119,8 +4069,8 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Zugriff verweigert</translation>
     </message>
@@ -4978,7 +4928,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Es konnte kein geeigneter Proxy-Server gefunden werden</translation>
     </message>
@@ -4986,7 +4936,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Der Zugriff auf das Netzwerk ist nicht gestattet.</translation>
     </message>
@@ -4994,13 +4944,13 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Das Protokoll &quot;%1&quot; ist unbekannt</translation>
     </message>
@@ -5016,7 +4966,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Das Netzwerk ist zurzeit ausgefallen.</translation>
     </message>
@@ -5033,7 +4983,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Ungültige Konfiguration.</translation>
     </message>
@@ -5169,17 +5119,6 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; ist bereits als Name einer Rolle vergeben und wird daher deaktiviert.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>Ungültige Abfrage: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+171"/>
         <source>Home</source>
         <translation type="unfinished">Pos1</translation>
@@ -6204,7 +6143,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Gehe zu Zeile</translation>
@@ -6381,7 +6320,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
@@ -9138,7 +9077,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">Die Datei %1 existiert bereits.
@@ -9374,7 +9313,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11973,7 +11912,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11981,7 +11920,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12069,7 +12008,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
@@ -12877,7 +12816,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14593,7 +14532,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14763,7 +14702,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14976,7 +14915,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_es.ts b/translations/qt_es.ts
index 23d3fe0..843d419 100644 (file)
--- a/translations/qt_es.ts
+++ b/translations/qt_es.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,9 +1159,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Equipo no encontrado</translation>
@@ -1186,7 +1186,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Operación socket expirada</translation>
@@ -1528,7 +1528,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2105,40 +2105,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2259,7 +2225,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2657,29 +2623,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2800,7 +2750,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2853,7 +2803,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,7 +3385,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TiB</translation>
     </message>
@@ -4119,8 +4069,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Permiso denegado</translation>
     </message>
@@ -4978,7 +4928,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4986,7 +4936,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4994,13 +4944,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5016,7 +4966,7 @@ Do you want to delete it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5033,7 +4983,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5174,17 +5124,6 @@ Do you want to delete it anyway?</source>
         <translation>Inicio</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6204,7 +6143,7 @@ Elija un nombre de fichero diferente.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6381,7 +6320,7 @@ Elija un nombre de fichero diferente.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -9138,7 +9077,7 @@ Elija un nombre de fichero diferente.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">El fichero %1 ya existe.
@@ -9374,7 +9313,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11973,7 +11912,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11981,7 +11920,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12069,7 +12008,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -12877,7 +12816,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14593,7 +14532,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14763,7 +14702,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14976,7 +14915,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_eu.ts b/translations/qt_eu.ts
index 79fa00e..3ae528c 100644 (file)
--- a/translations/qt_eu.ts
+++ b/translations/qt_eu.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,13 +1159,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Hartune eragiketa epez kanpo</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1173,8 +1173,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Hostalaria ez da aurkitu</translation>
@@ -1192,7 +1192,7 @@
         <translation>Elkarketa denboraz kanpo</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>Hartunea ez dago elkarketuta</translation>
     </message>
@@ -1528,7 +1528,7 @@
         <translation>Ezin da irakurtzeko-bakarrik &quot;%1&quot; ezaugarria animatu</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animazioa klase abstraktoa da</translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Ezaugarri esleipen baliogabea:&quot;%1&quot; irakurtzeko-bakarrik ezaugarri bat da</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Ezaugarri esleipen baliogabea: zenbakitze ezezaguna</translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation>&quot;%1&quot; ezin du eragiketarik egin &quot;%2&quot;-an</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Berezko ezaugarri bikoiztua</translation>
     </message>
@@ -2105,40 +2105,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>executeSql eskualdaketatik kanpo deituta()</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Irakurtzeko-bakarrik Eskualdaketa</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Bertsioa ez dator bat: itxarondakoa %1, aurkitua %2</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>SQL eskualdaketa hutsegitea</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>eskualdaketa: ez dago erantzunik</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: datubase bertsioa ez dator bat</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2259,7 +2225,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>kendu: %1 aurkibidea mailaz kanpo</translation>
     </message>
@@ -2657,29 +2623,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt xmlpatterns sostengu gabe eraikia dago</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>XmlRole eskaera bat ezin da &apos;/&apos;-rekin hasi behar</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>XmlListModel  &apos;/&apos; edo &quot;//&quot;-rekin hasi behar da</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2800,7 +2750,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2853,7 +2803,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3440,7 +3390,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4119,8 +4069,8 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Baimena ukatuta</translation>
     </message>
@@ -4978,7 +4928,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Ez da proxy egokirik aurkitu</translation>
     </message>
@@ -4986,7 +4936,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Sare sarbidea ezgaituta dago.</translation>
     </message>
@@ -4994,13 +4944,13 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Akatsa %1 jeisterakoan- zerbitzariaren erantzuna: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>&quot;%1&quot; protokoloa ezezaguna da</translation>
     </message>
@@ -5016,7 +4966,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
         <translation>Atzealde hasiera akatsa.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Aldibaterako sare hutsegitea.</translation>
     </message>
@@ -5033,7 +4983,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Itxurapen baliogabea.</translation>
     </message>
@@ -5169,17 +5119,6 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot;-k aurreko eginkizun izena bikoizten du eta ezgaitua izango da.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>eskabide baliogabea: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Ezinezkoa irudi datuak irakurtzea</translation>
@@ -6204,7 +6143,7 @@ Gainidaztea nahi duzu?</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Joan Lerrora</translation>
@@ -6381,7 +6320,7 @@ Gainidaztea nahi duzu?</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Izena</translation>
     </message>
@@ -9138,7 +9077,7 @@ Gainidaztea nahi duzu?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 jadanik badago.
@@ -9374,7 +9313,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11973,7 +11912,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11981,7 +11920,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12069,7 +12008,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Izena</translation>
     </message>
@@ -12877,7 +12816,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14593,7 +14532,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14763,7 +14702,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14976,7 +14915,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_fa.ts b/translations/qt_fa.ts
index a4d041e..16273bd 100644 (file)
--- a/translations/qt_fa.ts
+++ b/translations/qt_fa.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -652,7 +652,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1155,13 +1155,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>پایان زمان عملیات سوکت</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1169,8 +1169,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>میزبان یافت نشد</translation>
@@ -1188,7 +1188,7 @@
         <translation>پایان زمان اتصال</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>سوکت متصل نیست</translation>
     </message>
@@ -1524,7 +1524,7 @@
         <translation>نمی‌توان ویژگی فقط خواندنی %1 را متحرک کرد</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animation یک کلاس انتزاعی است</translation>
     </message>
@@ -1652,13 +1652,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>تخصیص نامعتبر ویژگی: «%1» ویژگی فقط خواندنی است</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>تخصیص نامعتبر ویژگی: شمارش ناشناخته</translation>
     </message>
@@ -1938,7 +1938,7 @@
         <translation>«%1» نمی‌تواند روی «%2» عمل کند</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>ویژگی پیش‌فرض تکراری</translation>
     </message>
@@ -2101,40 +2101,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <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="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>تراکنش: callback یافت نشد</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: عدم تطابق نسخه پایگاه داده</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2255,7 +2221,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: شاخص %1 خارج از دامنه است</translation>
     </message>
@@ -2653,29 +2619,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt بدون پشتیبانی از xmlpatterns ساخته شده است</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>یک .پرس‌وجوی XmlRole نباید با «/» شروع شود</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>یک پرس و جوی XmlListModel باید با «/» یا «//» شروع شود</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2796,7 +2746,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2849,7 +2799,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3431,7 +3381,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 ترابایت</translation>
     </message>
@@ -4115,8 +4065,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>حق دسترسی رد شد</translation>
     </message>
@@ -4974,7 +4924,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>پروکسی مناسب پیدا نشد</translation>
     </message>
@@ -4982,7 +4932,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>دسترسی شبکه غیر‌فعال شده است.</translation>
     </message>
@@ -4990,13 +4940,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>خطای دانلود %1 - پاسخ سرور: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>پروتکل «%1» پشتیبانی ناشناخته است</translation>
     </message>
@@ -5012,7 +4962,7 @@ Do you want to delete it anyway?</source>
         <translation>خطا در شروع پایانهٔ مدیریتی.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>خرابی موقت شبکه.</translation>
     </message>
@@ -5029,7 +4979,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>پیکر‌بندی نامعتبر.</translation>
     </message>
@@ -5165,17 +5115,6 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; نام وظیفهٔ قبلی را تکرار می‌کند و غیر‌فعال خواهد شد.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>پرس‌وجوی نامعتبر: %1</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>نمی‌توان داده‌های تصویر را خواند</translation>
@@ -6200,7 +6139,7 @@ Do you want to overwrite it?</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>برو به خط</translation>
@@ -6377,7 +6316,7 @@ Do you want to overwrite it?</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>نام</translation>
     </message>
@@ -9135,7 +9074,7 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 از قبل موجود است.
@@ -9371,7 +9310,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11968,7 +11907,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11976,7 +11915,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12064,7 +12003,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">نام</translation>
     </message>
@@ -12867,7 +12806,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14582,7 +14521,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14752,7 +14691,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14965,7 +14904,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts
index b816153..462f1e1 100644 (file)
--- a/translations/qt_fr.ts
+++ b/translations/qt_fr.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,9 +1159,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Hôte introuvable</translation>
@@ -1186,7 +1186,7 @@
         <translation>Opération sur socket non supportée</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Opération socket expirée</translation>
@@ -1528,7 +1528,7 @@
         <translation>Impossible d&apos;animer la propriété en lecture seule &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>L&apos;animation est une classe abstraite</translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Affectation de propriété invalide : &quot;%1&quot;est une propriété en lecture seule</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Affectation de propriété invalide : énumération inconnue</translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation>&quot;%1&quot; ne peut pas opérer sur &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Propriété par défaut en double</translation>
     </message>
@@ -2109,40 +2109,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>executeSql a été appelé en dehors de transaction()</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Transaction en lecture seule</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Version incompatible : %1 attendue, %2 trouvée</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>la transaction SQL a échouée</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>transaction : la fonction de rappel est absente</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL : la version de la base de données est incompatible</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2264,7 +2230,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove : l&apos;index %1 est hors de la plage de valeurs admissibles</translation>
     </message>
@@ -2665,29 +2631,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt a été compilé sans support pour xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Une requête XmlRole ne doit pas commencer par &apos;/&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Une requête XmlListModel doit commencer par &apos;/&apos; ou &quot;//&quot;</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2808,7 +2758,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2861,7 +2811,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3442,7 +3392,7 @@ Voulez-vous quand même le supprimer ?</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 To</translation>
     </message>
@@ -4128,8 +4078,8 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Autorisation refusée</translation>
     </message>
@@ -4987,7 +4937,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Aucun proxy trouvé</translation>
     </message>
@@ -4995,7 +4945,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>L&apos;accès au réseau est désactivé.</translation>
     </message>
@@ -5003,13 +4953,13 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Erreur lors du téléchargement de %1 - le serveur a répondu : %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Le protocole &quot;%1&quot; est inconnu</translation>
     </message>
@@ -5025,7 +4975,7 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Erreur réseau temporaire.</translation>
     </message>
@@ -5042,7 +4992,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Configuration invalide.</translation>
     </message>
@@ -5183,17 +5133,6 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="unfinished">Début</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; est un doublon d&apos;un nom de role existant et sera désactivé.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>Requête invalide : &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6213,7 +6152,7 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Aller à la ligne</translation>
@@ -6390,7 +6329,7 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -9153,7 +9092,7 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">Le fichier %1 existe déjà. Voulez-vous l&apos;écraser ?</translation>
@@ -9388,7 +9327,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11991,7 +11930,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11999,7 +11938,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12087,7 +12026,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -12895,7 +12834,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14611,7 +14550,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14781,7 +14720,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14994,7 +14933,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_gl.ts b/translations/qt_gl.ts
index 3407b49..635bf32 100644 (file)
--- a/translations/qt_gl.ts
+++ b/translations/qt_gl.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,13 +1159,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>A operación do socket esgotou o tempo-límite</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1173,8 +1173,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Non se atopou o servidor</translation>
@@ -1192,7 +1192,7 @@
         <translation>A conexión esgotou o tempo-límite</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>O socket non está conectado</translation>
     </message>
@@ -1528,7 +1528,7 @@
         <translation>Non se pode animar a propiedade só para lectura «%1»</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>A animación é unha clase abstracta</translation>
     </message>
@@ -1657,13 +1657,13 @@ superior, inferior nin vcenter.</translation>
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Asignación de propiedade non válida: «%1» é unha propiedade só para lectura</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Asignación de propiedade non válida: enumeración descoñecida</translation>
     </message>
@@ -1943,7 +1943,7 @@ superior, inferior nin vcenter.</translation>
         <translation>«%1» non pode operar en «%2»</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Propiedade predeterminada duplicada</translation>
     </message>
@@ -2106,40 +2106,6 @@ superior, inferior nin vcenter.</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>chamouse a executeSql fora dunha transaction()</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Transacción só para lectura</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Non se corresponden as versións: agardábase a %1 pero atopouse a %2</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>Fallou a transacción SQL</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>transacción: falta a chamada de retorno</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: a versión da base de datos non se corresponde</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2260,7 +2226,7 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>eliminar: o índice %1 está fora do intervalo</translation>
     </message>
@@ -2658,29 +2624,13 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt construíuse sen implementación de xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Unha pescuda XmlRole non pode comezar por «/»</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Unha pescuda XmlListModel non pode comezar por «/» nin por «//»</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2801,7 +2751,7 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2854,7 +2804,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3441,7 +3391,7 @@ Desexa aínda así borralo?</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4120,8 +4070,8 @@ Desexa aínda así borralo?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Permiso negado</translation>
     </message>
@@ -4980,7 +4930,7 @@ texto</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Non se atopou ningún proxy axeitado</translation>
     </message>
@@ -4988,7 +4938,7 @@ texto</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>O acceso á rede está desactivado.</translation>
     </message>
@@ -4996,13 +4946,13 @@ texto</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Aconteceu un erro ao descargar %1, o servidor respondeu: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Non se coñece o protocolo «%1»</translation>
     </message>
@@ -5018,7 +4968,7 @@ texto</translation>
         <translation>fallou o inicio da infraestrutura</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Fallo temporal da rede.</translation>
     </message>
@@ -5035,7 +4985,7 @@ texto</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>A configuración non é válida.</translation>
     </message>
@@ -5172,17 +5122,6 @@ atributo da sentenza. Comprobe a configuración do controlador ODBC</translation
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>«%1» duplica un nome de rol anterior e desactivarase.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>pescuda non válida: «%1»</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Non foi posíbel ler os datos da imaxe</translation>
@@ -6207,7 +6146,7 @@ Desexa sobrescribilo?</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Ir para a liña</translation>
@@ -6384,7 +6323,7 @@ Desexa sobrescribilo?</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -9141,7 +9080,7 @@ Desexa sobrescribilo?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">Xa existe %1.
@@ -9377,7 +9316,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11977,7 +11916,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11985,7 +11924,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12073,7 +12012,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -12881,7 +12820,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14597,7 +14536,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14767,7 +14706,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14980,7 +14919,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_he.ts b/translations/qt_he.ts
index 22b8522..a42c105 100644 (file)
--- a/translations/qt_he.ts
+++ b/translations/qt_he.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,9 +1159,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>מארח לא נמצא</translation>
@@ -1186,7 +1186,7 @@
         <translation>פעולה על שקע אינה נתמכת</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>תם זמן פעולת שקע</translation>
@@ -1528,7 +1528,7 @@
         <translation>לא ניתן להנפיש תכונה לקריאה בלבד &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>‏Animation היא מחלקה מופשטת</translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>השמה לא תקינה למאפיין: &quot;%1&quot; הוא מאפיין קריאה בלבד</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>השמה לא תקינה למאפיין: ערך לא ידוע</translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation>&quot;%1&quot; אין אפשרות לפעול על &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>מאפיין ברירת מחדל כפול</translation>
     </message>
@@ -2105,40 +2105,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <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="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>טרנזקצייה: callback חסר</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>‏SQL: גירסת מסד נתונים לא תואמת</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2259,7 +2225,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: אינדקס %1 מחוץ לטווח</translation>
     </message>
@@ -2657,29 +2623,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>‏Qt נבנה בלי תמיכה עבור xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished">לשאילתת XmlRole אסור להתחיל עם &apos;/&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>שאילתת XmlListModel חייבת להתחיל עם &apos;/&apos; או &quot;//&quot;</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2800,7 +2750,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2853,7 +2803,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3437,7 +3387,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 ט&quot;ב</translation>
     </message>
@@ -4121,8 +4071,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>הרשאה נדחתה</translation>
     </message>
@@ -4981,7 +4931,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>לא נמצא שרת מתווך מתאים</translation>
     </message>
@@ -4989,7 +4939,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>גישת רשת הינה מנוטרלת.</translation>
     </message>
@@ -4997,13 +4947,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>שגיאה בהורדת %1 - שרת ענה: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>פרוטוקול &quot;%1&quot; אינו מוכר</translation>
     </message>
@@ -5019,7 +4969,7 @@ Do you want to delete it anyway?</source>
         <translation>שגיאת התחלת מגשר עורפי.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>כשל רשת זמני.</translation>
     </message>
@@ -5036,7 +4986,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>תצורה לא תקינה.</translation>
     </message>
@@ -5172,17 +5122,6 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; משכפל שם תפקיד קודם וינוטרל.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>שאילתא לא תקינה: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>אין אפשרות לקרוא נתוני תמונה</translation>
@@ -6207,7 +6146,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>עבור אל שורה</translation>
@@ -6384,7 +6323,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>שם</translation>
     </message>
@@ -9143,7 +9082,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">‏%1 כבר קיים.
@@ -9379,7 +9318,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11979,7 +11918,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11987,7 +11926,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12075,7 +12014,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">שם</translation>
     </message>
@@ -12883,7 +12822,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14599,7 +14538,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14769,7 +14708,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14982,7 +14921,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_hu.ts b/translations/qt_hu.ts
index ec9936c..e1e928e 100644 (file)
--- a/translations/qt_hu.ts
+++ b/translations/qt_hu.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -652,7 +652,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1155,7 +1155,7 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+554"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+555"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1163,8 +1163,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>A kiszolgáló nem található</translation>
@@ -1182,7 +1182,7 @@
         <translation>A kapcsolat várakozási ideje lejárt</translation>
     </message>
     <message>
-        <location line="+716"/>
+        <location line="+702"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Socket művelet időtúllépés</translation>
@@ -1524,7 +1524,7 @@
         <translation>Nem lehet animálni a csak olvasható &quot;%1&quot; tulajdonsággal</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Az Animation absztrakt osztály</translation>
     </message>
@@ -1652,13 +1652,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Érvénytelen tulajdonság-hozzárendelés: &quot;%1&quot; egy csak olvasható tulajdonság</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Érvénytelen tulajdonság-hozzárendelés: ismeretlen felsorolás</translation>
     </message>
@@ -1939,7 +1939,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translatorcomment>CHECKIT</translatorcomment>
         <translation type="unfinished">Dupla alapértelmezett tulajdonság</translation>
@@ -2106,40 +2106,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>Az executeSql a transaction()-on kívülről lett meghívva</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Csak olvasható tranzakció</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Verzió eltérés: várt: %1, kapott: %2</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>Az SQL tranzakció sikertelen</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>tranzakció: hiányzó callback</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: adatbázis verzió eltérés</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2260,7 +2226,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: a(z) %1 index túl nagy</translation>
     </message>
@@ -2658,29 +2624,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2801,7 +2751,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2854,7 +2804,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,7 +3385,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+860"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+858"/>
         <source>Invalid filename</source>
         <translation>Érvénytelen fájlnév</translation>
     </message>
@@ -4120,8 +4070,8 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Hozzáférés megtagadva</translation>
     </message>
@@ -4979,7 +4929,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Nincs megfelelő proxy</translation>
     </message>
@@ -4987,7 +4937,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>A hozzáférés a hálózathoz le van tiltva.</translation>
     </message>
@@ -4995,13 +4945,13 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Hiba %1 letöltésekor - a szerver válasza: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Ismeretlen protokoll: &quot;%1&quot;</translation>
     </message>
@@ -5018,7 +4968,7 @@ Biztosan törölni akarja?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Ideiglenes hálózati hiba.</translation>
     </message>
@@ -5035,7 +4985,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Érvénytelen konfiguráció.</translation>
     </message>
@@ -5176,18 +5126,6 @@ Biztosan törölni akarja?</translation>
         <translation type="unfinished">Saját könyvtár</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translatorcomment>CHECKIT: role == ?</translatorcomment>
-        <translation>A(z) &quot;%1&quot; neve ütközik egy, már létező szabály nevével, így le lesz tiltva.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>érvénytelen lekérdezés: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6208,7 +6146,7 @@ Válasszon másik fájlnevet.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Sorra ugrás</translation>
@@ -6385,7 +6323,7 @@ Válasszon másik fájlnevet.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
@@ -9153,7 +9091,7 @@ Válasszon másik fájlnevet.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 már létezik.
@@ -9389,7 +9327,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11988,7 +11926,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11996,7 +11934,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12084,7 +12022,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -12887,7 +12825,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14602,7 +14540,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14772,7 +14710,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14985,7 +14923,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts
index f1ada41..9e3f363 100644 (file)
--- a/translations/qt_ja.ts
+++ b/translations/qt_ja.ts
@@ -177,7 +177,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -188,7 +188,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -230,18 +230,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -653,7 +653,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1156,9 +1156,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>ホストが見つかりません</translation>
@@ -1184,7 +1184,7 @@
         <translation>このソケットへのこの操作はサポートされていません</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>ソケット操作がタイムアウトしました</translation>
@@ -1526,7 +1526,7 @@
         <translation>読込専用のプロパティ &quot;%1&quot; はアニメーションできません</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animation は抽象クラスです</translation>
     </message>
@@ -1654,13 +1654,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>無効なプロパティの値: &quot;%1&quot; は読込専用のプロパティです</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>無効なプロパティの値: 未知の列挙型です</translation>
     </message>
@@ -1940,7 +1940,7 @@
         <translation>&quot;%1&quot; は &quot;%2&quot; を操作できません</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>デフォルトプロパティが重複しています</translation>
     </message>
@@ -2103,40 +2103,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>transaction() の外部から executeSql が呼び出されました</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="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>トランザクション: コールバックが欠けています</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: データーベースのバージョンが一致しません</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2257,7 +2223,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: インデックス %1 は有効範囲外の値です</translation>
     </message>
@@ -2655,29 +2621,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt は xmlpatterns のサポートを外してビルドされています</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>XmlRorl のクエリーを &apos;/&apos; で始めてはいけません</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>XmlListModel のクエリーは &apos;/&apos; か &quot;//&quot; で始まる必要があります</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2798,7 +2748,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2851,7 +2801,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3432,7 +3382,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+925"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+923"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
@@ -4117,8 +4067,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>許可されていません</translation>
     </message>
@@ -4977,7 +4927,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>適切なプロキシーがみつかりません</translation>
     </message>
@@ -4985,7 +4935,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>ネットワークへのアクセスが禁止されています。</translation>
     </message>
@@ -4993,13 +4943,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>%1 をダウンロード中にエラーが発生しました。サーバの返答: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>プロトコル &quot;%1&quot; はサポートされていません</translation>
     </message>
@@ -5015,7 +4965,7 @@ Do you want to delete it anyway?</source>
         <translation>バックエンド開始時のエラー。</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>一時的なネットワークの失敗。</translation>
     </message>
@@ -5032,7 +4982,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>無効な設定です。</translation>
     </message>
@@ -5168,17 +5118,6 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; で直前のロール名を複製し、無効化されます。</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>無効なクエリー: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+171"/>
         <source>Home</source>
         <translation type="unfinished">Home</translation>
@@ -6204,7 +6143,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>指定した行へ移動</translation>
@@ -6381,7 +6320,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
@@ -9144,7 +9083,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 はすでに存在します。
@@ -9380,7 +9319,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11977,7 +11916,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11985,7 +11924,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12073,7 +12012,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -12876,7 +12815,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14591,7 +14530,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14761,7 +14700,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14974,7 +14913,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_ko.ts b/translations/qt_ko.ts
index da96143..9c02d1d 100644 (file)
--- a/translations/qt_ko.ts
+++ b/translations/qt_ko.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -652,7 +652,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1155,13 +1155,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>소켓 작업 시간 초과</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1169,8 +1169,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>호스트를 찾을 수 없음</translation>
@@ -1188,7 +1188,7 @@
         <translation>연결 시간 초과됨</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>소켓이 연결되지 않음</translation>
     </message>
@@ -1524,7 +1524,7 @@
         <translation>읽기 전용 속성 &quot;%1&quot;에 애니메이션을 설정할 수 없음</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>애니메이션이 추상 클래스임</translation>
     </message>
@@ -1652,13 +1652,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>잘못된 속성 대입: &quot;%1&quot;은(는) 읽기 전용 속성</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>잘못된 속성 대입: 알 수 없는 열거형</translation>
     </message>
@@ -1938,7 +1938,7 @@
         <translation>&quot;%1&quot;은(는) &quot;%2&quot;에서 작동할 수 없음</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>중복된 기본 속성</translation>
     </message>
@@ -2101,40 +2101,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>transaction() 밖에서 executeSql이 호출됨</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>버전 불일치: 사용 중인 버전 %2, 필요한 버전 %1</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>SQL 트랜잭션 실패</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>트랜잭션: 콜백이 없음</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: 데이터베이스 버전 불일치</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2255,7 +2221,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: 인덱스 %1이(가) 범위를 벗어남</translation>
     </message>
@@ -2653,29 +2619,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt 빌드에 xmlpatterns 지원이 빠졌음</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished">XmlRole 쿼리는 &apos;/&apos;로 시작하면 안 됨</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>XmlListModel 쿼리는 &apos;/&apos;나 &apos;//&apos;로 시작해야 함</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2796,7 +2746,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2849,7 +2799,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3431,7 +3381,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4115,8 +4065,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>권한이 거부됨</translation>
     </message>
@@ -4974,7 +4924,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>적합한 프록시를 찾을 수 없음</translation>
     </message>
@@ -4982,7 +4932,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>네트워크 접근이 비활성화되었습니다.</translation>
     </message>
@@ -4990,13 +4940,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>%1을(를) 다운로드하는 중 오류 발생 - 서버 응답: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>알 수 없는 프로토콜 &quot;%1&quot;</translation>
     </message>
@@ -5012,7 +4962,7 @@ Do you want to delete it anyway?</source>
         <translation>백엔드 시작 오류.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>일시적인 네트워크 실패.</translation>
     </message>
@@ -5029,7 +4979,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>설정이 잘못되었습니다.</translation>
     </message>
@@ -5165,17 +5115,6 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot;이(가) 이전 역할 이름과 중복되므로 비활성화될 것입니다.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>잘못된 쿼리: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+171"/>
         <source>Home</source>
         <translation type="unfinished">Home</translation>
@@ -6200,7 +6139,7 @@ Do you want to overwrite it?</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>줄로 가기</translation>
@@ -6377,7 +6316,7 @@ Do you want to overwrite it?</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
@@ -9134,7 +9073,7 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1이(가) 이미 존재합니다.
@@ -9370,7 +9309,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11967,7 +11906,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11975,7 +11914,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12063,7 +12002,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -12866,7 +12805,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14581,7 +14520,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14751,7 +14690,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14964,7 +14903,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_lt.ts b/translations/qt_lt.ts
index 659f161..dcb6f03 100644 (file)
--- a/translations/qt_lt.ts
+++ b/translations/qt_lt.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,7 +660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,13 +1163,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Baigėsi operacijai su lizdu skirtas laikas</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1177,8 +1177,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Mazgas nerastas</translation>
@@ -1196,7 +1196,7 @@
         <translation>Baigėsi ryšiui skirtas laikas</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>Lizdas neprijungtas</translation>
     </message>
@@ -1532,7 +1532,7 @@
         <translation>Negalima animuoti tik skaitymui skirtos savybės „%1“</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>„Animation“ yra abstrakčioji klasė</translation>
     </message>
@@ -1660,13 +1660,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1946,7 +1946,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2109,40 +2109,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2263,7 +2229,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2661,29 +2627,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>„Qt“ sukompiliuota be „xmlpatterns“ palaikymo</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>„XmlRole“ užklausa negali prasidėti simboliu „/“</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>„XmlListModel“ užklausa negali prasidėti simboliu „/“ arba „//“</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2804,7 +2754,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2857,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,7 +3389,7 @@ Ar vis tiek norite jį pašalinti?</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4123,8 +4073,8 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Nepakanka teisių</translation>
     </message>
@@ -4982,7 +4932,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Nerastas tinkamas įgaliotasis serveris</translation>
     </message>
@@ -4990,7 +4940,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Prieiga prie tinklo išjungta.</translation>
     </message>
@@ -4998,13 +4948,13 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Klaida parsiunčiant %1. Serveris atsakė: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Protokolas „%1“ nežinomas</translation>
     </message>
@@ -5020,7 +4970,7 @@ Ar vis tiek norite jį pašalinti?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Laikina problema su tinklu.</translation>
     </message>
@@ -5037,7 +4987,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Neleistina sąranka.</translation>
     </message>
@@ -5173,17 +5123,6 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>„%1“ dubliuoja ankstesnės rolės vardą, todėl bus išjungtas.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>netinkama užklausa: „%1“</translation>
-    </message>
-    <message>
         <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+171"/>
         <source>Home</source>
         <translation type="unfinished">Prad</translation>
@@ -6208,7 +6147,7 @@ Ar norite jį perrašyti?</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Eiti į eilutę</translation>
@@ -6385,7 +6324,7 @@ Ar norite jį perrašyti?</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Vardas</translation>
     </message>
@@ -9142,7 +9081,7 @@ Ar norite jį perrašyti?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 jau egzistuoja.
@@ -9378,7 +9317,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11979,7 +11918,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11987,7 +11926,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12075,7 +12014,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Vardas</translation>
     </message>
@@ -12888,7 +12827,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14605,7 +14544,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14775,7 +14714,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14988,7 +14927,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index 06bbd1f..346bf31 100644 (file)
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,7 +660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,9 +1163,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+962"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+690"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+694"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+963"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+678"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+682"/>
         <source>Connection refused</source>
         <translation>Połączenie odrzucone</translation>
     </message>
@@ -1190,7 +1190,7 @@
         <translation>Operacja na gnieździe nie jest obsługiwana</translation>
     </message>
     <message>
-        <location line="+656"/>
+        <location line="+642"/>
         <source>Socket is not connected</source>
         <translation>Gniazdo nie jest podłączone</translation>
     </message>
@@ -1532,7 +1532,7 @@
         <translation>Nie można animować właściwości (tylko do odczytu): &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>&quot;Animation&quot; jest klasą abstrakcyjną</translation>
     </message>
@@ -1660,13 +1660,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Niepoprawne przypisanie wartości: &quot;%1&quot; jest właściwością tylko do odczytu</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Niepoprawne przypisanie wartości: nieznana wartość wyliczeniowa</translation>
     </message>
@@ -1946,7 +1946,7 @@
         <translation>&quot;%1&quot; nie może operować na &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Powielona domyślna właściwość</translation>
     </message>
@@ -2109,40 +2109,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>&quot;executeSql&quot; zawołane na zewnątrz &quot;transation()&quot;</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Transakcja tylko do odczytu</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Niezgodność wersji: oczekiwano %1, znaleziono %2</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>Transakcja SQL zakończona błędem</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>transakcja: brak wywołania zwrotnego</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: niezgodność wersji bazy danych</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2263,7 +2229,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: indeks %1 poza zakresem</translation>
     </message>
@@ -2661,29 +2627,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt zostało zbudowane bez obsługi xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Zapytanie XmlRole nie może rozpoczynać się od &quot;/&quot;</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Zapytanie XmlListModel nie może rozpoczynać się od &quot;/&quot; ani od &quot;//&quot;</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2804,7 +2754,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2857,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,7 +3389,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4125,8 +4075,8 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2124"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+121"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2102"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+100"/>
         <source>No space left on device</source>
         <translation>Brak wolnego miejsca na urządzeniu</translation>
     </message>
@@ -4984,7 +4934,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Nie odnaleziono odpowiedniego pośrednika</translation>
     </message>
@@ -4992,7 +4942,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Dostęp do sieci wyłączony.</translation>
     </message>
@@ -5000,13 +4950,13 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Błąd podczas pobierania %1 - odpowiedź serwera: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Protokół &quot;%1&quot; nie jest znany</translation>
     </message>
@@ -5022,7 +4972,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Chwilowy błąd w sieci.</translation>
     </message>
@@ -5039,7 +4989,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Niepoprawna konfiguracja.</translation>
     </message>
@@ -5175,17 +5125,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; powiela poprzednią nazwę roli i zostanie wyłączone.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>Niepoprawne zapytanie: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Nie można odczytać danych obrazu</translation>
@@ -6210,7 +6149,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Przejdź do linii</translation>
@@ -6387,7 +6326,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
@@ -9144,7 +9083,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 już istnieje.
@@ -9380,7 +9319,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11982,7 +11921,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11990,7 +11929,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12078,7 +12017,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Nazwa</translation>
     </message>
@@ -12891,7 +12830,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14608,7 +14547,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14778,7 +14717,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14991,7 +14930,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts
index 6f8542b..70cfb92 100644 (file)
--- a/translations/qt_pt.ts
+++ b/translations/qt_pt.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,7 +656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,9 +1159,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Máquina desconhecida</translation>
@@ -1186,7 +1186,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Operação de &apos;socket&apos; expirada</translation>
@@ -1528,7 +1528,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,13 +1656,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1942,7 +1942,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2105,40 +2105,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2259,7 +2225,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2657,29 +2623,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2800,7 +2750,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2853,7 +2803,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,7 +3385,7 @@ Deseja apagar de qualquer forma?</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4119,8 +4069,8 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Permissão negada</translation>
     </message>
@@ -4978,7 +4928,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4986,7 +4936,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4994,13 +4944,13 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5016,7 +4966,7 @@ Deseja apagar de qualquer forma?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5033,7 +4983,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5174,17 +5124,6 @@ Deseja apagar de qualquer forma?</translation>
         <translation>Início</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6203,7 +6142,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6380,7 +6319,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -9137,7 +9076,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 já existe.
@@ -9373,7 +9312,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11972,7 +11911,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11980,7 +11919,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12068,7 +12007,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -12876,7 +12815,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14592,7 +14531,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14762,7 +14701,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14975,7 +14914,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index 2a09502..b9b1abc 100644 (file)
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,7 +660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,9 +1163,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Узел не найден</translation>
@@ -1190,7 +1190,7 @@
         <translation>Операция с сокетом не поддерживается</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Время на операцию с сокетом истекло</translation>
@@ -1532,7 +1532,7 @@
         <translation>Невозможно анимировать свойство только для чтения «%1»</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animation - это абстрактный класс</translation>
     </message>
@@ -1660,13 +1660,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Некорректное присваивание свойства: «%1» свойство только для чтения</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Некорректное присваивание свойства: неизвестное перечисление</translation>
     </message>
@@ -1947,7 +1947,7 @@
         <translation>«%1» не может воздействовать на «%2»</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Дублирование свойства по умолчанию</translation>
     </message>
@@ -2110,40 +2110,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <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="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>транзакция: отсутствует обратный вызов</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>Не совпадает версия базы данных SQL</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2264,7 +2230,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: индекс %1 вне диапазона</translation>
     </message>
@@ -2662,29 +2628,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt было собрано без поддержки xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Запрос XmlRole не должен начинаться с «/»</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Запрос XmlListModel должен начинаться с «/» или «//»</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2805,7 +2755,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2858,7 +2808,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3440,7 +3390,7 @@ Please verify the correct directory name was given.</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 Тб</translation>
     </message>
@@ -4124,8 +4074,8 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Доступ запрещён</translation>
     </message>
@@ -4983,7 +4933,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Подходящий прокси-сервер не найден</translation>
     </message>
@@ -4991,7 +4941,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Доступ в сеть отключён.</translation>
     </message>
@@ -4999,13 +4949,13 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Ошибка загрузки %1 - ответ сервера: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Неизвестный протокол «%1»</translation>
     </message>
@@ -5021,7 +4971,7 @@ Please verify the correct directory name was given.</source>
         <translation>ошибка запуска драйвера.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Временная ошибка сети.</translation>
     </message>
@@ -5038,7 +4988,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Некорректная конфигурация.</translation>
     </message>
@@ -5175,17 +5125,6 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>«%1» повторяет имя предыдущей роли и не будет использовано.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>Некорректный запрос: «%1»</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Не удалось прочитать данные изображения</translation>
@@ -6210,7 +6149,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Перейти к строке</translation>
@@ -6387,7 +6326,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
@@ -9144,7 +9083,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 уже существует.
@@ -9380,7 +9319,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11981,7 +11920,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11989,7 +11928,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12077,7 +12016,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12890,7 +12829,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14607,7 +14546,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14777,7 +14716,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14990,7 +14929,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts
index c88d537..c6090c2 100644 (file)
--- a/translations/qt_sk.ts
+++ b/translations/qt_sk.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,7 +660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,13 +1163,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Prekročenie času pri práci so soketom</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1177,8 +1177,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Hostiteľ nebol nájdený</translation>
@@ -1196,7 +1196,7 @@
         <translation>Časový limit pre spojenie vypršal</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>Socket nie je pripojený</translation>
     </message>
@@ -1532,7 +1532,7 @@
         <translation>Nie je možné animovať iba-na-čítanie vlastnosť &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animácia je abstraktná trieda</translation>
     </message>
@@ -1660,13 +1660,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Neplatné priradenie vlastnosti:  &quot;%1&quot; je vlastnosť iba na čítanie</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Neplatné priradenie vlastnosti: neznáme číselné vymenovanie (enumeration)</translation>
     </message>
@@ -1946,7 +1946,7 @@
         <translation>&quot;%1&quot; nie je možné použiť na &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Duplikovaná prednastavená vlastnosť</translation>
     </message>
@@ -2109,40 +2109,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>&apos;executeSql&apos; bol zavolaný mimo &apos;transaction()&apos;</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Transakcie iba na čítanie</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Chyba verzie: očakáva sa %1, nájdená %2</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>SQL transakcia zlyhala</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>transakcia: chýba spätné volanie (callback)</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: nesúhlasí verzia databázy</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2263,7 +2229,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: index %1 je mimo rozsahu</translation>
     </message>
@@ -2661,29 +2627,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt bolo zostavené bez podpory pre xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>XmlRole požiadavka nesmie začínať s &apos;/&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>XmlListModel požiadavka musí začínať s &apos;/&apos; alebo &apos;//&apos;</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2804,7 +2754,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2857,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,7 +3389,7 @@ Chcete ho aj tak zmazať?</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4123,8 +4073,8 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Prístup zamietnutý</translation>
     </message>
@@ -4982,7 +4932,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Nepodarilo sa nájsť vhodný proxy server</translation>
     </message>
@@ -4990,7 +4940,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Prístup na sieť je zakázaný.</translation>
     </message>
@@ -4998,13 +4948,13 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Chyba pri sťahovaní %1 - server odpovedal: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Protokol &quot;%1&quot; je neznámy</translation>
     </message>
@@ -5020,7 +4970,7 @@ Chcete ho aj tak zmazať?</translation>
         <translation>chyba spustenia backendu.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Dočasné zlyhanie siete.</translation>
     </message>
@@ -5037,7 +4987,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Neplatná konfigurácia.</translation>
     </message>
@@ -5173,17 +5123,6 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; je už zadaný ako názov predchádzajúcej roly a bude blokovaný.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>neplatný dopyt: &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Nepodarilo sa prečítať obrázkové dáta</translation>
@@ -6208,7 +6147,7 @@ Má sa prepísať?</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Prejsť na riadok</translation>
@@ -6385,7 +6324,7 @@ Má sa prepísať?</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Názov</translation>
     </message>
@@ -9142,7 +9081,7 @@ Má sa prepísať?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 už existuje.
@@ -9378,7 +9317,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11979,7 +11918,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11987,7 +11926,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12075,7 +12014,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Názov</translation>
     </message>
@@ -12888,7 +12827,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14605,7 +14544,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14775,7 +14714,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14988,7 +14927,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_sl.ts b/translations/qt_sl.ts
index 2d9382b..fde7467 100644 (file)
--- a/translations/qt_sl.ts
+++ b/translations/qt_sl.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -664,7 +664,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1167,9 +1167,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Ni moč najti gostitelja</translation>
@@ -1194,7 +1194,7 @@
         <translation>Dejanje na vtičnici ni podprto</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Čas za dejanje na vtičnici je potekel</translation>
@@ -1536,7 +1536,7 @@
         <translation>Lastnosti »%1«, ki je samo za branje, ni moč animirati</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animacija je abstrakten razred</translation>
     </message>
@@ -1664,13 +1664,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Neveljavna prireditev lastnosti: »%1« je lastnost, ki je samo za branje</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Neveljavna prireditev lastnosti: neznano oštevilčenje</translation>
     </message>
@@ -1950,7 +1950,7 @@
         <translation>»%1« ne more delovati na »%2«</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Podvojena privzeta lastnost</translation>
     </message>
@@ -2113,40 +2113,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation>executeSql je bil klican izven transaction()</translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation>Transakcija samo za branje</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation>Neujemanje različic: pričakovana %1, najdena %2</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation>Transakcija SQL ni uspela</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>transaction: manjka povratni klic</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: neujemanje različice podatkovne zbirke</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2267,7 +2233,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: indeks %1 je izven obsega</translation>
     </message>
@@ -2665,29 +2631,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt je bil zgrajen brez podpore za xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Poizvedba XmlRole se ne sme začeti z »/«</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Poizvedba XmlListModel se mora začeti z »/« ali »//«</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2808,7 +2758,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2861,7 +2811,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3442,7 +3392,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+860"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+858"/>
         <source>Invalid filename</source>
         <translation>Napačno ime datoteke</translation>
     </message>
@@ -4127,8 +4077,8 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Nimate dovoljenja</translation>
     </message>
@@ -4986,7 +4936,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Najden ni bil noben primeren posrednik</translation>
     </message>
@@ -4994,7 +4944,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Omrežni dostop je onemogočen.</translation>
     </message>
@@ -5002,13 +4952,13 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <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="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Neznan protokol »%1«</translation>
     </message>
@@ -5024,7 +4974,7 @@ Ali jo kljub temu želite izbrisati?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Začasna omrežna napaka.</translation>
     </message>
@@ -5041,7 +4991,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Neveljavna nastavitev.</translation>
     </message>
@@ -5177,17 +5127,6 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>»%1« podvaja obstoječe ime vloge in bo onemogočena.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>neveljavna poizvedba: »%1«</translation>
-    </message>
-    <message>
         <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+171"/>
         <source>Home</source>
         <translation type="unfinished">Začetek</translation>
@@ -6212,7 +6151,7 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Pojdi v vrstico</translation>
@@ -6389,7 +6328,7 @@ Izberite drugo ime datoteke.</translation>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
@@ -9146,7 +9085,7 @@ Izberite drugo ime datoteke.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 že obstaja.
@@ -9382,7 +9321,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11985,7 +11924,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11993,7 +11932,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12081,7 +12020,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -12899,7 +12838,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14617,7 +14556,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14787,7 +14726,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15000,7 +14939,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts
index 1277f63..38e2493 100644 (file)
--- a/translations/qt_sv.ts
+++ b/translations/qt_sv.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -652,7 +652,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1155,9 +1155,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Värden hittades inte</translation>
@@ -1182,7 +1182,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Tidsgräns för uttagsåtgärd överstegs</translation>
@@ -1524,7 +1524,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1652,13 +1652,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,7 +1938,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,40 +2101,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2255,7 +2221,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,29 +2619,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2796,7 +2746,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2849,7 +2799,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3431,7 +3381,7 @@ Vill du ta bort den ändå?</translation>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4115,8 +4065,8 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Åtkomst nekad</translation>
     </message>
@@ -4974,7 +4924,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4982,7 +4932,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4990,13 +4940,13 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5012,7 +4962,7 @@ Vill du ta bort den ändå?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5029,7 +4979,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5170,17 +5120,6 @@ Vill du ta bort den ändå?</translation>
         <translation type="unfinished">Home</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6199,7 +6138,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6376,7 +6315,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -9133,7 +9072,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 finns redan. 
@@ -9369,7 +9308,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11966,7 +11905,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11974,7 +11913,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12062,7 +12001,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -12865,7 +12804,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14580,7 +14519,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14750,7 +14689,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14963,7 +14902,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_tools_CN.ts b/translations/qt_tools_CN.ts
index 3d43b84..18683bb 100644 (file)
--- a/translations/qt_tools_CN.ts
+++ b/translations/qt_tools_CN.ts
@@ -333,9 +333,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -428,14 +544,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -448,7 +562,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -473,8 +586,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,98 +600,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -627,7 +649,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_TW.ts b/translations/qt_tools_TW.ts
index d9a2519..ad1734d 100644 (file)
--- a/translations/qt_tools_TW.ts
+++ b/translations/qt_tools_TW.ts
@@ -333,9 +333,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -428,14 +544,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -448,7 +562,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -473,8 +586,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,98 +600,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -627,7 +649,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_cs.ts b/translations/qt_tools_cs.ts
index 18905d8..054259c 100644 (file)
--- a/translations/qt_tools_cs.ts
+++ b/translations/qt_tools_cs.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -638,7 +660,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_de.ts b/translations/qt_tools_de.ts
index 1f3a74a..187a289 100644 (file)
--- a/translations/qt_tools_de.ts
+++ b/translations/qt_tools_de.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -632,7 +654,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_eu.ts b/translations/qt_tools_eu.ts
index 9308eb9..1d181e7 100644 (file)
--- a/translations/qt_tools_eu.ts
+++ b/translations/qt_tools_eu.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -632,7 +654,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_fr.ts b/translations/qt_tools_fr.ts
index 188313b..936e8bb 100644 (file)
--- a/translations/qt_tools_fr.ts
+++ b/translations/qt_tools_fr.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -626,7 +648,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_he.ts b/translations/qt_tools_he.ts
index f470451..bb1f5ec 100644 (file)
--- a/translations/qt_tools_he.ts
+++ b/translations/qt_tools_he.ts
@@ -333,9 +333,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -428,14 +544,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -448,7 +562,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -473,8 +586,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,98 +600,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -633,7 +655,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_hu.ts b/translations/qt_tools_hu.ts
index 1793352..9d40584 100644 (file)
--- a/translations/qt_tools_hu.ts
+++ b/translations/qt_tools_hu.ts
@@ -333,9 +333,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -428,14 +544,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -448,7 +562,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -473,8 +586,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,98 +600,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -627,7 +649,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_ja.ts b/translations/qt_tools_ja.ts
index ab3bd99..9c71f64 100644 (file)
--- a/translations/qt_tools_ja.ts
+++ b/translations/qt_tools_ja.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -626,7 +648,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_ko.ts b/translations/qt_tools_ko.ts
index 9f08bb4..bdce6bb 100644 (file)
--- a/translations/qt_tools_ko.ts
+++ b/translations/qt_tools_ko.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -626,7 +648,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_pl.ts b/translations/qt_tools_pl.ts
index bf40e78..0fc8985 100644 (file)
--- a/translations/qt_tools_pl.ts
+++ b/translations/qt_tools_pl.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -638,7 +660,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_ru.ts b/translations/qt_tools_ru.ts
index ab7c307..927edab 100644 (file)
--- a/translations/qt_tools_ru.ts
+++ b/translations/qt_tools_ru.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -638,7 +660,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_sl.ts b/translations/qt_tools_sl.ts
index 16e16eb..00a0d06 100644 (file)
--- a/translations/qt_tools_sl.ts
+++ b/translations/qt_tools_sl.ts
@@ -332,9 +332,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -427,14 +543,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -447,7 +561,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -472,8 +585,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,98 +599,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -644,7 +666,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_tools_uk.ts b/translations/qt_tools_uk.ts
index 2c4233e..a0cab9c 100644 (file)
--- a/translations/qt_tools_uk.ts
+++ b/translations/qt_tools_uk.ts
@@ -333,9 +333,125 @@ Options:
     </message>
 </context>
 <context>
+    <name>LU</name>
+    <message>
+        <location filename="../src/tools/lupdate/qscript.cpp" line="+1503"/>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <location line="+23"/>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+21"/>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LUpdate</name>
     <message>
-        <location filename="../src/tools/lupdate/cpp.cpp" line="+638"/>
+        <location filename="../src/tools/lupdate/cpp.cpp" line="+630"/>
         <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
 </source>
         <translation type="unfinished"></translation>
@@ -428,14 +544,12 @@ Options:
     </message>
     <message>
         <location line="+67"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+2539"/>
         <source>Unexpected character in meta string
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+6"/>
         <source>Unterminated meta string
 </source>
         <translation type="unfinished"></translation>
@@ -448,7 +562,6 @@ Options:
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-126"/>
         <source>Discarding unconsumed meta data
 </source>
         <translation type="unfinished"></translation>
@@ -473,8 +586,7 @@ Options:
     </message>
     <message>
         <location line="+62"/>
-        <location filename="../src/tools/lupdate/ui.cpp" line="+188"/>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="+178"/>
+        <location filename="../src/tools/lupdate/ui.cpp" line="+184"/>
         <source>Cannot open %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,98 +600,8 @@ Options:
         <source>Parse error in UI file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/tools/lupdate/qscript.cpp" line="-1089"/>
-        <source>Illegal character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Unclosed string at end of line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Illegal escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>Illegal unicode escape sequence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Unclosed comment at end of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+319"/>
-        <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <location line="+23"/>
-        <source>//% cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>%1() requires at least two arguments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>%1(): both arguments must be literal strings.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+21"/>
-        <source>%1() requires at least one argument.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-18"/>
-        <source>%1(): text to translate must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>//= cannot be used with %1(). Ignoring
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>%1(): identifier must be a literal string.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+133"/>
-        <source>Expected </source>
-        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/tools/lupdate/merge.cpp" line="+494"/>
+        <location filename="../src/tools/lupdate/merge.cpp" line="+490"/>
         <source>    Found %n source text(s) (%1 new and %2 already existing)
 </source>
         <translation type="unfinished">
@@ -639,7 +661,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="+86"/>
         <source>Usage:
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 

diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts
index 5f6f7cf..64a9060 100644 (file)
--- a/translations/qt_uk.ts
+++ b/translations/qt_uk.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,7 +660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,13 +1163,13 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1820"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+1807"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Час на операцію з сокетом вичерпано</translation>
     </message>
     <message>
-        <location line="-1266"/>
+        <location line="-1252"/>
         <location line="+822"/>
         <location line="+225"/>
         <source>Operation on socket is not supported</source>
@@ -1177,8 +1177,8 @@
     </message>
     <message>
         <location line="-686"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>Вузол не знайдено</translation>
@@ -1196,7 +1196,7 @@
         <translation>Час на з’єднання вичерпано</translation>
     </message>
     <message>
-        <location line="+1153"/>
+        <location line="+1139"/>
         <source>Socket is not connected</source>
         <translation>Сокет не під’єднано</translation>
     </message>
@@ -1532,7 +1532,7 @@
         <translation>Неможливо анімувати властивість лише для читання &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation>Animation - це абстрактний клас</translation>
     </message>
@@ -1660,13 +1660,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation>Неправильне присвоєння властивості: властивість &quot;%1&quot; лише для читання</translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation>Неправильне присвоєння властивості: невідомий перелік</translation>
     </message>
@@ -1946,7 +1946,7 @@
         <translation>&quot;%1&quot; не може оперувати над &quot;%2&quot;</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation>Дубльована типова властивість</translation>
     </message>
@@ -2109,40 +2109,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <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="+23"/>
-        <source>transaction: missing callback</source>
-        <translation>транзакція: відсутній зворотній виклик</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation>SQL: розбіжність версій бази даних</translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2263,7 +2229,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation>remove: індекс %1 поза межами діапазону</translation>
     </message>
@@ -2661,29 +2627,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Бібліотека Qt була зібрана без підтримки xmlpatterns</translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation>Запит XmlRole не повинен починатись з &apos;/&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation>Запит XmlListModel не повинен починатись з &apos;/&apos; або &quot;//&quot;</translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2804,7 +2754,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2857,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,7 +3389,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 Тб</translation>
     </message>
@@ -4123,8 +4073,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>Доступ заборонено</translation>
     </message>
@@ -4982,7 +4932,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>Не знайдено придатного проксі-сервера</translation>
     </message>
@@ -4990,7 +4940,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation>Доступ до мережі вимкнено.</translation>
     </message>
@@ -4998,13 +4948,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Помилка звантаження %1 - сервер відповів: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Невідомий протокол &quot;%1&quot;</translation>
     </message>
@@ -5020,7 +4970,7 @@ Do you want to delete it anyway?</source>
         <translation>помилка запуску драйвера.</translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation>Тимчасовий збій мережі.</translation>
     </message>
@@ -5037,7 +4987,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation>Неправильні налаштування.</translation>
     </message>
@@ -5173,17 +5123,6 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation>&quot;%1&quot; повторює назву попередньої ролі та буде вимкнене.</translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation>неправильний запит &quot;%1&quot;</translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation>Не вдалося прочитати дані зображення</translation>
@@ -6208,7 +6147,7 @@ Do you want to overwrite it?</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation>Перейти до рядка</translation>
@@ -6385,7 +6324,7 @@ Do you want to overwrite it?</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
@@ -9142,7 +9081,7 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 вже існує.
@@ -9378,7 +9317,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11979,7 +11918,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11987,7 +11926,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12075,7 +12014,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12888,7 +12827,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14605,7 +14544,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14775,7 +14714,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14988,7 +14927,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts
index 9d8f9b1..181589a 100644 (file)
--- a/translations/qt_zh_CN.ts
+++ b/translations/qt_zh_CN.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -652,7 +652,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1155,9 +1155,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>主机未找到</translation>
@@ -1182,7 +1182,7 @@
         <translation>Socket操作不被支持</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>套接字操作超时</translation>
@@ -1524,7 +1524,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1652,13 +1652,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,7 +1938,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,40 +2101,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2255,7 +2221,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,29 +2619,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2796,7 +2746,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2849,7 +2799,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3431,7 +3381,7 @@ Do you want to delete it anyway?</source>
     <name>QFileSystemModel</name>
     <message>
         <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+482"/>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+763"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+761"/>
         <source>%1 TB</source>
         <translation>%1 TB</translation>
     </message>
@@ -4115,8 +4065,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>权限被拒绝</translation>
     </message>
@@ -4974,7 +4924,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>未找到合适的代理</translation>
     </message>
@@ -4982,7 +4932,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4990,13 +4940,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>下载 %1 错误 - 服务器回复：%2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>协议“%1”是未知的</translation>
     </message>
@@ -5012,7 +4962,7 @@ Do you want to delete it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5029,7 +4979,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5170,17 +5120,6 @@ Do you want to delete it anyway?</source>
         <translation>家</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6200,7 +6139,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6377,7 +6316,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -9134,7 +9073,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1已经存在。
@@ -9370,7 +9309,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11967,7 +11906,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11975,7 +11914,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12063,7 +12002,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -12866,7 +12805,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14581,7 +14520,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14751,7 +14690,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14964,7 +14903,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts
index 212b2a4..d35a6e1 100644 (file)
--- a/translations/qt_zh_TW.ts
+++ b/translations/qt_zh_TW.ts
@@ -176,7 +176,7 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1195"/>
+        <location filename="../src/designer/shared/qdesigner_menu.cpp" line="+1193"/>
         <source>Set action text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+914"/>
+        <location filename="../src/designer/shared/qdesigner_menubar.cpp" line="+910"/>
         <source>Move action</source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,18 +229,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/morphmenu.cpp" line="+350"/>
+        <location filename="../src/designer/shared/morphmenu.cpp" line="+349"/>
         <source>Morph %1/&apos;%2&apos; into %3</source>
         <extracomment>MorphWidgetCommand description</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+149"/>
+        <location filename="../src/designer/shared/qdesigner_command.cpp" line="+148"/>
         <source>Insert &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+121"/>
         <source>Change Z-order of &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -652,7 +652,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+450"/>
+        <location filename="../src/designer/components/formeditor/qdesigner_resource.cpp" line="+449"/>
         <source>Qt Designer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1155,9 +1155,9 @@
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+915"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+687"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+664"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+916"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+675"/>
+        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+652"/>
         <location line="+26"/>
         <source>Host not found</source>
         <translation>找不到主機</translation>
@@ -1182,7 +1182,7 @@
         <translation>Socket 的操作未被支援</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+205"/>
         <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+698"/>
         <source>Socket operation timed out</source>
         <translation>Socket 操作逾時</translation>
@@ -1524,7 +1524,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+105"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1652,13 +1652,13 @@
         <location line="+1672"/>
         <location line="+205"/>
         <location line="+81"/>
-        <location line="+81"/>
+        <location line="+75"/>
         <location line="+594"/>
         <source>Invalid property assignment: &quot;%1&quot; is a read-only property</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2624"/>
+        <location line="-2618"/>
         <source>Invalid property assignment: unknown enumeration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,7 +1938,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+176"/>
         <source>Duplicate default property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,40 +2101,6 @@
     </message>
 </context>
 <context>
-    <name>QDeclarativeEngine</name>
-    <message>
-        <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+211"/>
-        <source>executeSql called outside transaction()</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Read-only Transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Version mismatch: expected %1, found %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>SQL transaction failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>transaction: missing callback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <location line="+15"/>
-        <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDeclarativeFlipable</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeflipable.cpp" line="+138"/>
@@ -2255,7 +2221,7 @@
 <context>
     <name>QDeclarativeListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+392"/>
+        <location filename="../src/declarative/util/qdeclarativelistmodel.cpp" line="+390"/>
         <source>remove: index %1 out of range</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,29 +2619,13 @@
 <context>
     <name>QDeclarativeXmlListModel</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+39"/>
         <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QDeclarativeXmlListModelRole</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel_p.h" line="+173"/>
-        <source>An XmlRole query must not start with &apos;/&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QDeclarativeXmlRoleList</name>
-    <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+826"/>
-        <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QDesignerFormBuilder</name>
     <message>
         <location filename="../src/designer/shared/qdesigner_formbuilder.cpp" line="+89"/>
@@ -2796,7 +2746,7 @@
 <context>
     <name>QDesignerPropertySheet</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+762"/>
+        <location filename="../src/designer/shared/qdesigner_propertysheet.cpp" line="+748"/>
         <source>Dynamic Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2849,7 +2799,7 @@ Container pages should only be added by specifying them in XML returned by the d
 <context>
     <name>QDesignerWidgetBox</name>
     <message>
-        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/>
+        <location filename="../src/designer/components/widgetbox/widgetboxtreewidget.cpp" line="+348"/>
         <source>An error has been encountered at line %1 of %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3430,7 +3380,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+860"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+858"/>
         <source>Invalid filename</source>
         <translation>不合法的檔名</translation>
     </message>
@@ -4115,8 +4065,8 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2115"/>
-        <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2093"/>
+        <location filename="../src/core/kernel/qsystemerror.cpp" line="+91"/>
         <source>Permission denied</source>
         <translation>權限不足</translation>
     </message>
@@ -4974,7 +4924,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+430"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+429"/>
         <source>No suitable proxy found</source>
         <translation>找不到合適的代理伺服器</translation>
     </message>
@@ -4982,7 +4932,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessManager</name>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1118"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+1112"/>
         <source>Network access is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4990,13 +4940,13 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+433"/>
+        <location filename="../src/network/access/qhttpthreaddelegate.cpp" line="+434"/>
         <location line="+23"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>下載 %1 時發生錯誤─伺服器回應：%2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1030"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="-1025"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>未知的協定 %1</translation>
     </message>
@@ -5012,7 +4962,7 @@ Do you want to delete it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+652"/>
+        <location line="+647"/>
         <source>Temporary network failure.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5029,7 +4979,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkSession</name>
     <message>
-        <location filename="../src/network/bearer/qnetworksession.cpp" line="+452"/>
+        <location filename="../src/network/bearer/qnetworksession.cpp" line="+453"/>
         <source>Invalid configuration.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5170,17 +5120,6 @@ Do you want to delete it anyway?</source>
         <translation>首頁</translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-245"/>
-        <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+524"/>
-        <location line="+4"/>
-        <source>invalid query: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/plugins/imageformats/tga/qtgafile.cpp" line="+136"/>
         <source>Could not read image data</source>
         <translation type="unfinished"></translation>
@@ -6200,7 +6139,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebugger</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+886"/>
+        <location filename="../src/scripttools/debugging/qscriptdebugger.cpp" line="+880"/>
         <location line="+1013"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
@@ -6377,7 +6316,7 @@ Please choose a different file name.</source>
 <context>
     <name>QScriptDebuggerLocalsModel</name>
     <message>
-        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+897"/>
+        <location filename="../src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp" line="+896"/>
         <source>Name</source>
         <translation type="unfinished">名稱</translation>
     </message>
@@ -9134,7 +9073,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+76"/>
+        <location filename="../src/designer/shared/qtresourceeditordialog.cpp" line="+74"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation type="unfinished">%1 已存在
@@ -9370,7 +9309,7 @@ to
 <context>
     <name>QtResourceView</name>
     <message>
-        <location filename="../src/designer/shared/qtresourceview.cpp" line="+567"/>
+        <location filename="../src/designer/shared/qtresourceview.cpp" line="+566"/>
         <source>Size: %1 x %2
 %3</source>
         <translation type="unfinished"></translation>
@@ -11968,7 +11907,7 @@ to
 <context>
     <name>WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+812"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="+810"/>
         <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 type="unfinished"></translation>
     </message>
@@ -11976,7 +11915,7 @@ to
 <context>
     <name>qdesigner_internal::ActionEditor</name>
     <message>
-        <location filename="../src/designer/shared/actioneditor.cpp" line="+125"/>
+        <location filename="../src/designer/shared/actioneditor.cpp" line="+124"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12064,7 +12003,7 @@ to
 <context>
     <name>qdesigner_internal::ActionModel</name>
     <message>
-        <location filename="../src/designer/shared/actionrepository.cpp" line="+89"/>
+        <location filename="../src/designer/shared/actionrepository.cpp" line="+88"/>
         <source>Name</source>
         <translation type="unfinished">名稱</translation>
     </message>
@@ -12867,7 +12806,7 @@ to
 <context>
     <name>qdesigner_internal::FormWindowBase</name>
     <message>
-        <location filename="../src/designer/shared/formwindowbase.cpp" line="+404"/>
+        <location filename="../src/designer/shared/formwindowbase.cpp" line="+393"/>
         <source>Delete &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14582,7 +14521,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::TabOrderEditor</name>
     <message>
-        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+363"/>
+        <location filename="../src/designer/components/tabordereditor/tabordereditor.cpp" line="+361"/>
         <source>Start from Here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14752,7 +14691,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::ToolBarEventFilter</name>
     <message>
-        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+148"/>
+        <location filename="../src/designer/shared/qdesigner_toolbar.cpp" line="+147"/>
         <source>Insert Separator before &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14965,7 +14904,7 @@ Class: %2</source>
 <context>
     <name>qdesigner_internal::WidgetDataBase</name>
     <message>
-        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-410"/>
+        <location filename="../src/designer/shared/widgetdatabase.cpp" line="-412"/>
         <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
         <translation type="unfinished"></translation>
     </message>