update translations

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts
index 3655325..8fcb5e7 100644 (file)
--- a/translations/qt_ar.ts
+++ b/translations/qt_ar.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2886,7 +2880,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation type="unfinished"></translation>
@@ -3335,7 +3329,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4180,7 +4174,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>موصل محليّا</translation>
     </message>

diff --git a/translations/qt_cs.ts b/translations/qt_cs.ts
index 08ae66c..ae20ebd 100644 (file)
--- a/translations/qt_cs.ts
+++ b/translations/qt_cs.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animace je abstraktní třída</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt bylo sestaveno bez podpory pro QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Aplikace je abstraktní třída</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>Klávesové navádění (KeyNavigation) je dostupné pouze pomocí připojených vlastností</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys je dostupné pouze pomocí připojených vlastností</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>Připojená vlastnost LayoutDirection pracuje jen s položkami</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring je dostupné pouze prostřednictvím připojených vlastností</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt bylo sestaveno bez podpory pro xmlpatterns</translation>
     </message>
@@ -2895,7 +2889,7 @@ 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="+2144"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2134"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+118"/>
         <source>No such file or directory</source>
         <translation>Nepodařilo se najít žádný takový soubor nebo adresář</translation>
@@ -3344,7 +3338,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+356"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+348"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
@@ -4509,7 +4503,7 @@ Má se přepsat?</translation>
         <translation>Místní soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>přímo spojeno</translation>
     </message>

diff --git a/translations/qt_da.ts b/translations/qt_da.ts
index bfa334d..b5945ca 100644 (file)
--- a/translations/qt_da.ts
+++ b/translations/qt_da.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Tilladelse nægtet</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation></translation>
     </message>
@@ -4189,7 +4183,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>lokalt forbundet</translation>
     </message>

diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 7f671f0..de0023d 100644 (file)
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Die Klasse Animation ist abstrakt</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Diese Version der Qt-Bibliothek wurde ohne Unterstützung für die Klasse QMovie erstellt</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>&apos;Application&apos; ist eine abstrakte Klasse</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>Tastennavigation ist nur über Eigenschaften des Typs &apos;attached&apos; verfügbar</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Die Unterstützung für Tasten ist nur über Eigenschaften des Typs &apos;attached&apos; verfügbar</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>Eigenschaften des Typs &apos;attached&apos; können nur mit Elementen der Klasse Item verwendet werden</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring ist nur in Verbindung mit Eigenschaften des Typs &quot;attached&quot; möglich</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <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>
@@ -2895,7 +2889,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Zugriff verweigert</translation>
@@ -3344,7 +3338,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>direkt verbunden</translation>
     </message>

diff --git a/translations/qt_es.ts b/translations/qt_es.ts
index 21df99d..a050bf7 100644 (file)
--- a/translations/qt_es.ts
+++ b/translations/qt_es.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Permiso denegado</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>conectado localmente</translation>
     </message>

diff --git a/translations/qt_eu.ts b/translations/qt_eu.ts
index 4a255cf..c0e984a 100644 (file)
--- a/translations/qt_eu.ts
+++ b/translations/qt_eu.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animazioa klase abstraktoa da</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt eraikita dago QMovie-rako sostengu gabe</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Aplikazioaa klase abstrakto bat da</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>Teklatu-Nabigazioa erantsitako ezaugarrien bidez bakarrik dago eskuragarri</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Teklak erantsitako ezaugarrien bidez bakarrik daude eskuragarri</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>Antolakutza-Norantza ezugarri erantsiak Gaiekin bakarrik egiten du lan</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>Antolakutza-Ispiluak erantsitako ezugarrien bidez bakarrik dago eskuragarri</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt xmlpatterns sostengu gabe eraikia dago</translation>
     </message>
@@ -2895,7 +2889,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Baimena ukatuta</translation>
@@ -3344,7 +3338,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
@@ -4603,7 +4597,7 @@ Gainidaztea nahi duzu?</translation>
         <translation>Ongi</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>tokian elkarketaturik</translation>
     </message>

diff --git a/translations/qt_fa.ts b/translations/qt_fa.ts
index ab3b96d..8dd642b 100644 (file)
--- a/translations/qt_fa.ts
+++ b/translations/qt_fa.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animation یک کلاس انتزاعی است</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt بدون پشتیبانی از QMovie ساخته شده است</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Application یک کلاس مجرد است</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation فقط از طریق ویژگی‌های ضمیمه شده موجود است</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>کلیدها فقط از طریق ویژگی‌های وابسته در دسترس هستند</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>ویژگی ضمیمه‌شده LayoutDirection تنها با Item ها کار می‌کند</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring تنها به‌همراه ویژگی‌های ضمیمه‌شده موجود است</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt بدون پشتیبانی از xmlpatterns ساخته شده است</translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>حق دسترسی رد شد</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation>ـ [%1]</translation>
     </message>
@@ -4603,7 +4597,7 @@ Do you want to overwrite it?</source>
         <translation>تأیید</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>به طورمحلی متصل شد</translation>
     </message>

diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts
index 8d3197b..bbd1050 100644 (file)
--- a/translations/qt_fr.ts
+++ b/translations/qt_fr.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>L&apos;animation est une classe abstraite</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt a été compilé sans support de QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Application est une classe abstraite</translation>
     </message>
@@ -1085,8 +1083,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation est disponible uniquement via les propriétés attachées</translation>
     </message>
@@ -1094,8 +1091,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translatorcomment>Keys, a verifier</translatorcomment>
         <translation>Keys est disponible uniquement via les propriétés attachées</translation>
@@ -1109,7 +1105,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1520,8 +1516,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt a été compilé sans support pour xmlpatterns</translation>
     </message>
@@ -2904,7 +2898,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Autorisation refusée</translation>
@@ -3353,7 +3347,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4198,7 +4192,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>connecté en local</translation>
     </message>

diff --git a/translations/qt_gl.ts b/translations/qt_gl.ts
index f0f2e16..80ad706 100644 (file)
--- a/translations/qt_gl.ts
+++ b/translations/qt_gl.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>A animación é unha clase abstracta</translation>
     </message>
@@ -464,7 +463,6 @@ superior, inferior nin vcenter.</translation>
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt construíuse sen a implementación de QMovie</translation>
     </message>
@@ -472,7 +470,7 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>A aplicación é unha clase abstracta</translation>
     </message>
@@ -1082,8 +1080,7 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation só está dispoñíbel mediante as propiedades anexadas</translation>
     </message>
@@ -1091,8 +1088,7 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys só está dispoñíbel mediante as propiedades anexadas</translation>
     </message>
@@ -1105,7 +1101,7 @@ superior, inferior nin vcenter.</translation>
         <translation>A propriedade anexa LayoutDirection só funciona con «Items»</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring só está dispoñíbel a través das propiedades anexas</translation>
     </message>
@@ -1513,8 +1509,6 @@ superior, inferior nin vcenter.</translation>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt construíuse sen implementación de xmlpatterns</translation>
     </message>
@@ -2896,7 +2890,7 @@ Desexa aínda así borralo?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Permiso negado</translation>
@@ -3345,7 +3339,7 @@ Desexa aínda así borralo?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
@@ -4606,7 +4600,7 @@ Desexa sobrescribilo?</translation>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>conectado localmente</translation>
     </message>

diff --git a/translations/qt_he.ts b/translations/qt_he.ts
index 47c769f..eb55d00 100644 (file)
--- a/translations/qt_he.ts
+++ b/translations/qt_he.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>‏Animation היא מחלקה מופשטת</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>‏Qt נבנה בלי תמיכה עבור QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>‏Application היא מחלקה מופשטת</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>‏KeyNavigation זמין רק באמצעות מאפיינים מקושרים</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>‏Keys זמין רק באמצעות מאפיינים מקושרים</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>מאפיין מקושר LayoutDirection עובד רק עם Items</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>‏LayoutMirroring זמין רק באמצעות מאפיינים מקושרים</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>‏Qt נבנה בלי תמיכה עבור xmlpatterns</translation>
     </message>
@@ -2897,7 +2891,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>הרשאה נדחתה</translation>
@@ -3347,7 +3341,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4192,7 +4186,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>מחוברת מקומית</translation>
     </message>

diff --git a/translations/qt_hu.ts b/translations/qt_hu.ts
index 6bf9143..a254e58 100644 (file)
--- a/translations/qt_hu.ts
+++ b/translations/qt_hu.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Az Animation absztrakt osztály</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1086,8 +1084,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1095,8 +1092,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1104,7 +1100,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1517,8 +1513,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2900,7 +2894,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Hozzáférés megtagadva</translation>
@@ -3349,7 +3343,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4196,7 +4190,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>helyben csatlakoztatva</translation>
     </message>

diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts
index 62b3cea..b7df9f2 100644 (file)
--- a/translations/qt_ja.ts
+++ b/translations/qt_ja.ts
@@ -380,7 +380,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animation は抽象クラスです</translation>
     </message>
@@ -465,7 +464,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt は QMovie のサポートを外してビルドされています</translation>
     </message>
@@ -473,7 +471,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Application は抽象クラスです</translation>
     </message>
@@ -1083,8 +1081,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation はアタッチされたプロパティ(Attached Property: 型名.プロパティ名)の形式でのみ利用できます</translation>
     </message>
@@ -1092,8 +1089,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys はアタッチされたプロパティ(Attached Property: 型名.プロパティ名)の形式でのみ利用できます</translation>
     </message>
@@ -1106,7 +1102,7 @@
         <translation>アタッチされたプロパティ LayoutDirection はアイテムでのみ利用できます</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring はアタッチされたプロパティ(Attached Property: 型名.プロパティ名)の形式でのみ利用できます</translation>
     </message>
@@ -1514,8 +1510,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt は xmlpatterns のサポートを外してビルドされています</translation>
     </message>
@@ -2897,7 +2891,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>許可されていません</translation>
@@ -3346,7 +3340,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4197,7 +4191,7 @@ Do you want to delete it anyway?</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>ローカルに接続しています</translation>
     </message>

diff --git a/translations/qt_ko.ts b/translations/qt_ko.ts
index c59eea4..c90b7d8 100644 (file)
--- a/translations/qt_ko.ts
+++ b/translations/qt_ko.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>애니메이션이 추상 클래스임</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt 빌드에 QMovie 지원이 빠졌음</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Application은 추상 클래스임</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation은 연결된 속성에만 사용할 수 있음</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys는 연결된 속성에만 사용할 수 있음</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>연결된 속성 LayoutDirection은 Item에서만 동작함</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring은 연결된 속성으로만 사용할 수 있음</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt 빌드에 xmlpatterns 지원이 빠졌음</translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>권한이 거부됨</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
@@ -4603,7 +4597,7 @@ Do you want to overwrite it?</source>
         <translation>확인</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>로컬로 연결됨</translation>
     </message>

diff --git a/translations/qt_lt.ts b/translations/qt_lt.ts
index 50504e5..118219b 100644 (file)
--- a/translations/qt_lt.ts
+++ b/translations/qt_lt.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>„Animation“ yra abstrakčioji klasė</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>„Qt“ sukompiliuota be „QMovie“ palaikymo</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>„Application“ yra abstrakčioji klasė</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>„Qt“ sukompiliuota be „xmlpatterns“ palaikymo</translation>
     </message>
@@ -2895,7 +2889,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Nepakanka teisių</translation>
@@ -3344,7 +3338,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation>– [%1]</translation>
     </message>
@@ -4603,7 +4597,7 @@ Ar norite jį perrašyti?</translation>
         <translation>Gerai</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>prijungtas prie šio įrenginio</translation>
     </message>

diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index 50c217b..aed0022 100644 (file)
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>&quot;Animation&quot; jest klasą abstrakcyjną</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt zostało zbudowane bez obsługi QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>&quot;Application&quot; jest klasą abstrakcyjną</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>&quot;KeyNavigation&quot; jest dostępny jedynie poprzez dołączone właściwości</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>&quot;Keys&quot; jest dostępny jedynie poprzez dołączone właściwości</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>Dołączona właściwość &quot;LayoutDirection&quot; działa tylko z &quot;Item&quot;</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>&quot;LayoutMirroring&quot; dostępny jest tylko poprzez dołączone właściwości</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt zostało zbudowane bez obsługi xmlpatterns</translation>
     </message>
@@ -2897,7 +2891,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2147"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2137"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+121"/>
         <source>No space left on device</source>
         <translation>Brak wolnego miejsca na urządzeniu</translation>
@@ -3346,7 +3340,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4246,7 +4240,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation>Wydrukuj bieżącą stronę</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+158"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+149"/>
         <location line="+225"/>
         <source>Aliases: %1</source>
         <translation>Aliasy: %1</translation>

diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts
index 9be9a3c..86ff3a7 100644 (file)
--- a/translations/qt_pt.ts
+++ b/translations/qt_pt.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +2889,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Permissão negada</translation>
@@ -3344,7 +3338,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation type="unfinished">%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>ligado localmente</translation>
     </message>

diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index fa41ea5..5acfa29 100644 (file)
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animation - это абстрактный класс</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt было собрано без поддержки QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Класс Application - абстрактный</translation>
     </message>
@@ -1082,8 +1080,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation доступна только через прикреплённые свойства</translation>
     </message>
@@ -1091,8 +1088,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys доступны только через прикреплённые свойства</translation>
     </message>
@@ -1105,7 +1101,7 @@
         <translation>Подключённое свойство LayoutDirection работает только с элементами</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring доступно только через подключаемые свойства</translation>
     </message>
@@ -1513,8 +1509,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt было собрано без поддержки xmlpatterns</translation>
     </message>
@@ -2896,7 +2890,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Доступ запрещён</translation>
@@ -3345,7 +3339,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4191,7 +4185,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>соединено локально</translation>
     </message>

diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts
index cb84cca..5dfad36 100644 (file)
--- a/translations/qt_sk.ts
+++ b/translations/qt_sk.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animácia je abstraktná trieda</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>QT bolo zostavené bez podpory preQMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Aplikácia je abstraktná trieda</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>&apos;KeyNavigation&apos; je dostupné iba cez pripojené vlastnosti</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Klávesy sú dostupné iba cez pripojené vlastnosti</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>Pripojená vlastnosť LayoutDirection pracuje iba s položkami</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring je dostupný len cez pripojené vlastnosti</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt bolo zostavené bez podpory pre xmlpatterns</translation>
     </message>
@@ -2895,7 +2889,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Prístup zamietnutý</translation>
@@ -3344,7 +3338,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation>- [%1]</translation>
     </message>
@@ -4603,7 +4597,7 @@ Má sa prepísať?</translation>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>lokálne pripojená</translation>
     </message>

diff --git a/translations/qt_sl.ts b/translations/qt_sl.ts
index cad6730..335380d 100644 (file)
--- a/translations/qt_sl.ts
+++ b/translations/qt_sl.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animacija je abstrakten razred</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Qt je bil zgrajen brez podpore za QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation je na voljo samo s pripetimi lastnostmi</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys je na voljo samo s pripetimi lastnostmi</translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Qt je bil zgrajen brez podpore za xmlpatterns</translation>
     </message>
@@ -2895,7 +2889,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Nimate dovoljenja</translation>
@@ -3344,7 +3338,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>krajevno povezan</translation>
     </message>

diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts
index 2c959ff..18971a5 100644 (file)
--- a/translations/qt_sv.ts
+++ b/translations/qt_sv.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +2889,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Åtkomst nekad</translation>
@@ -3344,7 +3338,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation type="unfinished">%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>lokalt ansluten</translation>
     </message>

diff --git a/translations/qt_tools_CN.ts b/translations/qt_tools_CN.ts
index 782e0fe..0b73ce3 100644 (file)
--- a/translations/qt_tools_CN.ts
+++ b/translations/qt_tools_CN.ts
@@ -523,7 +523,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -559,9 +558,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -581,7 +577,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -611,7 +607,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -659,13 +655,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -911,7 +901,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_TW.ts b/translations/qt_tools_TW.ts
index 967b037..86c46b9 100644 (file)
--- a/translations/qt_tools_TW.ts
+++ b/translations/qt_tools_TW.ts
@@ -523,7 +523,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -559,9 +558,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -581,7 +577,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -611,7 +607,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -659,13 +655,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -908,7 +898,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_cs.ts b/translations/qt_tools_cs.ts
index ae543d4..8b16dd7 100644 (file)
--- a/translations/qt_tools_cs.ts
+++ b/translations/qt_tools_cs.ts
@@ -534,7 +534,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -570,9 +569,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -592,7 +588,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -622,7 +618,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -670,13 +666,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -927,7 +917,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_de.ts b/translations/qt_tools_de.ts
index 5259b75..a55da7d 100644 (file)
--- a/translations/qt_tools_de.ts
+++ b/translations/qt_tools_de.ts
@@ -528,7 +528,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -564,9 +563,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -586,7 +582,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -616,7 +612,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -664,13 +660,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -921,7 +911,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_eu.ts b/translations/qt_tools_eu.ts
index d2dcaaa..eb6812e 100644 (file)
--- a/translations/qt_tools_eu.ts
+++ b/translations/qt_tools_eu.ts
@@ -528,7 +528,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -564,9 +563,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -586,7 +582,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -616,7 +612,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -664,13 +660,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -921,7 +911,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_fr.ts b/translations/qt_tools_fr.ts
index 43e3e3d..8307585 100644 (file)
--- a/translations/qt_tools_fr.ts
+++ b/translations/qt_tools_fr.ts
@@ -522,7 +522,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -558,9 +557,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -580,7 +576,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -610,7 +606,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -658,13 +654,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -915,7 +905,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_he.ts b/translations/qt_tools_he.ts
index 43b2453..3a6d2b3 100644 (file)
--- a/translations/qt_tools_he.ts
+++ b/translations/qt_tools_he.ts
@@ -529,7 +529,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -565,9 +564,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -587,7 +583,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -617,7 +613,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -665,13 +661,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -915,7 +905,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_hu.ts b/translations/qt_tools_hu.ts
index c62cc9a..da5f18e 100644 (file)
--- a/translations/qt_tools_hu.ts
+++ b/translations/qt_tools_hu.ts
@@ -523,7 +523,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -559,9 +558,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -581,7 +577,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -611,7 +607,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -659,13 +655,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -920,7 +910,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_ja.ts b/translations/qt_tools_ja.ts
index 52b9b5b..d9fe7a7 100644 (file)
--- a/translations/qt_tools_ja.ts
+++ b/translations/qt_tools_ja.ts
@@ -522,7 +522,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -558,9 +557,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -580,7 +576,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -610,7 +606,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -658,13 +654,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -915,7 +905,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_ko.ts b/translations/qt_tools_ko.ts
index bee5777..643192b 100644 (file)
--- a/translations/qt_tools_ko.ts
+++ b/translations/qt_tools_ko.ts
@@ -522,7 +522,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -558,9 +557,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -580,7 +576,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -610,7 +606,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -658,13 +654,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -907,7 +897,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_pl.ts b/translations/qt_tools_pl.ts
index 2e81330..bd82e58 100644 (file)
--- a/translations/qt_tools_pl.ts
+++ b/translations/qt_tools_pl.ts
@@ -534,7 +534,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -570,9 +569,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -592,7 +588,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -622,7 +618,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -670,13 +666,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -927,7 +917,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_ru.ts b/translations/qt_tools_ru.ts
index c48d83f..32bc897 100644 (file)
--- a/translations/qt_tools_ru.ts
+++ b/translations/qt_tools_ru.ts
@@ -534,7 +534,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -570,9 +569,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -592,7 +588,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -622,7 +618,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -670,13 +666,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -921,7 +911,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_sl.ts b/translations/qt_tools_sl.ts
index b4af072..c208989 100644 (file)
--- a/translations/qt_tools_sl.ts
+++ b/translations/qt_tools_sl.ts
@@ -540,7 +540,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -576,9 +575,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -598,7 +594,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -628,7 +624,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -676,13 +672,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -925,7 +915,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_tools_uk.ts b/translations/qt_tools_uk.ts
index 117a72c..3102e8d 100644 (file)
--- a/translations/qt_tools_uk.ts
+++ b/translations/qt_tools_uk.ts
@@ -535,7 +535,6 @@ Options:
     <message>
         <location filename="../src/tools/lupdate/lupdate.cpp" line="+90"/>
         <source>Usage:
-    lupdate [options] [project-file]...
     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
 
 lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
@@ -571,9 +570,6 @@ Options:
            Do not record line numbers in references to UI files.
     -disable-heuristic {sametext|similartext|number}
            Disable the named merge heuristic. Can be specified multiple times.
-    -pro &lt;filename&gt;
-           Name of a .pro file. Useful for files with .pro file syntax but
-           different file suffix. Projects are recursed into and merged.
     -source-language &lt;language&gt;[_&lt;region&gt;]
            Specify the language of the source strings for new files.
            Defaults to POSIX if not specified.
@@ -593,7 +589,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+73"/>
         <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
 </source>
         <translation type="unfinished"></translation>
@@ -623,7 +619,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+100"/>
         <source>The option -target-language requires a parameter.
 </source>
         <translation type="unfinished"></translation>
@@ -671,13 +667,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>The -pro option should be followed by a filename of .pro file.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>The -I option should be followed by a path.
 </source>
         <translation type="unfinished"></translation>
@@ -923,7 +913,7 @@ qhelpgenerator &lt;help-project-file&gt; [options]
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/tools/lupdate/lupdate.cpp" line="-150"/>
+        <location filename="../src/tools/lupdate/lupdate.cpp" line="-141"/>
         <source>lupdate version %1
 </source>
         <translation type="unfinished"></translation>

diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts
index a20a9b1..8455b87 100644 (file)
--- a/translations/qt_uk.ts
+++ b/translations/qt_uk.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation>Animation - це абстрактний клас</translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation>Бібліотека Qt була зібрана без підтримки QMovie</translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation>Application - це абстрактний клас</translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation>KeyNavigation доступна лише через прикріплені властивості</translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation>Keys доступні лише через прикріплені властивості</translation>
     </message>
@@ -1104,7 +1100,7 @@
         <translation>Прикріплена властивість LayoutDirection працює лише з Item</translation>
     </message>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-63"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation>LayoutMirroring доступна лише через прикріплені властивості</translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation>Бібліотека Qt була зібрана без підтримки xmlpatterns</translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>Доступ заборонено</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+272"/>
         <source>- [%1]</source>
         <translation></translation>
     </message>
@@ -4603,7 +4597,7 @@ Do you want to overwrite it?</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>локально з&apos;єднано</translation>
     </message>

diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts
index 9326354..ae81ca3 100644 (file)
--- a/translations/qt_zh_CN.ts
+++ b/translations/qt_zh_CN.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>权限被拒绝</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>本地已经连接的</translation>
     </message>

diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts
index 73e903d..539e3b7 100644 (file)
--- a/translations/qt_zh_TW.ts
+++ b/translations/qt_zh_TW.ts
@@ -378,7 +378,6 @@
     </message>
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+108"/>
-        <location line="+50"/>
         <source>Animation is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,7 +462,6 @@
     <name>QDeclarativeAnimatedImage</name>
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+102"/>
-        <location line="+108"/>
         <source>Qt was built without support for QMovie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +469,7 @@
 <context>
     <name>QDeclarativeApplication</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-78"/>
+        <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="-28"/>
         <source>Application is an abstract class</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1081,8 +1079,7 @@
 <context>
     <name>QDeclarativeKeyNavigationAttached</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="-36"/>
-        <location line="+88"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+72"/>
         <source>KeyNavigation is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,8 +1087,7 @@
 <context>
     <name>QDeclarativeKeysAttached</name>
     <message>
-        <location line="-87"/>
-        <location line="+88"/>
+        <location line="+1"/>
         <source>Keys is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1095,7 @@
 <context>
     <name>QDeclarativeLayoutMirroringAttached</name>
     <message>
-        <location line="-63"/>
+        <location line="+25"/>
         <source>LayoutMirroring is only available via attached properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,8 +1508,6 @@
     <message>
         <location filename="../src/declarative/util/qdeclarativeutilmodule.cpp" line="+40"/>
         <location line="+2"/>
-        <location line="+49"/>
-        <location line="+2"/>
         <source>Qt was built without support for xmlpatterns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +2889,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/core/global/qglobal.cpp" line="+2138"/>
+        <location filename="../src/core/global/qglobal.cpp" line="+2128"/>
         <location filename="../src/core/kernel/qsystemerror.cpp" line="+112"/>
         <source>Permission denied</source>
         <translation>權限不足</translation>
@@ -3344,7 +3338,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+281"/>
+        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+273"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
@@ -4189,7 +4183,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+135"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+126"/>
         <source>locally connected</source>
         <translation>本地連接</translation>
     </message>