diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-18 08:55:12 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-18 08:55:12 (GMT) |
| commit | 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 (patch) | |
| tree | bd512c46f6672a9b359e98b8dd62956072929623 /translations/qt_sv.ts | |
| parent | e018b82432055d9a5f13be7c17e31502830b9fa7 (diff) | |
| download | Qt-5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96.zip Qt-5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96.tar.gz Qt-5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96.tar.bz2 | |
Fix the About Qt dialog text to be truthful, post-LGPL
Update the text of the About Qt dialog, as directed by Legal. Note that
this change breaks string freeze as the text is translatable, however
Legal has decided that shipping legally correct text has priority over
shipping complete translations. This change includes updated .ts files
to correct the source strings, but no updated translations.
This change also removes out-of-date licensing text from the About
dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer.
Those particular changes should not break translations as they only
remove translatable strings and do not modify any others.
Task-number: 247608
Reviewed-by: Trust Me
.....review will be conducted after submission.
Diffstat (limited to 'translations/qt_sv.ts')
| -rw-r--r-- | translations/qt_sv.ts | 574 |
1 files changed, 298 insertions, 276 deletions
diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts index f27480d..1b75722 100644 --- a/translations/qt_sv.ts +++ b/translations/qt_sv.ts @@ -4,7 +4,7 @@ <context> <name>AudioOutput</name> <message> - <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+374"/> + <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+375"/> <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source> <translation type="unfinished"></translation> </message> @@ -22,7 +22,7 @@ <context> <name>CloseButton</name> <message> - <location filename="../src/gui/widgets/qtabbar.cpp" line="+2217"/> + <location filename="../src/gui/widgets/qtabbar.cpp" line="+2251"/> <source>Close Tab</source> <translation type="unfinished"></translation> </message> @@ -89,7 +89,7 @@ <context> <name>Phonon::Gstreamer::MediaObject</name> <message> - <location filename="../src/3rdparty/phonon/gstreamer/mediaobject.cpp" line="+88"/> + <location filename="../src/3rdparty/phonon/gstreamer/mediaobject.cpp" line="+90"/> <source>Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+653"/> - <location line="+9"/> + <location line="+676"/> + <location line="+8"/> <location line="+15"/> - <location line="+7"/> - <location line="+5"/> - <location line="+20"/> - <location line="+317"/> + <location line="+9"/> + <location line="+6"/> + <location line="+19"/> + <location line="+335"/> <location line="+24"/> <source>Could not open media source.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-381"/> + <location line="-403"/> <source>Invalid source type.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+355"/> + <location line="+377"/> <source>Could not locate media source.</source> <translation type="unfinished"></translation> </message> @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed.</source> <context> <name>Q3Accel</name> <message> - <location filename="../src/qt3support/other/q3accel.cpp" line="+451"/> + <location filename="../src/qt3support/other/q3accel.cpp" line="+481"/> <source>%1, %2 not defined</source> <translation>%1, %2 är inte definierad</translation> </message> @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed.</source> <context> <name>Q3DataTable</name> <message> - <location filename="../src/qt3support/sql/q3datatable.cpp" line="+253"/> + <location filename="../src/qt3support/sql/q3datatable.cpp" line="+285"/> <source>True</source> <translation>Sant</translation> </message> @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed.</source> <context> <name>Q3FileDialog</name> <message> - <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+834"/> + <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+864"/> <source>Copy or Move a File</source> <translation>Kopiera eller ta bort en fil</translation> </message> @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed.</source> <location line="-157"/> <location line="+49"/> <location line="+2153"/> - <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+80"/> + <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+110"/> <source>All Files (*)</source> <translation>Alla filer (*)</translation> </message> @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed.</source> <message> <location line="+704"/> <location line="+2100"/> - <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+307"/> + <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+337"/> <source>Open</source> <translation>Öppna</translation> </message> @@ -527,7 +527,7 @@ Kontrollera sökväg och filnamn.</translation> <context> <name>Q3LocalFs</name> <message> - <location filename="../src/qt3support/network/q3localfs.cpp" line="+100"/> + <location filename="../src/qt3support/network/q3localfs.cpp" line="+130"/> <location line="+10"/> <source>Could not read directory %1</source> @@ -577,7 +577,7 @@ till <context> <name>Q3MainWindow</name> <message> - <location filename="../src/qt3support/widgets/q3mainwindow.cpp" line="+2021"/> + <location filename="../src/qt3support/widgets/q3mainwindow.cpp" line="+2051"/> <source>Line up</source> <translation>Rada upp</translation> </message> @@ -590,7 +590,7 @@ till <context> <name>Q3NetworkProtocol</name> <message> - <location filename="../src/qt3support/network/q3networkprotocol.cpp" line="+824"/> + <location filename="../src/qt3support/network/q3networkprotocol.cpp" line="+854"/> <source>Operation stopped by the user</source> <translation>Åtgärden stoppades av användaren</translation> </message> @@ -598,7 +598,7 @@ till <context> <name>Q3ProgressDialog</name> <message> - <location filename="../src/qt3support/dialogs/q3progressdialog.cpp" line="+194"/> + <location filename="../src/qt3support/dialogs/q3progressdialog.cpp" line="+224"/> <location line="+61"/> <source>Cancel</source> <translation>Avbryt</translation> @@ -607,7 +607,7 @@ till <context> <name>Q3TabDialog</name> <message> - <location filename="../src/qt3support/dialogs/q3tabdialog.cpp" line="+159"/> + <location filename="../src/qt3support/dialogs/q3tabdialog.cpp" line="+189"/> <location line="+814"/> <source>OK</source> <translation>OK</translation> @@ -636,7 +636,7 @@ till <context> <name>Q3TextEdit</name> <message> - <location filename="../src/qt3support/text/q3textedit.cpp" line="+5399"/> + <location filename="../src/qt3support/text/q3textedit.cpp" line="+5429"/> <source>&Undo</source> <translation>&Ångra</translation> </message> @@ -675,7 +675,7 @@ till <context> <name>Q3TitleBar</name> <message> - <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+216"/> + <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+246"/> <source>System</source> <translation>System</translation> </message> @@ -743,7 +743,7 @@ till <context> <name>Q3ToolBar</name> <message> - <location filename="../src/qt3support/widgets/q3toolbar.cpp" line="+662"/> + <location filename="../src/qt3support/widgets/q3toolbar.cpp" line="+692"/> <source>More...</source> <translation>Mer...</translation> </message> @@ -751,7 +751,7 @@ till <context> <name>Q3UrlOperator</name> <message> - <location filename="../src/qt3support/network/q3urloperator.cpp" line="+356"/> + <location filename="../src/qt3support/network/q3urloperator.cpp" line="+386"/> <location line="+260"/> <location line="+4"/> <source>The protocol `%1' is not supported</source> @@ -803,7 +803,7 @@ till <context> <name>Q3Wizard</name> <message> - <location filename="../src/qt3support/dialogs/q3wizard.cpp" line="+147"/> + <location filename="../src/qt3support/dialogs/q3wizard.cpp" line="+177"/> <source>&Cancel</source> <translation>&Avbryt</translation> </message> @@ -831,9 +831,9 @@ till <context> <name>QAbstractSocket</name> <message> - <location filename="../src/network/socket/qabstractsocket.cpp" line="+838"/> - <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+585"/> - <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+627"/> + <location filename="../src/network/socket/qabstractsocket.cpp" line="+868"/> + <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+615"/> + <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+657"/> <location line="+26"/> <source>Host not found</source> <translation>Värden hittades inte</translation> @@ -876,7 +876,7 @@ till <context> <name>QAbstractSpinBox</name> <message> - <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1169"/> + <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1199"/> <source>&Step up</source> <translation>&Stega uppåt</translation> </message> @@ -894,12 +894,12 @@ till <context> <name>QApplication</name> <message> - <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+346"/> + <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+376"/> <source>Activate</source> <translation>Aktivera</translation> </message> <message> - <location filename="../src/gui/dialogs/qmessagebox.h" line="+322"/> + <location filename="../src/gui/dialogs/qmessagebox.h" line="+352"/> <source>Executable '%1' requires Qt %2, found Qt %3.</source> <translation>Binären \"%1\" kräver Qt %2, hittade Qt %3.</translation> </message> @@ -909,7 +909,7 @@ till <translation>Inkompatibelt Qt-biblioteksfel</translation> </message> <message> - <location filename="../src/gui/kernel/qapplication.cpp" line="+2212"/> + <location filename="../src/gui/kernel/qapplication.cpp" line="+2248"/> <source>QT_LAYOUT_DIRECTION</source> <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> <translation>LTR</translation> @@ -946,7 +946,7 @@ till <context> <name>QCheckBox</name> <message> - <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+84"/> + <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+114"/> <source>Uncheck</source> <translation>Avkryssa</translation> </message> @@ -964,7 +964,7 @@ till <context> <name>QColorDialog</name> <message> - <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1219"/> + <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1253"/> <source>Hu&e:</source> <translation>Nya&ns:</translation> </message> @@ -1038,13 +1038,13 @@ till <context> <name>QComboBox</name> <message> - <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+1741"/> + <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+1771"/> <location line="+65"/> <source>Open</source> <translation>Öppna</translation> </message> <message> - <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+514"/> + <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+544"/> <source>False</source> <translation type="unfinished">Falskt</translation> </message> @@ -1062,7 +1062,7 @@ till <context> <name>QCoreApplication</name> <message> - <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="+89"/> + <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="+119"/> <source>%1: key is empty</source> <comment>QSystemSemaphore</comment> <translation type="unfinished"></translation> @@ -1083,12 +1083,12 @@ till <context> <name>QDB2Driver</name> <message> - <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1217"/> + <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1276"/> <source>Unable to connect</source> <translation>Kunde inte ansluta</translation> </message> <message> - <location line="+263"/> + <location line="+303"/> <source>Unable to commit transaction</source> <translation>Kunde inte verkställa transaktion</translation> </message> @@ -1106,8 +1106,8 @@ till <context> <name>QDB2Result</name> <message> - <location line="-986"/> - <location line="+242"/> + <location line="-1043"/> + <location line="+243"/> <source>Unable to execute statement</source> <translation>Kunde inte köra frågesats</translation> </message> @@ -1122,7 +1122,7 @@ till <translation>Kunde inte binda variabel</translation> </message> <message> - <location line="+91"/> + <location line="+92"/> <source>Unable to fetch record %1</source> <translation>Kunde inte hämta posten %1</translation> </message> @@ -1140,7 +1140,7 @@ till <context> <name>QDateTimeEdit</name> <message> - <location filename="../src/gui/widgets/qdatetimeedit.cpp" line="+2265"/> + <location filename="../src/gui/widgets/qdatetimeedit.cpp" line="+2295"/> <source>AM</source> <translation>AM</translation> </message> @@ -1163,7 +1163,7 @@ till <context> <name>QDial</name> <message> - <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+921"/> + <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+951"/> <source>QDial</source> <translation type="unfinished"></translation> </message> @@ -1181,7 +1181,7 @@ till <context> <name>QDialog</name> <message> - <location filename="../src/gui/dialogs/qdialog.cpp" line="+567"/> + <location filename="../src/gui/dialogs/qdialog.cpp" line="+597"/> <source>What's This?</source> <translation>Vad är det här?</translation> </message> @@ -1194,9 +1194,9 @@ till <context> <name>QDialogButtonBox</name> <message> - <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1830"/> + <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1865"/> <location line="+464"/> - <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+531"/> + <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+561"/> <source>OK</source> <translation>OK</translation> </message> @@ -1319,7 +1319,7 @@ till <context> <name>QDirModel</name> <message> - <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+423"/> + <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+453"/> <source>Name</source> <translation>Namn</translation> </message> @@ -1349,7 +1349,7 @@ till <context> <name>QDockWidget</name> <message> - <location filename="../src/plugins/accessible/widgets/qaccessiblewidgets.cpp" line="+1209"/> + <location filename="../src/plugins/accessible/widgets/qaccessiblewidgets.cpp" line="+1239"/> <source>Close</source> <translation type="unfinished">Stäng</translation> </message> @@ -1380,7 +1380,7 @@ till <context> <name>QErrorMessage</name> <message> - <location filename="../src/gui/dialogs/qerrormessage.cpp" line="+162"/> + <location filename="../src/gui/dialogs/qerrormessage.cpp" line="+192"/> <source>Debug Message:</source> <translation>Felsökningsmeddelande:</translation> </message> @@ -1408,13 +1408,18 @@ till <context> <name>QFile</name> <message> - <location filename="../src/corelib/io/qfile.cpp" line="+678"/> - <location line="+130"/> + <location filename="../src/corelib/io/qfile.cpp" line="+708"/> + <location line="+141"/> <source>Destination file exists</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="-108"/> + <source>Cannot remove source file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+120"/> <source>Cannot open %1 for input</source> <translation type="unfinished"></translation> </message> @@ -1437,37 +1442,37 @@ till <context> <name>QFileDialog</name> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+484"/> - <location line="+423"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+515"/> + <location line="+444"/> <source>All Files (*)</source> <translation>Alla filer (*)</translation> </message> <message> - <location line="+218"/> + <location line="+222"/> <source>Directories</source> <translation>Kataloger</translation> </message> <message> <location line="-3"/> <location line="+50"/> - <location line="+1440"/> + <location line="+1471"/> <location line="+75"/> <source>&Open</source> <translation>&Öppna</translation> </message> <message> - <location line="-1565"/> + <location line="-1596"/> <location line="+50"/> <source>&Save</source> <translation>&Spara</translation> </message> <message> - <location line="-705"/> + <location line="-730"/> <source>Open</source> <translation>Öppna</translation> </message> <message> - <location line="+1469"/> + <location line="+1515"/> <source>%1 already exists. Do you want to replace it?</source> <translation>%1 finns redan. @@ -1488,7 +1493,7 @@ Kontrollera att det korrekta filnamnet angavs.</translation> <translation>Min dator</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-1458"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-1504"/> <source>&Rename</source> <translation>&Byt namn</translation> </message> @@ -1534,7 +1539,7 @@ Kontrollera att det korrekta filnamnet angavs.</translation> </message> <message> <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+6"/> - <location line="+623"/> + <location line="+648"/> <source>Directory:</source> <translation>Katalog:</translation> </message> @@ -1547,8 +1552,8 @@ Filen hittades inte. Kontrollera att det korrekta filnamnet angavs</translation> </message> <message> - <location line="+773"/> - <location line="+851"/> + <location line="+794"/> + <location line="+862"/> <source>%1 Directory not found. Please verify the correct directory name was given.</source> @@ -1557,7 +1562,7 @@ Katalogen hittades inte. Kontrollera att det korrekta katalognamnet angavs.</translation> </message> <message> - <location line="-217"/> + <location line="-218"/> <source>'%1' is write protected. Do you want to delete it anyway?</source> <translation>\"%1\" är skrivskyddad. @@ -1574,22 +1579,22 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte ta bort katalogen.</translation> </message> <message> - <location line="+406"/> + <location line="+407"/> <source>Recent Places</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog_win.cpp" line="+130"/> + <location filename="../src/gui/dialogs/qfiledialog_win.cpp" line="+160"/> <source>All Files (*.*)</source> <translation>Alla filer (*.*)</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2493"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2550"/> <source>Save As</source> <translation>Spara som</translation> </message> <message> - <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+381"/> + <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+411"/> <source>Drive</source> <translation>Enhet</translation> </message> @@ -1621,29 +1626,29 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished">Framåt</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+1914"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+1970"/> <source>New Folder</source> <translation type="unfinished">Ny mapp</translation> </message> <message> - <location line="-1907"/> + <location line="-1963"/> <source>&New Folder</source> <translation type="unfinished"></translation> </message> <message> - <location line="+631"/> + <location line="+656"/> <location line="+38"/> <source>&Choose</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/dialogs/qsidebar.cpp" line="+388"/> + <location filename="../src/gui/dialogs/qsidebar.cpp" line="+418"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-662"/> - <location line="+627"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-687"/> + <location line="+652"/> <source>File &name:</source> <translation type="unfinished">Fil&namn:</translation> </message> @@ -1663,7 +1668,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QFileSystemModel</name> <message> - <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+707"/> + <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+744"/> <source>%1 TB</source> <translation type="unfinished"></translation> </message> @@ -1725,7 +1730,7 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished">Ändringsdatum</translation> </message> <message> - <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+204"/> + <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+234"/> <source>My Computer</source> <translation type="unfinished">Min dator</translation> </message> @@ -1738,7 +1743,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QFontDatabase</name> <message> - <location filename="../src/gui/text/qfontdatabase.cpp" line="+60"/> + <location filename="../src/gui/text/qfontdatabase.cpp" line="+90"/> <location line="+1176"/> <source>Normal</source> <translation type="unfinished"></translation> @@ -1955,7 +1960,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QFontDialog</name> <message> - <location filename="../src/gui/dialogs/qfontdialog.cpp" line="+742"/> + <location filename="../src/gui/dialogs/qfontdialog.cpp" line="+772"/> <source>&Font</source> <translation>&Typsnitt</translation> </message> @@ -2004,8 +2009,8 @@ Vill du ta bort den ändå?</translation> <context> <name>QFtp</name> <message> - <location filename="../src/network/access/qftp.cpp" line="+796"/> - <location filename="../src/qt3support/network/q3ftp.cpp" line="+653"/> + <location filename="../src/network/access/qftp.cpp" line="+826"/> + <location filename="../src/qt3support/network/q3ftp.cpp" line="+683"/> <source>Not connected</source> <translation>Inte ansluten</translation> </message> @@ -2150,7 +2155,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QHostInfo</name> <message> - <location filename="../src/network/kernel/qhostinfo_p.h" line="+153"/> + <location filename="../src/network/kernel/qhostinfo_p.h" line="+183"/> <source>Unknown error</source> <translation>Okänt fel</translation> </message> @@ -2158,11 +2163,11 @@ Vill du ta bort den ändå?</translation> <context> <name>QHostInfoAgent</name> <message> - <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+148"/> + <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+178"/> <location line="+9"/> <location line="+64"/> <location line="+31"/> - <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+150"/> + <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+180"/> <location line="+9"/> <location line="+40"/> <location line="+27"/> @@ -2188,26 +2193,26 @@ Vill du ta bort den ändå?</translation> <context> <name>QHttp</name> <message> - <location filename="../src/network/access/qhttp.cpp" line="+335"/> + <location filename="../src/network/access/qhttp.cpp" line="+365"/> <source>HTTPS connection requested but SSL support not compiled in</source> <translation type="unfinished"></translation> </message> <message> <location line="+1209"/> - <location line="+816"/> - <location filename="../src/qt3support/network/q3http.cpp" line="+1130"/> + <location line="+820"/> + <location filename="../src/qt3support/network/q3http.cpp" line="+1160"/> <location line="+567"/> <source>Unknown error</source> <translation>Okänt fel</translation> </message> <message> - <location line="-564"/> + <location line="-568"/> <location filename="../src/qt3support/network/q3http.cpp" line="-370"/> <source>Request aborted</source> <translation>Begäran avbröts</translation> </message> <message> - <location line="+575"/> + <location line="+579"/> <location filename="../src/qt3support/network/q3http.cpp" line="+381"/> <source>No server set to connect to</source> <translation>Ingen server inställd att ansluta till</translation> @@ -2225,18 +2230,23 @@ Vill du ta bort den ändå?</translation> <translation>Servern stängde oväntat anslutningen</translation> </message> <message> - <location line="+357"/> + <location line="+179"/> + <source>Unknown authentication method</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+183"/> <source>Error writing response to device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+1712"/> + <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+876"/> <location filename="../src/qt3support/network/q3http.cpp" line="+38"/> <source>Connection refused</source> <translation>Anslutningen nekades</translation> </message> <message> - <location filename="../src/network/access/qhttp.cpp" line="-299"/> + <location filename="../src/network/access/qhttp.cpp" line="-304"/> <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-4"/> <location filename="../src/qt3support/network/q3http.cpp" line="+3"/> <source>Host %1 not found</source> @@ -2257,7 +2267,7 @@ Vill du ta bort den ändå?</translation> <translation>Ogiltig HTTP-svarshuvud</translation> </message> <message> - <location line="+120"/> + <location line="+125"/> <location line="+48"/> <location filename="../src/qt3support/network/q3http.cpp" line="+40"/> <location line="+47"/> @@ -2306,7 +2316,7 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="-133"/> + <location line="-138"/> <source>Connection refused (or timed out)</source> <translation type="unfinished"></translation> </message> @@ -2387,7 +2397,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QIBaseDriver</name> <message> - <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1378"/> + <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1428"/> <source>Error opening database</source> <translation>Fel vid öppning av databas</translation> </message> @@ -2410,7 +2420,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QIBaseResult</name> <message> - <location line="-1077"/> + <location line="-1097"/> <source>Unable to create BLOB</source> <translation>Kunde inte skapa BLOB</translation> </message> @@ -2430,7 +2440,7 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte läsa BLOB</translation> </message> <message> - <location line="+124"/> + <location line="+125"/> <location line="+189"/> <source>Could not find array</source> <translation>Kunde inte hitta kedja</translation> @@ -2500,7 +2510,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QIODevice</name> <message> - <location filename="../src/corelib/global/qglobal.cpp" line="+1830"/> + <location filename="../src/corelib/global/qglobal.cpp" line="+1869"/> <source>Permission denied</source> <translation>Åtkomst nekad</translation> </message> @@ -2520,7 +2530,7 @@ Vill du ta bort den ändå?</translation> <translation>Inget ledigt utrymme på enheten</translation> </message> <message> - <location filename="../src/corelib/io/qiodevice.cpp" line="+1506"/> + <location filename="../src/corelib/io/qiodevice.cpp" line="+1536"/> <source>Unknown error</source> <translation>Okänt fel</translation> </message> @@ -2528,7 +2538,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QInputContext</name> <message> - <location filename="../src/gui/inputmethod/qinputcontextfactory.cpp" line="+212"/> + <location filename="../src/gui/inputmethod/qinputcontextfactory.cpp" line="+242"/> <source>XIM</source> <translation>XIM</translation> </message> @@ -2551,7 +2561,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QInputDialog</name> <message> - <location filename="../src/gui/dialogs/qinputdialog.cpp" line="+193"/> + <location filename="../src/gui/dialogs/qinputdialog.cpp" line="+223"/> <source>Enter a value:</source> <translation type="unfinished"></translation> </message> @@ -2571,7 +2581,7 @@ Vill du ta bort den ändå?</translation> <translation type="obsolete">QLibrary::resolve_sys: Symbolen "%1" är inte definierad i %2 (%3)</translation> </message> <message> - <location filename="../src/corelib/plugin/qlibrary.cpp" line="+348"/> + <location filename="../src/corelib/plugin/qlibrary.cpp" line="+378"/> <source>Could not mmap '%1': %2</source> <translation type="unfinished"></translation> </message> @@ -2587,7 +2597,7 @@ Vill du ta bort den ändå?</translation> </message> <message> <location line="+285"/> - <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+250"/> + <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+280"/> <source>The shared library was not found.</source> <translation type="unfinished"></translation> </message> @@ -2617,8 +2627,8 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished">Okänt fel</translation> </message> <message> - <location filename="../src/corelib/plugin/qlibrary_unix.cpp" line="+179"/> - <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+69"/> + <location filename="../src/corelib/plugin/qlibrary_unix.cpp" line="+209"/> + <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+99"/> <source>Cannot load library %1: %2</source> <translation type="unfinished"></translation> </message> @@ -2638,7 +2648,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QLineEdit</name> <message> - <location filename="../src/gui/widgets/qlineedit.cpp" line="+2649"/> + <location filename="../src/gui/widgets/qlineedit.cpp" line="+2680"/> <source>&Undo</source> <translation>&Ångra</translation> </message> @@ -2676,8 +2686,8 @@ Vill du ta bort den ändå?</translation> <context> <name>QLocalServer</name> <message> - <location filename="../src/network/socket/qlocalserver.cpp" line="+196"/> - <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+201"/> + <location filename="../src/network/socket/qlocalserver.cpp" line="+226"/> + <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+231"/> <source>%1: Name error</source> <translation type="unfinished"></translation> </message> @@ -2693,7 +2703,7 @@ Vill du ta bort den ändå?</translation> </message> <message> <location line="+5"/> - <location filename="../src/network/socket/qlocalserver_win.cpp" line="+127"/> + <location filename="../src/network/socket/qlocalserver_win.cpp" line="+158"/> <source>%1: Unknown error %2</source> <translation type="unfinished"></translation> </message> @@ -2701,8 +2711,8 @@ Vill du ta bort den ändå?</translation> <context> <name>QLocalSocket</name> <message> - <location filename="../src/network/socket/qlocalsocket_tcp.cpp" line="+102"/> - <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+104"/> + <location filename="../src/network/socket/qlocalsocket_tcp.cpp" line="+132"/> + <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+134"/> <source>%1: Connection refused</source> <translation type="unfinished"></translation> </message> @@ -2715,7 +2725,7 @@ Vill du ta bort den ändå?</translation> <message> <location line="+3"/> <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/> - <location filename="../src/network/socket/qlocalsocket_win.cpp" line="+50"/> + <location filename="../src/network/socket/qlocalsocket_win.cpp" line="+80"/> <location line="+43"/> <source>%1: Invalid name</source> <translation type="unfinished"></translation> @@ -2772,7 +2782,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMYSQLDriver</name> <message> - <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1200"/> + <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1231"/> <source>Unable to open database '</source> <translation>Kunde inte öppna databasen \"</translation> </message> @@ -2782,7 +2792,7 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte ansluta</translation> </message> <message> - <location line="+123"/> + <location line="+127"/> <source>Unable to begin transaction</source> <translation>Kunde inte påbörja transaktion</translation> </message> @@ -2800,7 +2810,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMYSQLResult</name> <message> - <location line="-917"/> + <location line="-922"/> <source>Unable to fetch data</source> <translation>Kunde inte hämta data</translation> </message> @@ -2815,7 +2825,7 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte lagra resultat</translation> </message> <message> - <location line="+189"/> + <location line="+190"/> <location line="+8"/> <source>Unable to prepare statement</source> <translation>Kunde inte förbereda frågesats</translation> @@ -2860,7 +2870,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMdiArea</name> <message> - <location filename="../src/gui/widgets/qmdiarea.cpp" line="+260"/> + <location filename="../src/gui/widgets/qmdiarea.cpp" line="+290"/> <source>(Untitled)</source> <translation type="unfinished"></translation> </message> @@ -2868,7 +2878,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMdiSubWindow</name> <message> - <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+250"/> + <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/> <source>%1 - [%2]</source> <translation type="unfinished">%1 - [%2]</translation> </message> @@ -2961,7 +2971,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMenu</name> <message> - <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+127"/> + <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+157"/> <location line="+225"/> <source>Close</source> <translation>Stäng</translation> @@ -2990,7 +3000,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMessageBox</name> <message> - <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1105"/> + <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1110"/> <source>Help</source> <translation>Hjälp</translation> </message> @@ -3003,21 +3013,25 @@ Vill du ta bort den ändå?</translation> <translation>OK</translation> </message> <message> - <location line="+503"/> + <location line="+475"/> + <source><h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>About Qt</source> <translation>Om Qt</translation> </message> <message> - <location line="-15"/> <source><p>This program uses Qt version %1.</p></source> - <translation><p>Detta program använder Qt version %1.</p></translation> + <translation type="obsolete"><p>Detta program använder Qt version %1.</p></translation> </message> <message> <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p></source> <translation type="obsolete"><h3>Om Qt</h3>%1<p>Qt är ett C++-verktygssamling för utveckling av krossplattformsprogram.</p><p>Qt tillhandahåller portabilitet för samma källkod mellan MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, och alla andra stora kommersiella Unix-varianter. Qt finns också tillgängligt för inbäddade enheter som Qtopia Core.</p><p>Qt är en produkt från Trolltech. Se <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> för mer information.</p></translation> </message> <message> - <location line="-1584"/> + <location line="-1604"/> <source>Show Details...</source> <translation>Visa detaljer...</translation> </message> @@ -3026,21 +3040,11 @@ Vill du ta bort den ändå?</translation> <source>Hide Details...</source> <translation>Dölj detaljer,,,</translation> </message> - <message> - <location line="+1570"/> - <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source><p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>QMultiInputContext</name> <message> - <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp" line="+58"/> + <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp" line="+88"/> <source>Select IM</source> <translation>Välj inmatningsmetod</translation> </message> @@ -3048,7 +3052,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QMultiInputContextPlugin</name> <message> - <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp" line="+65"/> + <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp" line="+95"/> <source>Multiple input method switcher</source> <translation>Växlare för flera inmatningsmetoder</translation> </message> @@ -3061,7 +3065,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QNativeSocketEngine</name> <message> - <location filename="../src/network/socket/qnativesocketengine.cpp" line="+176"/> + <location filename="../src/network/socket/qnativesocketengine.cpp" line="+206"/> <source>The remote host closed the connection</source> <translation>Fjärrvärden stängde anslutningen</translation> </message> @@ -3194,7 +3198,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QNetworkAccessCacheBackend</name> <message> - <location filename="../src/network/access/qnetworkaccesscachebackend.cpp" line="+35"/> + <location filename="../src/network/access/qnetworkaccesscachebackend.cpp" line="+65"/> <source>Error opening %1</source> <translation type="unfinished"></translation> </message> @@ -3202,7 +3206,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QNetworkAccessFileBackend</name> <message> - <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+69"/> + <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+99"/> <source>Request for opening non-local file %1</source> <translation type="unfinished"></translation> </message> @@ -3230,7 +3234,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QNetworkAccessFtpBackend</name> <message> - <location filename="../src/network/access/qnetworkaccessftpbackend.cpp" line="+135"/> + <location filename="../src/network/access/qnetworkaccessftpbackend.cpp" line="+165"/> <source>No suitable proxy found</source> <translation type="unfinished"></translation> </message> @@ -3240,7 +3244,7 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+130"/> <source>Logging in to %1 failed: authentication required</source> <translation type="unfinished"></translation> </message> @@ -3258,7 +3262,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QNetworkAccessHttpBackend</name> <message> - <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+565"/> + <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+597"/> <source>No suitable proxy found</source> <translation type="unfinished"></translation> </message> @@ -3271,7 +3275,7 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+37"/> + <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+68"/> <source>Protocol "%1" is unknown</source> <translation type="unfinished"></translation> </message> @@ -3279,7 +3283,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QNetworkReplyImpl</name> <message> - <location line="+422"/> + <location line="+432"/> <location line="+22"/> <source>Operation canceled</source> <translation type="unfinished"></translation> @@ -3288,7 +3292,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QOCIDriver</name> <message> - <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+2027"/> + <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+2069"/> <source>Unable to logon</source> <translation>Kunde inte logga in</translation> </message> @@ -3317,7 +3321,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QOCIResult</name> <message> - <location line="-976"/> + <location line="-963"/> <location line="+161"/> <location line="+15"/> <source>Unable to bind column for batch execute</source> @@ -3344,18 +3348,16 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte förbereda frågesats</translation> </message> <message> - <location line="+29"/> - <location line="+37"/> + <location line="+36"/> <source>Unable to bind value</source> <translation>Kunde inte binda värde</translation> </message> <message> - <location line="-20"/> <source>Unable to execute select statement</source> - <translation>Kunde inte köra \"select\"-frågesats</translation> + <translation type="obsolete">Kunde inte köra \"select\"-frågesats</translation> </message> <message> - <location line="+32"/> + <location line="+19"/> <source>Unable to execute statement</source> <translation>Kunde inte köra frågesats</translation> </message> @@ -3363,7 +3365,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QODBCDriver</name> <message> - <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1657"/> + <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1785"/> <source>Unable to connect</source> <translation>Kunde inte ansluta</translation> </message> @@ -3373,7 +3375,7 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte ansluta - Drivrutinen har inte stöd för all nödvändig funktionalitet</translation> </message> <message> - <location line="+234"/> + <location line="+242"/> <source>Unable to disable autocommit</source> <translation>Kunde inte inaktivera automatisk verkställning</translation> </message> @@ -3396,19 +3398,19 @@ Vill du ta bort den ändå?</translation> <context> <name>QODBCResult</name> <message> - <location line="-1204"/> + <location line="-1218"/> <location line="+349"/> <source>QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration</source> <translation>QODBCResult::reset: Kunde inte ställa in \"SQL_CURSOR_STATIC\" som frågesatsattribut. Kontrollera konfigurationen för din ODBC-drivrutin</translation> </message> <message> <location line="-332"/> - <location line="+625"/> + <location line="+626"/> <source>Unable to execute statement</source> <translation>Kunde inte köra frågesats</translation> </message> <message> - <location line="-554"/> + <location line="-555"/> <source>Unable to fetch next</source> <translation>Kunde inte hämta nästa</translation> </message> @@ -3418,19 +3420,19 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte förbereda frågesats</translation> </message> <message> - <location line="+267"/> + <location line="+268"/> <source>Unable to bind variable</source> <translation>Kunde inte binda variabel</translation> </message> <message> <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+194"/> - <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-474"/> - <location line="+577"/> + <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-475"/> + <location line="+578"/> <source>Unable to fetch last</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-671"/> + <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-672"/> <source>Unable to fetch</source> <translation type="unfinished"></translation> </message> @@ -3448,12 +3450,12 @@ Vill du ta bort den ändå?</translation> <context> <name>QObject</name> <message> - <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+134"/> + <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+165"/> <source>Home</source> <translation type="unfinished">Home</translation> </message> <message> - <location filename="../src/network/access/qnetworkaccessdatabackend.cpp" line="+44"/> + <location filename="../src/network/access/qnetworkaccessdatabackend.cpp" line="+74"/> <source>Operation not supported on %1</source> <translation type="unfinished"></translation> </message> @@ -3463,7 +3465,7 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+145"/> + <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+175"/> <source>Write error writing to %1: %2</source> <translation type="unfinished"></translation> </message> @@ -3488,7 +3490,7 @@ Vill du ta bort den ändå?</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/network/kernel/qhostinfo.cpp" line="+147"/> + <location filename="../src/network/kernel/qhostinfo.cpp" line="+177"/> <location line="+57"/> <source>No host name given</source> <translation type="unfinished"></translation> @@ -3497,7 +3499,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QPPDOptionsModel</name> <message> - <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1165"/> + <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1195"/> <source>Name</source> <translation type="unfinished">Namn</translation> </message> @@ -3510,7 +3512,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QPSQLDriver</name> <message> - <location filename="../src/sql/drivers/psql/qsql_psql.cpp" line="+732"/> + <location filename="../src/sql/drivers/psql/qsql_psql.cpp" line="+763"/> <source>Unable to connect</source> <translation>Kunde inte ansluta</translation> </message> @@ -3530,7 +3532,7 @@ Vill du ta bort den ändå?</translation> <translation>Kunde inte rulla tillbaka transaktion</translation> </message> <message> - <location line="+336"/> + <location line="+358"/> <source>Unable to subscribe</source> <translation type="unfinished"></translation> </message> @@ -3543,12 +3545,12 @@ Vill du ta bort den ändå?</translation> <context> <name>QPSQLResult</name> <message> - <location line="-1035"/> + <location line="-1058"/> <source>Unable to create query</source> <translation>Kunde inte skapa fråga</translation> </message> <message> - <location line="+373"/> + <location line="+374"/> <source>Unable to prepare statement</source> <translation type="unfinished">Kunde inte förbereda frågesats</translation> </message> @@ -3556,7 +3558,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QPageSetupWidget</name> <message> - <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="+274"/> + <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="+304"/> <source>Centimeters (cm)</source> <translation type="unfinished"></translation> </message> @@ -3672,7 +3674,7 @@ Vill du ta bort den ändå?</translation> <context> <name>QPrintDialog</name> <message> - <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+68"/> + <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+98"/> <source>locally connected</source> <translation>lokalt ansluten</translation> </message> @@ -3697,7 +3699,7 @@ Vill du ta bort den ändå?</translation> <translation type="obsolete">Liggande</translation> </message> <message> - <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+299"/> + <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+329"/> <source>A0 (841 x 1189 mm)</source> <translation>A0 (841 x 1189 mm)</translation> </message> @@ -3847,7 +3849,7 @@ Vill du ta bort den ändå?</translation> <translation>US Common #10 Envelope (105 x 241 mm)</translation> </message> <message> - <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+238"/> + <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+268"/> <source>OK</source> <translation>OK</translation> </message> @@ -3868,7 +3870,7 @@ Vill du ta bort den ändå?</translation> <translation type="obsolete">Papperskälla:</translation> </message> <message> - <location filename="../src/gui/dialogs/qabstractprintdialog.cpp" line="+80"/> + <location filename="../src/gui/dialogs/qabstractprintdialog.cpp" line="+110"/> <location line="+13"/> <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="-2"/> <source>Print</source> @@ -4200,13 +4202,13 @@ Please choose a different file name.</source> <context> <name>QPrintPreviewDialog</name> <message> - <location filename="../src/gui/dialogs/qabstractpagesetupdialog.cpp" line="+38"/> + <location filename="../src/gui/dialogs/qabstractpagesetupdialog.cpp" line="+68"/> <location line="+12"/> <source>Page Setup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+222"/> + <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+252"/> <source>%1%</source> <translation type="unfinished"></translation> </message> @@ -4488,8 +4490,8 @@ Please choose a different file name.</source> <context> <name>QProcess</name> <message> - <location filename="../src/corelib/io/qprocess_unix.cpp" line="+445"/> - <location filename="../src/corelib/io/qprocess_win.cpp" line="+117"/> + <location filename="../src/corelib/io/qprocess_unix.cpp" line="+475"/> + <location filename="../src/corelib/io/qprocess_win.cpp" line="+147"/> <source>Could not open input redirection for reading</source> <translation type="unfinished"></translation> </message> @@ -4518,7 +4520,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/corelib/io/qprocess.cpp" line="+503"/> + <location filename="../src/corelib/io/qprocess.cpp" line="+533"/> <location line="+52"/> <location filename="../src/corelib/io/qprocess_win.cpp" line="-211"/> <location line="+50"/> @@ -4538,6 +4540,11 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> + <location line="+912"/> + <source>No program defined</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/corelib/io/qprocess_win.cpp" line="-341"/> <source>Process failed to start</source> <translation type="unfinished"></translation> @@ -4546,7 +4553,7 @@ Please choose a different file name.</source> <context> <name>QProgressDialog</name> <message> - <location filename="../src/gui/dialogs/qprogressdialog.cpp" line="+152"/> + <location filename="../src/gui/dialogs/qprogressdialog.cpp" line="+182"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -4570,7 +4577,7 @@ Please choose a different file name.</source> <context> <name>QRegExp</name> <message> - <location filename="../src/corelib/tools/qregexp.cpp" line="+34"/> + <location filename="../src/corelib/tools/qregexp.cpp" line="+64"/> <source>no error occurred</source> <translation>inga fel inträffade</translation> </message> @@ -4618,7 +4625,7 @@ Please choose a different file name.</source> <context> <name>QSQLite2Driver</name> <message> - <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+353"/> + <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+396"/> <source>Error to open database</source> <translation>Fel vid öppning av databas</translation> </message> @@ -4641,12 +4648,12 @@ Please choose a different file name.</source> <context> <name>QSQLite2Result</name> <message> - <location line="-310"/> + <location line="-323"/> <source>Unable to fetch results</source> <translation>Kunde inte hämta resultat</translation> </message> <message> - <location line="+139"/> + <location line="+147"/> <source>Unable to execute statement</source> <translation>Kunde inte köra frågesats</translation> </message> @@ -4654,7 +4661,7 @@ Please choose a different file name.</source> <context> <name>QSQLiteDriver</name> <message> - <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+498"/> + <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+528"/> <source>Error opening database</source> <translation>Fel vid öppning av databas</translation> </message> @@ -4721,12 +4728,12 @@ Please choose a different file name.</source> <context> <name>QScrollBar</name> <message> - <location filename="../src/gui/widgets/qscrollbar.cpp" line="+419"/> + <location filename="../src/gui/widgets/qscrollbar.cpp" line="+448"/> <source>Scroll here</source> <translation>Rulla här</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Left edge</source> <translation>Vänsterkant</translation> </message> @@ -4736,7 +4743,7 @@ Please choose a different file name.</source> <translation>Överkant</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Right edge</source> <translation>Högerkant</translation> </message> @@ -4746,7 +4753,7 @@ Please choose a different file name.</source> <translation>Nederkant</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Page left</source> <translation>Sida vänster</translation> </message> @@ -4757,7 +4764,7 @@ Please choose a different file name.</source> <translation>Sida uppåt</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Page right</source> <translation>Sida höger</translation> </message> @@ -4768,7 +4775,7 @@ Please choose a different file name.</source> <translation>Sida nedåt</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Scroll left</source> <translation>Rulla vänster</translation> </message> @@ -4778,7 +4785,7 @@ Please choose a different file name.</source> <translation>Rulla uppåt</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Scroll right</source> <translation>Rulla höger</translation> </message> @@ -4806,7 +4813,7 @@ Please choose a different file name.</source> <context> <name>QSharedMemory</name> <message> - <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="+177"/> + <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="+207"/> <source>%1: unable to set key on lock</source> <translation type="unfinished"></translation> </message> @@ -4817,7 +4824,7 @@ Please choose a different file name.</source> </message> <message> <location line="+168"/> - <location filename="../src/corelib/kernel/qsharedmemory_p.h" line="+118"/> + <location filename="../src/corelib/kernel/qsharedmemory_p.h" line="+148"/> <source>%1: unable to lock</source> <translation type="unfinished"></translation> </message> @@ -4827,8 +4834,8 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+48"/> - <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+57"/> + <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+78"/> + <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+87"/> <source>%1: permission denied</source> <translation type="unfinished"></translation> </message> @@ -4906,7 +4913,7 @@ Please choose a different file name.</source> <context> <name>QShortcut</name> <message> - <location filename="../src/gui/kernel/qkeysequence.cpp" line="+343"/> + <location filename="../src/gui/kernel/qkeysequence.cpp" line="+373"/> <source>Space</source> <translation>Mellanslag</translation> </message> @@ -5491,7 +5498,7 @@ Please choose a different file name.</source> <context> <name>QSql</name> <message> - <location filename="../src/qt3support/sql/q3sqlmanager_p.cpp" line="+860"/> + <location filename="../src/qt3support/sql/q3sqlmanager_p.cpp" line="+890"/> <source>Delete</source> <translation>Ta bort</translation> </message> @@ -5548,7 +5555,7 @@ Please choose a different file name.</source> <context> <name>QSslSocket</name> <message> - <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+539"/> + <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+569"/> <source>Unable to write data: %1</source> <translation type="unfinished"></translation> </message> @@ -5607,7 +5614,7 @@ Please choose a different file name.</source> <name>QSystemSemaphore</name> <message> <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="-41"/> - <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+36"/> + <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+66"/> <source>%1: out of resources</source> <translation type="unfinished"></translation> </message> @@ -5637,7 +5644,7 @@ Please choose a different file name.</source> <context> <name>QTDSDriver</name> <message> - <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+552"/> + <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+584"/> <source>Unable to open connection</source> <translation>Kunde inte öppna anslutning</translation> </message> @@ -5667,7 +5674,7 @@ Please choose a different file name.</source> <translation type="obsolete">Uttagsåtgärd stöds inte</translation> </message> <message> - <location filename="../src/network/socket/qtcpserver.cpp" line="+252"/> + <location filename="../src/network/socket/qtcpserver.cpp" line="+282"/> <source>Operation on socket is not supported</source> <translation type="unfinished"></translation> </message> @@ -5675,7 +5682,7 @@ Please choose a different file name.</source> <context> <name>QTextControl</name> <message> - <location filename="../src/gui/text/qtextcontrol.cpp" line="+1942"/> + <location filename="../src/gui/text/qtextcontrol.cpp" line="+1973"/> <source>&Undo</source> <translation>&Ångra</translation> </message> @@ -5733,7 +5740,7 @@ Please choose a different file name.</source> <context> <name>QUdpSocket</name> <message> - <location filename="../src/network/socket/qudpsocket.cpp" line="+139"/> + <location filename="../src/network/socket/qudpsocket.cpp" line="+169"/> <source>This platform does not support IPv6</source> <translation>Denna plattform saknar stöd för IPv6</translation> </message> @@ -5741,7 +5748,7 @@ Please choose a different file name.</source> <context> <name>QUndoGroup</name> <message> - <location filename="../src/gui/util/qundogroup.cpp" line="+356"/> + <location filename="../src/gui/util/qundogroup.cpp" line="+386"/> <source>Undo</source> <translation>Ångra</translation> </message> @@ -5754,7 +5761,7 @@ Please choose a different file name.</source> <context> <name>QUndoModel</name> <message> - <location filename="../src/gui/util/qundoview.cpp" line="+71"/> + <location filename="../src/gui/util/qundoview.cpp" line="+101"/> <source><empty></source> <translation><tom></translation> </message> @@ -5762,7 +5769,7 @@ Please choose a different file name.</source> <context> <name>QUndoStack</name> <message> - <location filename="../src/gui/util/qundostack.cpp" line="+804"/> + <location filename="../src/gui/util/qundostack.cpp" line="+834"/> <source>Undo</source> <translation>Ångra</translation> </message> @@ -5833,7 +5840,7 @@ Please choose a different file name.</source> <context> <name>QWebFrame</name> <message> - <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+686"/> + <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+692"/> <source>Request cancelled</source> <translation type="unfinished"></translation> </message> @@ -6243,7 +6250,7 @@ Please choose a different file name.</source> </translation> </message> <message> - <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1342"/> + <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1322"/> <source>JavaScript Alert - %1</source> <translation type="unfinished"></translation> </message> @@ -6319,6 +6326,11 @@ Please choose a different file name.</source> </message> <message> <location line="+3"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Select to the next character</source> <translation type="unfinished"></translation> </message> @@ -6387,11 +6399,21 @@ Please choose a different file name.</source> <source>Delete to the end of the word</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+33"/> + <source>Insert a new paragraph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Insert a new line</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QWhatsThisAction</name> <message> - <location filename="../src/gui/kernel/qwhatsthis.cpp" line="+492"/> + <location filename="../src/gui/kernel/qwhatsthis.cpp" line="+522"/> <source>What's This?</source> <translation>Vad är det här?</translation> </message> @@ -6399,7 +6421,7 @@ Please choose a different file name.</source> <context> <name>QWidget</name> <message> - <location filename="../src/gui/kernel/qwidget.cpp" line="+5290"/> + <location filename="../src/gui/kernel/qwidget.cpp" line="+5326"/> <source>*</source> <translation>*</translation> </message> @@ -6407,7 +6429,7 @@ Please choose a different file name.</source> <context> <name>QWizard</name> <message> - <location filename="../src/gui/dialogs/qwizard.cpp" line="+605"/> + <location filename="../src/gui/dialogs/qwizard.cpp" line="+637"/> <source>Go Back</source> <translation type="unfinished"></translation> </message> @@ -6465,7 +6487,7 @@ Please choose a different file name.</source> <context> <name>QWorkspace</name> <message> - <location filename="../src/gui/widgets/qworkspace.cpp" line="+1064"/> + <location filename="../src/gui/widgets/qworkspace.cpp" line="+1094"/> <source>&Restore</source> <translation>Åte&rställ</translation> </message> @@ -6535,7 +6557,7 @@ Please choose a different file name.</source> <context> <name>QXml</name> <message> - <location filename="../src/xml/sax/qxml.cpp" line="+28"/> + <location filename="../src/xml/sax/qxml.cpp" line="+58"/> <source>no error occurred</source> <translation>inga fel inträffade</translation> </message> @@ -6653,8 +6675,8 @@ Please choose a different file name.</source> <context> <name>QXmlStream</name> <message> - <location filename="../src/corelib/xml/qxmlstream.cpp" line="+562"/> - <location filename="../src/corelib/xml/qxmlstream_p.h" line="+1739"/> + <location filename="../src/corelib/xml/qxmlstream.cpp" line="+592"/> + <location filename="../src/corelib/xml/qxmlstream_p.h" line="+1769"/> <source>Extra content at end of document.</source> <translation type="unfinished"></translation> </message> @@ -6838,7 +6860,7 @@ Please choose a different file name.</source> <context> <name>QtXmlPatterns</name> <message> - <location filename="../src/xmlpatterns/acceltree/qacceltreebuilder.cpp" line="+175"/> + <location filename="../src/xmlpatterns/acceltree/qacceltreebuilder.cpp" line="+205"/> <source>An %1-attribute with value %2 has already been declared.</source> <translation type="unfinished"></translation> </message> @@ -6848,12 +6870,12 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/api/qiodevicedelegate.cpp" line="+54"/> + <location filename="../src/xmlpatterns/api/qiodevicedelegate.cpp" line="+84"/> <source>Network timeout.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+290"/> + <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+320"/> <source>Element %1 can't be serialized because it appears outside the document element.</source> <translation type="unfinished"></translation> </message> @@ -6863,7 +6885,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qabstractdatetime.cpp" line="+50"/> + <location filename="../src/xmlpatterns/data/qabstractdatetime.cpp" line="+80"/> <source>Year %1 is invalid because it begins with %2.</source> <translation type="unfinished"></translation> </message> @@ -6903,7 +6925,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qabstractduration.cpp" line="+69"/> + <location filename="../src/xmlpatterns/data/qabstractduration.cpp" line="+99"/> <location line="+15"/> <source>At least one component must be present.</source> <translation type="unfinished"></translation> @@ -6914,7 +6936,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qabstractfloatmathematician.cpp" line="+34"/> + <location filename="../src/xmlpatterns/data/qabstractfloatmathematician.cpp" line="+64"/> <source>No operand in an integer division, %1, can be %2.</source> <translation type="unfinished"></translation> </message> @@ -6929,17 +6951,17 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qanyuri_p.h" line="+102"/> + <location filename="../src/xmlpatterns/data/qanyuri_p.h" line="+132"/> <source>%1 is not a valid value of type %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qatomiccasters_p.h" line="+193"/> + <location filename="../src/xmlpatterns/data/qatomiccasters_p.h" line="+223"/> <source>When casting to %1 from %2, the source value cannot be %3.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="+35"/> + <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="+65"/> <source>Integer division (%1) by zero (%2) is undefined.</source> <translation type="unfinished"></translation> </message> @@ -6970,17 +6992,17 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qatomicvalue.cpp" line="+49"/> + <location filename="../src/xmlpatterns/data/qatomicvalue.cpp" line="+79"/> <source>A value of type %1 cannot have an Effective Boolean Value.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qboolean.cpp" line="+48"/> + <location filename="../src/xmlpatterns/data/qboolean.cpp" line="+78"/> <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qderivedinteger_p.h" line="+372"/> + <location filename="../src/xmlpatterns/data/qderivedinteger_p.h" line="+402"/> <source>Value %1 of type %2 exceeds maximum (%3).</source> <translation type="unfinished"></translation> </message> @@ -6990,7 +7012,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/data/qhexbinary.cpp" line="+61"/> + <location filename="../src/xmlpatterns/data/qhexbinary.cpp" line="+91"/> <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source> <translation type="unfinished"></translation> </message> @@ -7000,7 +7022,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qarithmeticexpression.cpp" line="+177"/> + <location filename="../src/xmlpatterns/expr/qarithmeticexpression.cpp" line="+207"/> <source>Operator %1 cannot be used on type %2.</source> <translation type="unfinished"></translation> </message> @@ -7010,7 +7032,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qattributenamevalidator.cpp" line="+36"/> + <location filename="../src/xmlpatterns/expr/qattributenamevalidator.cpp" line="+66"/> <source>The namespace URI in the name for a computed attribute cannot be %1.</source> <translation type="unfinished"></translation> </message> @@ -7020,7 +7042,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+58"/> + <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+88"/> <source>Type error in cast, expected %1, received %2.</source> <translation type="unfinished"></translation> </message> @@ -7030,7 +7052,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcastingplatform.cpp" line="+104"/> + <location filename="../src/xmlpatterns/expr/qcastingplatform.cpp" line="+134"/> <source>No casting is possible with %1 as the target type.</source> <translation type="unfinished"></translation> </message> @@ -7055,7 +7077,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+37"/> + <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+67"/> <source>A comment cannot contain %1</source> <translation type="unfinished"></translation> </message> @@ -7065,7 +7087,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcomparisonplatform.cpp" line="+137"/> + <location filename="../src/xmlpatterns/expr/qcomparisonplatform.cpp" line="+167"/> <source>No comparisons can be done involving the type %1.</source> <translation type="unfinished"></translation> </message> @@ -7075,12 +7097,12 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qdocumentcontentvalidator.cpp" line="+56"/> + <location filename="../src/xmlpatterns/expr/qdocumentcontentvalidator.cpp" line="+86"/> <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qexpressionfactory.cpp" line="+139"/> + <location filename="../src/xmlpatterns/expr/qexpressionfactory.cpp" line="+169"/> <source>A library module cannot be evaluated directly. It must be imported from a main module.</source> <translation type="unfinished"></translation> </message> @@ -7090,7 +7112,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qgenericpredicate.cpp" line="+76"/> + <location filename="../src/xmlpatterns/expr/qgenericpredicate.cpp" line="+106"/> <source>A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.</source> <translation type="unfinished"></translation> </message> @@ -7100,7 +7122,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="+83"/> + <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="+113"/> <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid.</source> <translation type="unfinished"></translation> </message> @@ -7110,33 +7132,33 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qpath.cpp" line="+79"/> + <location filename="../src/xmlpatterns/expr/qpath.cpp" line="+109"/> <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp" line="+54"/> + <location filename="../src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp" line="+84"/> <source>The data of a processing instruction cannot contain the string %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qqnameconstructor.cpp" line="+52"/> + <location filename="../src/xmlpatterns/expr/qqnameconstructor.cpp" line="+82"/> <source>No namespace binding exists for the prefix %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qqnameconstructor_p.h" line="+126"/> + <location filename="../src/xmlpatterns/expr/qqnameconstructor_p.h" line="+156"/> <source>No namespace binding exists for the prefix %1 in %2</source> <translation type="unfinished"></translation> </message> <message> <location line="+12"/> - <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+39"/> + <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+69"/> <source>%1 is an invalid %2</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/xmlpatterns/functions/qabstractfunctionfactory.cpp" line="+47"/> + <location filename="../src/xmlpatterns/functions/qabstractfunctionfactory.cpp" line="+77"/> <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -7150,7 +7172,7 @@ Please choose a different file name.</source> </translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qaggregatefns.cpp" line="+90"/> + <location filename="../src/xmlpatterns/functions/qaggregatefns.cpp" line="+120"/> <source>The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.</source> <translation type="unfinished"></translation> </message> @@ -7165,27 +7187,27 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qassemblestringfns.cpp" line="+58"/> + <location filename="../src/xmlpatterns/functions/qassemblestringfns.cpp" line="+88"/> <source>%1 is not a valid XML 1.0 character.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qcomparingaggregator.cpp" line="+167"/> + <location filename="../src/xmlpatterns/functions/qcomparingaggregator.cpp" line="+197"/> <source>The first argument to %1 cannot be of type %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qdatetimefn.cpp" line="+56"/> + <location filename="../src/xmlpatterns/functions/qdatetimefn.cpp" line="+86"/> <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qerrorfn.cpp" line="+31"/> + <location filename="../src/xmlpatterns/functions/qerrorfn.cpp" line="+61"/> <source>%1 was called.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="+64"/> + <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="+94"/> <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source> <translation type="unfinished"></translation> </message> @@ -7200,7 +7222,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="+62"/> + <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="+92"/> <source>%1 matches newline characters</source> <translation type="unfinished"></translation> </message> @@ -7235,17 +7257,17 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+317"/> + <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+347"/> <source>It will not be possible to retrieve %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qcontextnodechecker.cpp" line="+24"/> + <location filename="../src/xmlpatterns/functions/qcontextnodechecker.cpp" line="+54"/> <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qsequencegeneratingfns.cpp" line="+249"/> + <location filename="../src/xmlpatterns/functions/qsequencegeneratingfns.cpp" line="+279"/> <source>The default collection is undefined</source> <translation type="unfinished"></translation> </message> @@ -7255,12 +7277,12 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qstringvaluefns.cpp" line="+222"/> + <location filename="../src/xmlpatterns/functions/qstringvaluefns.cpp" line="+252"/> <source>The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+57"/> + <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+87"/> <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source> <translation type="unfinished"></translation> </message> @@ -7270,17 +7292,17 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/janitors/qcardinalityverifier.cpp" line="+28"/> + <location filename="../src/xmlpatterns/janitors/qcardinalityverifier.cpp" line="+58"/> <source>Required cardinality is %1; got cardinality %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/janitors/qitemverifier.cpp" line="+37"/> + <location filename="../src/xmlpatterns/janitors/qitemverifier.cpp" line="+67"/> <source>The item %1 did not match the required type %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+319"/> + <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+379"/> <location line="+7253"/> <source>%1 is an unknown schema type.</source> <translation type="unfinished"></translation> @@ -7301,7 +7323,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/parser/qparsercontext.cpp" line="+63"/> + <location filename="../src/xmlpatterns/parser/qparsercontext.cpp" line="+93"/> <source>The variable %1 is unused</source> <translation type="unfinished"></translation> </message> @@ -7583,7 +7605,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/type/qcardinality.cpp" line="+25"/> + <location filename="../src/xmlpatterns/type/qcardinality.cpp" line="+55"/> <source>empty</source> <translation type="unfinished"></translation> </message> @@ -7608,7 +7630,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="+33"/> + <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="+63"/> <source>Required type is %1, but %2 was found.</source> <translation type="unfinished"></translation> </message> @@ -7623,7 +7645,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/utils/qoutputvalidator.cpp" line="+56"/> + <location filename="../src/xmlpatterns/utils/qoutputvalidator.cpp" line="+86"/> <source>It's not possible to add attributes after any other kind of node.</source> <translation type="unfinished"></translation> </message> @@ -7633,12 +7655,12 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/utils/qxpathhelper_p.h" line="+90"/> + <location filename="../src/xmlpatterns/utils/qxpathhelper_p.h" line="+120"/> <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp" line="+284"/> + <location filename="../src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp" line="+314"/> <source>%1 is an unsupported encoding.</source> <translation type="unfinished"></translation> </message> @@ -7653,13 +7675,13 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qapplytemplate.cpp" line="+89"/> + <location filename="../src/xmlpatterns/expr/qapplytemplate.cpp" line="+119"/> <source>Ambiguous rule match.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp" line="+39"/> - <source>In a namespace constructor, the value for a namespace value cannot be an empty string.</source> + <location filename="../src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp" line="+69"/> + <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source> <translation type="unfinished"></translation> </message> <message> @@ -7678,12 +7700,12 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qevaluationcache.cpp" line="+87"/> + <location filename="../src/xmlpatterns/expr/qevaluationcache.cpp" line="+117"/> <source>Circularity detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qtemplate.cpp" line="+115"/> + <location filename="../src/xmlpatterns/expr/qtemplate.cpp" line="+145"/> <source>The parameter %1 is required, but no corresponding %2 is supplied.</source> <translation type="unfinished"></translation> </message> @@ -7693,12 +7715,12 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qunparsedtextfn.cpp" line="+35"/> + <location filename="../src/xmlpatterns/functions/qunparsedtextfn.cpp" line="+65"/> <source>The URI cannot have a fragment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/parser/qxslttokenizer.cpp" line="+489"/> + <location filename="../src/xmlpatterns/parser/qxslttokenizer.cpp" line="+519"/> <source>Element %1 is not allowed at this location.</source> <translation type="unfinished"></translation> </message> @@ -7753,7 +7775,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/xmlpatterns/parser/qmaintainingreader.cpp" line="+153"/> + <location filename="../src/xmlpatterns/parser/qmaintainingreader.cpp" line="+183"/> <source>Attribute %1 cannot appear on the element %2. Only the standard attributes can appear.</source> <translation type="unfinished"></translation> </message> @@ -7828,7 +7850,7 @@ Please choose a different file name.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+432"/> + <location line="+434"/> <source>Element %1 cannot have a sequence constructor.</source> <translation type="unfinished"></translation> </message> |