update translations [ci skip]

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

diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts
index 3329829..130b0de 100644 (file)
--- a/translations/qt_ar.ts
+++ b/translations/qt_ar.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>الملف الهدف موجود</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>لا يمكن حدف الملف المصدر</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>لا يمكن فتح الملف %1 للقراءة</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>لا يمكن الفتح للكتابة</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>فشل محاولة كتابة المقطع</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>لا يمكن انشاء الملف %1 للكتابة</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2357,24 +2336,27 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3236,7 +3218,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4889,27 +4871,17 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-57"/>
         <source>%1: doesn&apos;t exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+120"/>
         <source>%1: unable to make key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4930,7 +4902,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6509,7 +6481,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_cs.ts b/translations/qt_cs.ts
index 62abc27..d363217 100644 (file)
--- a/translations/qt_cs.ts
+++ b/translations/qt_cs.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,17 +1727,7 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+814"/>
-        <source>Cannot create %1 for output</source>
-        <translation>%1 se nepodařilo zřídit pro výstup</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <source>Failure to write block</source>
-        <translation>Datový blok se nepodařilo zapsat</translation>
-    </message>
-    <message>
-        <location line="-181"/>
+        <location filename="../src/core/io/qfile.cpp" line="+621"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Nepřejmenuje posloupný soubor pomocí kopie bloku</translation>
     </message>
@@ -1747,26 +1737,15 @@ Script: %3</source>
         <translation>Nelze odstranit zdrojový soubor</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>%1 se nepodařilo otevřít pro čtení</translation>
-    </message>
-    <message>
-        <location line="+339"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Není dostupný žádný souborový stroj nebo stroj nepodporuje UnMapExtension</translation>
     </message>
     <message>
-        <location line="-506"/>
-        <location line="+154"/>
+        <location line="-437"/>
         <source>Destination file exists</source>
         <translation>Cílový soubor již existuje</translation>
     </message>
-    <message>
-        <location line="+31"/>
-        <source>Cannot open for output</source>
-        <translation>Nepodařilo se otevřít pro zápis</translation>
-    </message>
 </context>
 <context>
     <name>QFileDialog</name>
@@ -2366,24 +2345,27 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Nepodařilo se najít počítač</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Neznámý typ adresy</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Neznámá chyba</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>Nebyl zadán název pro hostitelský počítač</translation>
     </message>
@@ -3245,7 +3227,7 @@ Ověřte, prosím, že byl zadán správný název souboru.</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Při zápisu do souboru %1: %2 nastala chyba</translation>
     </message>
@@ -4861,12 +4843,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
         <translation>%1: Neexistuje</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: Soubor s unixovým klíčem neexistuje</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: Bylo dosaženo systémem podmíněné meze velikosti</translation>
     </message>
@@ -4877,8 +4854,8 @@ Zvolte, prosím, pro soubor jiný název.</translation>
         <translation>%1: Špatný název</translation>
     </message>
     <message>
-        <location line="-192"/>
-        <location line="+26"/>
+        <location line="-184"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: Neplatný údaj u klíče (prázdný)</translation>
     </message>
@@ -4888,7 +4865,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
         <translation>%1: Údaj o velikosti vytvoření je menší než nula</translation>
     </message>
     <message>
-        <location filename="../src/core/kernel/qsharedmemory_unix.cpp" line="-69"/>
+        <location filename="../src/core/kernel/qsharedmemory_unix.cpp" line="-61"/>
         <source>%1: already exists</source>
         <translation>%1: Již existuje</translation>
     </message>
@@ -4903,7 +4880,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
         <translation>%1: Neplatná velikost</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+108"/>
         <source>%1: unable to make key</source>
         <translation>%1: Nepodařilo se vytvořit klíč</translation>
     </message>
@@ -4918,22 +4895,17 @@ Zvolte, prosím, pro soubor jiný název.</translation>
         <translation>%1: Uzavření se nepodařilo zrušit</translation>
     </message>
     <message>
-        <location filename="../src/core/kernel/qsharedmemory_unix.cpp" line="-136"/>
+        <location filename="../src/core/kernel/qsharedmemory_unix.cpp" line="-128"/>
         <source>%1: permission denied</source>
         <translation>%1: Přístup odepřen</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: Vyvolání ftok se nezdařilo</translation>
-    </message>
-    <message>
-        <location line="-45"/>
+        <location line="+16"/>
         <source>%1: out of resources</source>
         <translation>%1: Nejsou již použitelné zdroje</translation>
     </message>
     <message>
-        <location line="+265"/>
+        <location line="+257"/>
         <source>%1: not attached</source>
         <translation>%1: Nepřipojen</translation>
     </message>
@@ -6518,7 +6490,7 @@ Zvolte, prosím, pro soubor jiný název.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Tato socket operace není podporována</translation>
     </message>

diff --git a/translations/qt_da.ts b/translations/qt_da.ts
index fb7641f..6657d4c 100644 (file)
--- a/translations/qt_da.ts
+++ b/translations/qt_da.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation></translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Destinationsfil findes</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Kan ikke fjerne kildefil</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Kan ikke åbne %1 til input</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Kan ikke åbne til output</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Kunne ikke skrive blok</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Kunne ikke oprette %1 til output</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,13 +2345,15 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Vært ikke fundet</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-98"/>
         <source>No host name given</source>
         <translation type="unfinished">Hostnavn mangler</translation>
     </message>
@@ -2383,12 +2364,13 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Ukendt adressetype</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Ukendt fejl</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished">Skrivefejl mens der blev skrevet til %1: %2</translation>
     </message>
@@ -4903,22 +4885,12 @@ Vælg et andet filnavn.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: nøgle er tom</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok mislykkedes</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: Kunne ikke oprette nøgle</translation>
     </message>
@@ -4939,7 +4911,7 @@ Vælg et andet filnavn.</translation>
         <translation>%1: Ikke vedhæftet</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: Ugyldig størrelse</translation>
     </message>
@@ -6518,7 +6490,7 @@ Vælg et andet filnavn.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Socket-operation ikke understøttet</translation>
     </message>

diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 8bec7ab..57c4390 100644 (file)
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Die Zieldatei existiert bereits</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Eine sequentielle Datei kann nicht durch blockweises Kopieren umbenannt werden</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Die Quelldatei kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>%1 kann nicht zum Lesen geöffnet werden</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Das Öffnen zum Schreiben ist fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Der Datenblock konnte nicht geschrieben werden</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>%1 kann nicht erstellt werden</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Es ist kein Datei-Engine verfügbar oder der gegenwärtig aktive Engine unterstützt die UnMap-Erweiterung nicht</translation>
     </message>
@@ -2366,24 +2345,27 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Rechner konnte nicht gefunden werden</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Unbekannter Adresstyp</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Unbekannter Fehler</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>Es wurde kein Hostname angegeben</translation>
     </message>
@@ -3245,7 +3227,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Fehler beim Schreiben zu %1: %2</translation>
     </message>
@@ -4893,32 +4875,22 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: Ungültige Schlüsselangabe (leer)</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok-Aufruf ist fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: Es kann kein Schlüssel erzeugt werden</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: existiert nicht</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: Die Unix-Schlüsseldatei existiert nicht</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: Ein systembedingtes Limit der Größe wurde erreicht</translation>
     </message>
@@ -4934,7 +4906,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>%1: nicht verbunden</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: Ungültige Größe</translation>
     </message>
@@ -6518,7 +6490,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Diese Socket-Operation wird nicht unterstützt</translation>
     </message>

diff --git a/translations/qt_es.ts b/translations/qt_es.ts
index 5ec3866..c54836a 100644 (file)
--- a/translations/qt_es.ts
+++ b/translations/qt_es.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,13 +2345,15 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Equipo no encontrado</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-98"/>
         <source>No host name given</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2383,12 +2364,13 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Dirección de tipo desconocido</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Error desconocido</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4903,22 +4885,12 @@ Elija un nombre de fichero diferente.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4939,7 +4911,7 @@ Elija un nombre de fichero diferente.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6518,7 +6490,7 @@ Elija un nombre de fichero diferente.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_eu.ts b/translations/qt_eu.ts
index 936ad2a..998d0c8 100644 (file)
--- a/translations/qt_eu.ts
+++ b/translations/qt_eu.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Helmuga agiria badago</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Ez da sekuentzia agiria berrizendatuko bloke kopia erabiliz</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Ezinezkoa iturburu agiria kentzea</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Ezinezkoa %1 irekitzea sarrerarako</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Ezinezkoa irekitzea irteerarako</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Hutsegitea blokea idazterakoan</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Ezinezkoa %1 sortzea irteerarako</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Ez dago agiri gailurik eskuragarri edo gailuak ez du UnMapExtension sostengatzen</translation>
     </message>
@@ -2366,7 +2345,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>Ez da hostalari izenik eman</translation>
     </message>
@@ -2377,18 +2356,21 @@ Horrela ere ezabatzea nahi duzu?</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Helbide mota ezezaguna</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Hostalaria ez da aurkitu</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Akats ezezaguna</translation>
     </message>
@@ -3245,7 +3227,7 @@ Horrela ere ezabatzea nahi duzu?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Idazketa akatsa %1-ra idazterakoan: %2</translation>
     </message>
@@ -4902,33 +4884,23 @@ Gainidaztea nahi duzu?</translation>
         <translation>%1: akats ezezaguna %2</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+104"/>
         <source>%1: unable to make key</source>
         <translation>%1: ezinezkoa giltza egitea</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: ez dago</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: giltza hutsik dago</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: UNIX giltza agiria ez dago</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok hutsegitea</translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+81"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: sistemak-ezarritako neurri murrizketak</translation>
     </message>
@@ -6518,7 +6490,7 @@ Gainidaztea nahi duzu?</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Eragiketa ahoan ez dago sostengatuta</translation>
     </message>

diff --git a/translations/qt_fa.ts b/translations/qt_fa.ts
index 85bf6c6..14415a1 100644 (file)
--- a/translations/qt_fa.ts
+++ b/translations/qt_fa.ts
@@ -444,7 +444,7 @@ Script: %3</source>
     <message>
         <location line="+29"/>
         <source>Possible anchor loop detected on centerIn.</source>
-        <translation>حلقهٔ احتمال�� تکیه‌گاه در «مرکز-داخل» تشخیص داده شد.</translation>
+        <translation>حلقهٔ احتمال��� تکیه‌گاه در «مرکز-داخل» تشخیص داده شد.</translation>
     </message>
     <message>
         <location line="+208"/>
@@ -797,7 +797,7 @@ Script: %3</source>
     <message>
         <location line="+65"/>
         <source>Cannot assign object to list</source>
-        <translation>نم��‌توان به لیست شیء اختصاص داد</translation>
+        <translation>ن����‌توان به لیست شیء اختصاص داد</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>کلاس QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>پرونده مقصد موجود است</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>پرونده ترتیبی با استفاده از کپی بلاک‌ها تغییر نام داده نخواهد شد</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>نمی‌توان پرونده منبع را حذف کرد</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>نمی‌توان %1 را به‌عنوان ورودی باز کرد</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>نمی‌توان برای خروجی باز کرد</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>نگارش ناموفق بلاک</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>نمی‌توان %1 را برای خروجی باز کرد</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>موتور پرونده در دسترس نیست و یا موتور پرونده از UnMapExtension پشتیبانی نمی‌کند</translation>
     </message>
@@ -2366,7 +2345,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>نام میزبان داده نشده است</translation>
     </message>
@@ -2377,18 +2356,21 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>نوع ناشناخته آدرس</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>میزبان پیدا نشد</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>خطای ناشناخته</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>خطای نوشتن روی %1: %2</translation>
     </message>
@@ -4902,33 +4884,23 @@ Do you want to overwrite it?</source>
         <translation>%1: خطای ناشناخته %2</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+104"/>
         <source>%1: unable to make key</source>
         <translation>%1: نمی‌توان کلید ایجاد کرد</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: وجود ندارد</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: کلید تهی است</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: پروندهٔ کلید UNIX وجود ندارد</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: عدم موفقیت ftok</translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+81"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: محدودیت اندازهٔ تحمیلی سیستم</translation>
     </message>
@@ -6518,7 +6490,7 @@ Do you want to overwrite it?</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>عملیات روی سوکت پشتیبانی نمی‌شود</translation>
     </message>
@@ -6859,7 +6831,7 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+1"/>
         <source>unexpected end of file</source>
-        <translation>انتهای نامنتظرهٔ پرونده</translation>
+        <translation>انتهای ن��منتظرهٔ پرونده</translation>
     </message>
     <message>
         <location line="+1"/>

diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts
index f1d8c4c..d20a7f5 100644 (file)
--- a/translations/qt_fr.ts
+++ b/translations/qt_fr.ts
@@ -1533,7 +1533,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1735,43 +1735,22 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Le fichier destination existe</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="+38"/>
         <source>Cannot remove source file</source>
         <translation>Impossible de supprimer le fichier source</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Impossible d&apos;ouvrir %1 pour lecture</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Impossible d&apos;ouvrir pour écriture</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Impossible d&apos;écrire un bloc</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Impossible de créer %1 pour écriture</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Aucun moteur de fichier disponible ou celui-ci ne supporte pas UnMapExtension</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-422"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Ne renommera pas le fichier séquentiel avec la copie par blocs</translation>
     </message>
@@ -2373,24 +2352,27 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Hôte introuvable</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Adresse de type inconnu</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>Aucun nom d&apos;hôte n&apos;a été donné</translation>
     </message>
@@ -3252,7 +3234,7 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Erreur lors de l&apos;écriture dans %1 : %2</translation>
     </message>
@@ -4905,17 +4887,12 @@ Veuillez choisir un nom de fichier différent.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1 : clé vide</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1 : ftok a échoué</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1 : impossible de créer la clé</translation>
     </message>
@@ -4936,7 +4913,7 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>%1 : non attaché</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1 : taille invalide</translation>
     </message>
@@ -4945,11 +4922,6 @@ Veuillez choisir un nom de fichier différent.</translation>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1 : n&apos;existe pas</translation>
     </message>
-    <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1 : le fichier de clés UNIX n&apos;existe pas</translation>
-    </message>
 </context>
 <context>
     <name>QShortcut</name>
@@ -5652,7 +5624,7 @@ Veuillez choisir un nom de fichier différent.</translation>
     <message>
         <location line="+1"/>
         <source>Eject</source>
-        <translation>Éjecter</translation>
+        <translation>��jecter</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6526,7 +6498,7 @@ Veuillez choisir un nom de fichier différent.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Opération sur le socket non supportée</translation>
     </message>

diff --git a/translations/qt_gl.ts b/translations/qt_gl.ts
index f76f1f0..875030f 100644 (file)
--- a/translations/qt_gl.ts
+++ b/translations/qt_gl.ts
@@ -1526,7 +1526,7 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1728,13 +1728,12 @@ superior, inferior nin vcenter.</translation>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>O ficheiro de destino xa existe</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Non se mudará o nome do ficheiro secuencial empregando a copia de bloques</translation>
     </message>
@@ -1744,27 +1743,7 @@ superior, inferior nin vcenter.</translation>
         <translation>Non é posíbel eliminar o ficheiro de orixe</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Non é posíbel abrir %1 como entrada</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Non foi posíbel abrir para saída</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Fallou a escrita do bloque</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Non foi posíbel crear %1 para a saída</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Ou non hai dispoñíbel ningún motor de ficheiros ou o motor non admite UnMapExtension</translation>
     </message>
@@ -2367,7 +2346,7 @@ Desexa aínda así borralo?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>Non se indicou o nome do servidor</translation>
     </message>
@@ -2378,18 +2357,21 @@ Desexa aínda así borralo?</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Tipo de enderezo descoñecido</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Non se atopou o servidor</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Erro descoñecido</translation>
     </message>
@@ -3246,7 +3228,7 @@ Desexa aínda así borralo?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Aconteceu un erro de escrita ao escribir en %1: %2</translation>
     </message>
@@ -3325,7 +3307,7 @@ Desexa aínda así borralo?</translation>
     <message>
         <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+416"/>
         <source>No suitable proxy found</source>
-        <translation>Non se atopou ningún proxy axeitado</translation>
+        <translation>Non se atopou ning��n proxy axeitado</translation>
     </message>
 </context>
 <context>
@@ -4904,33 +4886,23 @@ Desexa sobrescribilo?</translation>
         <translation>%1: erro descoñecido %2</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+104"/>
         <source>%1: unable to make key</source>
         <translation>%1: non foi posíbel crear a chave</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: non existe</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: a chave está baleira</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: non existe o ficheiro de chave de UNIX</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: fallou ftok</translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+81"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: restricións de tamaño impostas polo sistema</translation>
     </message>
@@ -6520,7 +6492,7 @@ Desexa sobrescribilo?</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Non se permite a operación no socket</translation>
     </message>

diff --git a/translations/qt_he.ts b/translations/qt_he.ts
index 2f37a35..241bfdc 100644 (file)
--- a/translations/qt_he.ts
+++ b/translations/qt_he.ts
@@ -444,7 +444,7 @@ Script: %3</source>
     <message>
         <location line="+29"/>
         <source>Possible anchor loop detected on centerIn.</source>
-        <translation>אותרה לולאת ��וגן אפשרית בתוך centerin.</translation>
+        <translation>אותרה לולאת ���וגן אפשרית בתוך centerin.</translation>
     </message>
     <message>
         <location line="+208"/>
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translatorcomment>חוגה</translatorcomment>
         <translation>QDial</translation>
@@ -1729,13 +1729,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>קובץ יעד קיים</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>לא יתבצע שינוי שם לקובץ סדרתי באמצעות העתקת בלוק</translation>
     </message>
@@ -1745,27 +1744,7 @@ Script: %3</source>
         <translation>אין אפשרות להסיר קובץ מקור</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>אין אפשרות לפתוח את %1 לקריאה</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>אין אפשרות לפתוח לכתיבה</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>אין אפשרות לכתוב בלוק</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>אין אפשרות לפתוח את %1 לכתיבה</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>אין מנוע קבצים זמין או שהמנוע אינו תומך UnMapExtension</translation>
     </message>
@@ -2368,24 +2347,27 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>מארח לא נמצא</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>טיפוס כתובת לא מוכר</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>שגיאה לא מוכרת</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>לא ניתן שם מארח</translation>
     </message>
@@ -2804,7 +2786,7 @@ Do you want to delete it anyway?</source>
         <location filename="../src/network/socket/qlocalsocket_tcp.cpp" line="+3"/>
         <source>%1: Socket access error</source>
         <translatorcomment>גישת שקע</translatorcomment>
-        <translation>%1: ש��יאת גישה לשקע</translation>
+        <translation>%1: ש���יאת גישה לשקע</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3242,13 +3224,13 @@ Do you want to delete it anyway?</source>
     <message>
         <location filename="../src/network/access/qnetworkreplydataimpl.cpp" line="+73"/>
         <source>Invalid URI: %1</source>
-        <translation>כתובת URI לא תקינה: %1</translation>
+        <translation>כתובת URI לא תק��נה: %1</translation>
     </message>
 </context>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>שגיאת כתיבה בעת כתיבה אל %1: %2</translation>
     </message>
@@ -4902,27 +4884,17 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: מפתח ריק</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-57"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: לא קיים</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: קובץ מפתח UNIX לא קיים</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok נכשלה</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+120"/>
         <source>%1: unable to make key</source>
         <translation>%1: אין אפשרות לייצר מפתח</translation>
     </message>
@@ -4943,7 +4915,7 @@ Please choose a different file name.</source>
         <translation>%1: לא מחובר</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: גודל לא תקין</translation>
     </message>
@@ -6523,7 +6495,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>פעולה על שקע אינה נתמכת</translation>
     </message>

diff --git a/translations/qt_hu.ts b/translations/qt_hu.ts
index 729c1c4..1d7284a 100644 (file)
--- a/translations/qt_hu.ts
+++ b/translations/qt_hu.ts
@@ -1530,7 +1530,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation></translation>
     </message>
@@ -1732,13 +1732,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>A célfájl már létezik</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>A szekvenciális fájlok nem nevezhetők át másolással</translation>
     </message>
@@ -1748,27 +1747,7 @@ Script: %3</source>
         <translation>A forrás nem törölhető</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>A(z) %1 nem nyitható meg bemenetként</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Nem nyitható meg kimenetként</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Hiba a blokk írásakor</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>A(z) %1 nem hozható létre</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2371,19 +2350,21 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>A kiszolgáló nem található</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Ismeretlen címtípus</translation>
     </message>
     <message>
-        <location line="-94"/>
+        <location line="-93"/>
         <source>No host name given</source>
         <translation>Nem adott meg gépnevet</translation>
     </message>
@@ -2393,7 +2374,8 @@ Biztosan törölni akarja?</translation>
         <translation>Érvénytelen gépnév</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="-17"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Ismeretlen hiba</translation>
     </message>
@@ -3250,7 +3232,7 @@ Biztosan törölni akarja?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Hiba a(z) %1 kiírásakor: %2</translation>
     </message>
@@ -4905,32 +4887,22 @@ Válasszon másik fájlnevet.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: a kulcs hiányzik</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok hibát adott vissza</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: a kulcs elkészítése sikertelen</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: nem létezik</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: az UNIX kulcsfájl nem létezik</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: a rendszer méretkorlátokat állított fel</translation>
     </message>
@@ -4946,7 +4918,7 @@ Válasszon másik fájlnevet.</translation>
         <translation>%1: nem lesz csatolva</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: hibás méret</translation>
     </message>
@@ -6536,7 +6508,7 @@ Válasszon másik fájlnevet.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>A művelet nem támogatott socketeken</translation>
     </message>

diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts
index 59f0727..3146bcd 100644 (file)
--- a/translations/qt_ja.ts
+++ b/translations/qt_ja.ts
@@ -804,7 +804,7 @@ Script: %3</source>
     <message>
         <location line="+6"/>
         <source>Can only assign one binding to lists</source>
-        <translation>リストへは一つのバインディングのみ割り当てることができます</translation>
+        <translation>リストへは一つのバインディングのみ割り当��ることができます</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -991,7 +991,7 @@ Script: %3</source>
     <message>
         <location line="+3"/>
         <source>Connections: syntax error</source>
-        <translation>接続: 構文エラー</translation>
+        <translation>接��: 構文エラー</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1527,7 +1527,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>ダイヤル</translation>
     </message>
@@ -1729,13 +1729,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>新しい名前のファイルは既に存在します</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>ブロックコピーを用いてシーケンシャルファイルの名前を変更することはできません</translation>
     </message>
@@ -1745,27 +1744,7 @@ Script: %3</source>
         <translation>元のファイルを削除できません</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>コピー元ファイル %1 を読めません</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>コピー先のファイルを開けません</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>書き込みに失敗しました</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>コピー先として %1 を作成できません</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>ファイルエンジンが見つからないか、UnMapExtension をサポートしていません</translation>
     </message>
@@ -2071,7 +2050,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+70"/>
         <source>Invalid filename</source>
-        <translation>無効���ファイル名</translation>
+        <translation>無効�����ファイル名</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2368,19 +2347,21 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>ホストが見つかりません</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>未知のアドレス型です</translation>
     </message>
     <message>
-        <location line="-94"/>
+        <location line="-93"/>
         <source>No host name given</source>
         <translation>ホストネームが与えられていません</translation>
     </message>
@@ -2390,7 +2371,8 @@ Do you want to delete it anyway?</source>
         <translation>無効なホスト名</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="-17"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>未知のエラー</translation>
     </message>
@@ -2963,7 +2945,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+13"/>
         <source>Restore Down</source>
-        <translation>��に戻す</translation>
+        <translation>����に戻す</translation>
     </message>
     <message>
         <location line="+707"/>
@@ -3248,7 +3230,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>%1 への書き込み時にエラーが発生しました: %2</translation>
     </message>
@@ -3583,7 +3565,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+17"/>
         <source>Could not rollback transaction</source>
-        <translation>トランザクションをロールバックできませんでした</translation>
+        <translation>トランザクションをロールバックできませんでし���</translation>
     </message>
     <message>
         <location line="+385"/>
@@ -4883,7 +4865,7 @@ Please choose a different file name.</source>
     <message>
         <location filename="../src/core/kernel/qsharedmemory_unix.cpp" line="+83"/>
         <source>%1: permission denied</source>
-        <translation>%1: 許可されていませ���</translation>
+        <translation>%1: 許可されていま������</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -4902,32 +4884,22 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: キーが空です</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: fork に失敗しました</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: キーを作成できません</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: 存在しません</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: UNIX key file が存在しません</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translatorcomment>EINVAL</translatorcomment>
         <translation>%1: 指定されたサイズはシステムにより拒否されました</translation>
@@ -4944,7 +4916,7 @@ Please choose a different file name.</source>
         <translation>%1: アタッチしていません</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: 無効なサイズです</translation>
     </message>
@@ -6524,7 +6496,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>このソケットへの操作はサポートされていません</translation>
     </message>

diff --git a/translations/qt_ko.ts b/translations/qt_ko.ts
index 1d46e1c..759e933 100644 (file)
--- a/translations/qt_ko.ts
+++ b/translations/qt_ko.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>대상 파일이 존재함</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>블록 복사를 사용하여 연속적인 파일 이름을 바꾸지 않음</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>원본 파일을 삭제할 수 없음</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>%1에서 입력을 받기 위하여 열 수 없음</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>출력을 위하여 열 수 없음</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>블록을 쓸 수 없음</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>%1에 쓰기 위하여 열 수 없음</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>파일 엔진을 사용할 수 없거나 파일 엔진이 UnMapExtension을 지원하지 않음</translation>
     </message>
@@ -2366,7 +2345,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>호스트 이름이 지정되지 않았음</translation>
     </message>
@@ -2377,18 +2356,21 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>알 수 없는 주소 형식</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>호스트를 찾을 수 없음</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>알 수 없는 오류</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>%1에 쓰는 중 오류 발생: %2</translation>
     </message>
@@ -4359,7 +4341,7 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+1"/>
         <source>invalid category</source>
-        <translation>잘못된 분류</translation>
+        <translation>���못된 분류</translation>
     </message>
 </context>
 <context>
@@ -4902,33 +4884,23 @@ Do you want to overwrite it?</source>
         <translation>%1: 알 수 없는 오류 %2</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+104"/>
         <source>%1: unable to make key</source>
         <translation>%1: 키를 만들 수 없음</translation>
     </message>
     <message>
-        <location line="-82"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: 유닉스 키 파일이 없음</translation>
-    </message>
-    <message>
-        <location line="-46"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: 존재하지 않음</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: 키가 비어 있음</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok 실패</translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+81"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: 시스템에서 크게를 제한함</translation>
     </message>
@@ -5155,7 +5127,7 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+1"/>
         <source>Media Record</source>
-        <translation>미��어 녹음</translation>
+        <translation>미���� 녹음</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6518,7 +6490,7 @@ Do you want to overwrite it?</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>소켓 작업을 지원하지 않음</translation>
     </message>
@@ -6939,7 +6911,7 @@ Do you want to overwrite it?</source>
     <message>
         <location line="+1"/>
         <source>external parsed general entity reference not allowed in attribute value</source>
-        <translation>속성 값에는 외부에서 처리한 일반 ���티티 참조를 사용할 수 없음</translation>
+        <translation>속성 값에는 외부에서 처리한 일반 ����티티 참조를 사용할 수 없음</translation>
     </message>
     <message>
         <location line="+1"/>

diff --git a/translations/qt_lt.ts b/translations/qt_lt.ts
index 889ef15..ac3dfab 100644 (file)
--- a/translations/qt_lt.ts
+++ b/translations/qt_lt.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Paskirties failas jau egzistuoja</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Nuosekliosios prieigos failas nebus pervardytas naudojant blokų kopijavimą</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Nepavyko pašalinti šaltinio failo</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Nepavyko skaitymui atverti failo %1</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Nepavyko rašymui atverti failo</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Nepavyko įrašyti bloko</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Nepavyko sukurti išvesties failo %1</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,7 +2345,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>Nepateiktas mazgo vardas</translation>
     </message>
@@ -2377,18 +2356,21 @@ Ar vis tiek norite jį pašalinti?</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Nežinomas adreso tipas</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Mazgas nerastas</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Nežinoma klaida</translation>
     </message>
@@ -3245,7 +3227,7 @@ Ar vis tiek norite jį pašalinti?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Rašymo klaida rašant į %1: %2</translation>
     </message>
@@ -4902,33 +4884,23 @@ Ar norite jį perrašyti?</translation>
         <translation>%1: nežinoma klaida %2</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+104"/>
         <source>%1: unable to make key</source>
         <translation>%1: rakto sukurti nepavyko</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: neegzistuoja</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: raktas tuščias</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: UNIX rakto failas neegzistuoja</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: nepavyko ftok()</translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+81"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: dydį ribojama sistema</translation>
     </message>
@@ -6518,7 +6490,7 @@ Ar norite jį perrašyti?</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Operacija su lizdu nepalaikoma</translation>
     </message>

diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index 34b1893..d10954a 100644 (file)
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Plik wyjściowy już istnieje</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Nie można zmienić nazwy pliku sekwencyjnego używając kopiowania blokowego</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Nie można usunąć oryginalnego pliku</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Nie można otworzyć pliku wejściowego %1</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Nie można otworzyć pliku wyjściowego</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Nie można zapisać bloku</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Nie można utworzyć pliku wyjściowego %1</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Brak dostępnego silnika lub silnik nie obsługuje UnMapExtension</translation>
     </message>
@@ -2368,24 +2347,27 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Host nie znaleziony</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Nieznany typ adresu</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>Nie podano nazwy hosta</translation>
     </message>
@@ -3247,7 +3229,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Błąd w trakcie zapisywania do %1: %2</translation>
     </message>
@@ -4895,32 +4877,22 @@ Proszę wybrać inną nazwę pliku.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: klucz jest pusty</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: wystąpił błąd w funkcji ftok()</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: nie można utworzyć klucza</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: nie istnieje</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: unixowy plik z kluczem nie istnieje</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: ograniczenia rozmiarów narzucone przez system</translation>
     </message>
@@ -4936,7 +4908,7 @@ Proszę wybrać inną nazwę pliku.</translation>
         <translation>%1: niedołączony</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: niepoprawny rozmiar</translation>
     </message>
@@ -6520,7 +6492,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Operacja na gnieździe nieobsługiwana</translation>
     </message>

diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts
index 60ec740..9c1b628 100644 (file)
--- a/translations/qt_pt.ts
+++ b/translations/qt_pt.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,13 +2345,15 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Servidor Não encontrado</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-98"/>
         <source>No host name given</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2383,12 +2364,13 @@ Deseja apagar de qualquer forma?</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Tipo de endereço desconhecido</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Erro desconhecido</translation>
     </message>
@@ -3245,7 +3227,7 @@ Deseja apagar de qualquer forma?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,22 +4884,12 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4938,7 +4910,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6517,7 +6489,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index 9992415..e03abc2 100644 (file)
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -1468,7 +1468,7 @@ Script: %3</source>
     <message>
         <location line="+441"/>
         <source>Cannot assign value %1 to property %2</source>
-        <translation>Невозможно присвоить значение «%1» свойству «%2»</translation>
+        <translation>Невозможно присвоить значение «%1» свой��тву «%2»</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -1526,7 +1526,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1728,13 +1728,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Файл существует</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Последовательный файл не будет переименован с использованием поблочного копирования</translation>
     </message>
@@ -1744,27 +1743,7 @@ Script: %3</source>
         <translation>Невозможно удалить исходный файл</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Невозможно открыть %1 для ввода</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Невозможно открыть для вывода</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Сбой записи блока</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Невозможно создать %1 для вывода</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Нет файлового движка или он не поддерживает UnMapExtension</translation>
     </message>
@@ -2367,24 +2346,27 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Узел не найден</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Неизвестный тип адреса</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>Имя узла не задано</translation>
     </message>
@@ -3246,7 +3228,7 @@ Please verify the correct directory name was given.</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Ошибка записи в %1: %2</translation>
     </message>
@@ -4894,32 +4876,22 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: пустой ключ</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ошибка ftok</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: невозможно создать ключ</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: не существует</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: специфический ключ UNIX не существует</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: системой наложены ограничения на размер</translation>
     </message>
@@ -4935,7 +4907,7 @@ Please choose a different file name.</source>
         <translation>%1: не приложенный</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: неверный размер</translation>
     </message>
@@ -6519,7 +6491,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Операция с сокетом не поддерживается</translation>
     </message>
@@ -6727,7 +6699,7 @@ Please choose a different file name.</source>
     <message>
         <location filename="../src/gui/dialogs/qwizard.cpp" line="+601"/>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation>О��мена</translation>
     </message>
     <message>
         <location line="+2"/>

diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts
index 12e31b9..dcbfced 100644 (file)
--- a/translations/qt_sk.ts
+++ b/translations/qt_sk.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Cieľový súbor existuje</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Nepremenuje sekvenčný súbor pomocou kópie bloku</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Nemôžem odstrániť zdrojový súbor</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>%1 sa nepodarilo otvoriť pre čítanie</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Nemôžem otvoriť pre výstup</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Chyba pri zápise bloku</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Nepodarilo sa vytvoriť %1 pre výstup</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Nie je dostupný žiadny súborový prostriedok, alebo prostriedok nepodporuje UnMapExtension</translation>
     </message>
@@ -2366,7 +2345,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>Nezadaný názov hostiteľa</translation>
     </message>
@@ -2377,18 +2356,21 @@ Chcete ho aj tak zmazať?</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Neznámy typ adresy</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Hostiteľ nebol nájdený</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Neznáma chyba</translation>
     </message>
@@ -2670,7 +2652,7 @@ Chcete ho aj tak zmazať?</translation>
     <message>
         <location filename="../src/core/plugin/qlibrary.cpp" line="+347"/>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
-        <translation>Overenie dát modulu nesúhlasí v &apos;%1&apos;</translation>
+        <translation>Overenie dát modulu nesúhlas�� v &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+202"/>
@@ -3245,7 +3227,7 @@ Chcete ho aj tak zmazať?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Chyba zápisu do %1: %2</translation>
     </message>
@@ -4903,27 +4885,17 @@ Má sa prepísať?</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: kľúč je prázdny</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-57"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: neexistuje</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: Súbor s unixovým kľúčom neexistuje</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: ftok zlyhal</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+120"/>
         <source>%1: unable to make key</source>
         <translation>%1: nedá sa vytvoriť kľúč</translation>
     </message>
@@ -6518,7 +6490,7 @@ Má sa prepísať?</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Operácia na sokete nie je podporovaná</translation>
     </message>

diff --git a/translations/qt_sl.ts b/translations/qt_sl.ts
index ed5745a..ba0c7ac 100644 (file)
--- a/translations/qt_sl.ts
+++ b/translations/qt_sl.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Ciljna datoteka obstaja</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Sekvenčna datoteka ne bo preimenovana z uporabo kopiranja blokov</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Ni moč odstraniti izvorne datoteke</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Ni moč odpreti %1 za vhod</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Ni moč odpreti za izhod</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Neuspeh pri zapisovanju bloka</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Ni moč ustvariti %1 za izhod</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,24 +2345,27 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Ni moč najti gostitelja</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
+        <location line="-43"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Neznana vrsta naslova</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Neznana napaka</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>No host name given</source>
         <translation>Podano ni bilo nobeno ime gostitelja</translation>
     </message>
@@ -3245,7 +3227,7 @@ Ali jo kljub temu želite izbrisati?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Napaka pri zapisovanju v %1: %2</translation>
     </message>
@@ -4898,32 +4880,22 @@ Izberite drugo ime datoteke.</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: ključ je prazen</translation>
     </message>
     <message>
-        <location line="-12"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: funkcija ftok ni uspela</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1: ni moč ustvariti ključa</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: ne obstaja</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: UNIX-ova zaklepna datoteka ne obstaja</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+138"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: sistemsko vsiljene omejitve velikosti</translation>
     </message>
@@ -4939,7 +4911,7 @@ Izberite drugo ime datoteke.</translation>
         <translation>%1: ni pripeto</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1: neveljavna velikost</translation>
     </message>
@@ -6518,7 +6490,7 @@ Izberite drugo ime datoteke.</translation>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Dejanje na vtičnici ni podprto</translation>
     </message>

diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts
index dde39fc..c4c28a7 100644 (file)
--- a/translations/qt_sv.ts
+++ b/translations/qt_sv.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,13 +2345,15 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Värden hittades inte</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-98"/>
         <source>No host name given</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2383,12 +2364,13 @@ Vill du ta bort den ändå?</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Okänd adresstyp</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Okänt fel</translation>
     </message>
@@ -3245,7 +3227,7 @@ Vill du ta bort den ändå?</translation>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,22 +4884,12 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4938,7 +4910,7 @@ Please choose a different file name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6517,7 +6489,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts
index fa8d239..23e5ad0 100644 (file)
--- a/translations/qt_uk.ts
+++ b/translations/qt_uk.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation></translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>Файл-отримувач існує</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation>Послідовний файл не буде перейменовано за допомогою блочного копіювання</translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation>Неможливо видалити початковий файл</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>Неможливо відкрити %1 для введення</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>Неможливо відкрити для виводу</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>Збій запису блока</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>Неможливо створити %1 для виводу</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation>Жодний файловий рушій не є доступним або підтримує UnMapExtension</translation>
     </message>
@@ -2366,7 +2345,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+130"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+150"/>
         <source>No host name given</source>
         <translation>Ім&apos;я вузла не задано</translation>
     </message>
@@ -2377,18 +2356,21 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>Невідомий тип адреси</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-124"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>Вузол не знайдено</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-114"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>Невідома помилка</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation>Помилка запису в %1: %2</translation>
     </message>
@@ -4902,33 +4884,23 @@ Do you want to overwrite it?</source>
         <translation>%1: невідома помилка %2</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+104"/>
         <source>%1: unable to make key</source>
         <translation>%1: неможливо створити ключ</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-120"/>
         <source>%1: doesn&apos;t exist</source>
         <translation>%1: не існує</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1: пустий ключ</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation>%1: файл ключа UNIX не існує</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1: збій ftok</translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+81"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1: обмеження розміру встановлені системою</translation>
     </message>
@@ -6518,7 +6490,7 @@ Do you want to overwrite it?</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Непідтримувана для сокета операція</translation>
     </message>

diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts
index c943eac..ea1ce1a 100644 (file)
--- a/translations/qt_zh_CN.ts
+++ b/translations/qt_zh_CN.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>目标文件已存在</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>无法输入 %1 </translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>无法输出</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>写块失败</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>无法创建 %1 </translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,13 +2345,15 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>主机未找到</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-98"/>
         <source>No host name given</source>
         <translation type="unfinished">未指定主机名</translation>
     </message>
@@ -2383,12 +2364,13 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>未知的地址类型</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>未���的错误</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished">写入 %1 错误：%2</translation>
     </message>
@@ -4367,7 +4349,7 @@ Please choose a different file name.</source>
     <message>
         <location filename="../src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp" line="+589"/>
         <source>Error opening database</source>
-        <translation>打开数据库��误</translation>
+        <translation>打开数据库���误</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -4903,22 +4885,12 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1：键是空的</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1：ftok 失败</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1：不能制造键</translation>
     </message>
@@ -4939,7 +4911,7 @@ Please choose a different file name.</source>
         <translation>%1：没有附加</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1：无效大小</translation>
     </message>
@@ -6518,7 +6490,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>socket操作不被支持</translation>
     </message>

diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts
index a0054b5..5ff1ff8 100644 (file)
--- a/translations/qt_zh_TW.ts
+++ b/translations/qt_zh_TW.ts
@@ -1525,7 +1525,7 @@ Script: %3</source>
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+925"/>
+        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+924"/>
         <source>QDial</source>
         <translation>QDial</translation>
     </message>
@@ -1727,13 +1727,12 @@ Script: %3</source>
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/core/io/qfile.cpp" line="+604"/>
-        <location line="+154"/>
+        <location filename="../src/core/io/qfile.cpp" line="+606"/>
         <source>Destination file exists</source>
         <translation>目標檔已存在</translation>
     </message>
     <message>
-        <location line="-139"/>
+        <location line="+15"/>
         <source>Will not rename sequential file using block copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,27 +1742,7 @@ Script: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Cannot open %1 for input</source>
-        <translation>無法開啟 %1 以輸入</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Cannot open for output</source>
-        <translation>無法開啟 %1 以輸出</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failure to write block</source>
-        <translation>寫入區塊時失敗</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Cannot create %1 for output</source>
-        <translation>無法建立 %1 以輸出</translation>
-    </message>
-    <message>
-        <location line="+296"/>
+        <location line="+399"/>
         <source>No file engine available or engine does not support UnMapExtension</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,13 +2345,15 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+198"/>
+        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+119"/>
+        <location line="+12"/>
+        <location line="+86"/>
         <location line="+31"/>
         <source>Host not found</source>
         <translation>找不到主機</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-98"/>
         <source>No host name given</source>
         <translation type="unfinished">未指定主機</translation>
     </message>
@@ -2383,12 +2364,13 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+54"/>
-        <location line="+39"/>
+        <location line="+38"/>
         <source>Unknown address type</source>
         <translation>未知的位址型態</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-109"/>
+        <location line="+117"/>
         <source>Unknown error</source>
         <translation>未知的錯誤</translation>
     </message>
@@ -3245,7 +3227,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QNetworkAccessDebugPipeBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+187"/>
+        <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+182"/>
         <source>Write error writing to %1: %2</source>
         <translation type="unfinished">寫入 %1 時發生錯誤：%2</translation>
     </message>
@@ -4903,22 +4885,12 @@ Please choose a different file name.</source>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+26"/>
+        <location line="+18"/>
         <source>%1: key is empty</source>
         <translation>%1：鍵值是空的</translation>
     </message>
     <message>
-        <location line="-19"/>
-        <source>%1: UNIX key file doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>%1: ftok failed</source>
-        <translation>%1：ftok 失敗</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+63"/>
         <source>%1: unable to make key</source>
         <translation>%1：無法產生鍵值</translation>
     </message>
@@ -4939,7 +4911,7 @@ Please choose a different file name.</source>
         <translation>%1：未附加</translation>
     </message>
     <message>
-        <location line="-261"/>
+        <location line="-253"/>
         <source>%1: invalid size</source>
         <translation>%1：不合法的大小</translation>
     </message>
@@ -6518,7 +6490,7 @@ Please choose a different file name.</source>
     <name>QTcpServer</name>
     <message>
         <location filename="../src/network/socket/qtcpserver.cpp" line="+278"/>
-        <location line="+129"/>
+        <location line="+124"/>
         <source>Operation on socket is not supported</source>
         <translation>Socket 的操作未被支援</translation>
     </message>