diff options
70 files changed, 825 insertions, 447 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 9248ab8..6084550 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -30,7 +30,7 @@ contains(QT_BUILD_PARTS, tools):{ wince*: SUBDIRS += demos_sqlbrowser } } -contains(QT_CONFIG, phonon)!static:SUBDIRS += demos_mediaplayer +contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):SUBDIRS += demos_browser # install diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2 index a772bf7..3180b7c 100644 --- a/dist/changes-4.5.2 +++ b/dist/changes-4.5.2 @@ -78,7 +78,17 @@ Qt for Windows CE - Designer - + * [248769] Fixed a bug affecting the display of keyboard shortcuts in + the detailed view of the action editor. + * [251092] Fixed a bug preventing entering local file names for QUrl-type + properties on Windows. + * [251691] Fixed dynamic re-translation of table headers. + * [252251] Improved readability of the property editor when using the + KDE Obsidian Coast theme. + * [253236] Fixed a regression bug triggered by forms with a size policy + of 'Fixed' on the main cointainer. + * [253278] Made it possible to set QString-type properties using + QDesignerFormWindowCursor::setProperty(). - Linguist - Linguist GUI @@ -95,7 +105,8 @@ Qt for Windows CE - uic - + * [252333] Fixed a regression crash triggered by using icons with + different pixmaps for QIcon states. - uic3 diff --git a/doc/src/accessible.qdoc b/doc/src/accessible.qdoc index 090da86..ad9f4f1 100644 --- a/doc/src/accessible.qdoc +++ b/doc/src/accessible.qdoc @@ -527,7 +527,7 @@ on plugins, consult the plugins \l{How to Create Qt Plugins}{overview document}. - You can omit the the first macro unless you want the plugin + You can omit the first macro unless you want the plugin to be statically linked with the application. \section2 Implementing Interface Factories diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc index bcfa93d..446c91b 100644 --- a/doc/src/deployment.qdoc +++ b/doc/src/deployment.qdoc @@ -1247,7 +1247,7 @@ \snippet doc/src/snippets/code/doc_src_deployment.qdoc 48 Then we update the source code in \c tools/plugandpaint/main.cpp - to look for the the new plugins. After constructing the + to look for the new plugins. After constructing the QApplication, we add the following code: \snippet doc/src/snippets/code/doc_src_deployment.qdoc 49 diff --git a/doc/src/examples/codeeditor.qdoc b/doc/src/examples/codeeditor.qdoc index 669ab45..d218d0d 100644 --- a/doc/src/examples/codeeditor.qdoc +++ b/doc/src/examples/codeeditor.qdoc @@ -67,7 +67,7 @@ QTextEdit because it is optimized for handling plain text. See the QPlainTextEdit class description for details. - QPlainTextEdit lets us add selections in addition to the the + QPlainTextEdit lets us add selections in addition to the selection the user can make with the mouse or keyboard. We use this functionality to highlight the current line. More on this later. diff --git a/doc/src/examples/containerextension.qdoc b/doc/src/examples/containerextension.qdoc index a4fbcea..6d29cf6 100644 --- a/doc/src/examples/containerextension.qdoc +++ b/doc/src/examples/containerextension.qdoc @@ -305,7 +305,7 @@ MultiPageWidget class \l {designer/containerextension/multipagewidget.cpp}{implementation}). Finally, we implicitly force an update of the page's property - sheet by calling the the + sheet by calling the QDesignerPropertySheetExtension::setChanged() function. \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 4 diff --git a/doc/src/examples/fortuneserver.qdoc b/doc/src/examples/fortuneserver.qdoc index e6a7f85..848a3a3 100644 --- a/doc/src/examples/fortuneserver.qdoc +++ b/doc/src/examples/fortuneserver.qdoc @@ -45,7 +45,7 @@ The Fortune Server example shows how to create a server for a simple network service. It is intended to be run alongside the - \l{network/fortuneclient}{Fortune Client} example or the the + \l{network/fortuneclient}{Fortune Client} example or the \l{network/blockingfortuneclient}{Blocking Fortune Client} example. \image fortuneserver-example.png Screenshot of the Fortune Server example diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc index 9cc9cd1..7a74a37 100644 --- a/doc/src/examples/ftp.qdoc +++ b/doc/src/examples/ftp.qdoc @@ -172,7 +172,7 @@ no entries were found (in which case our \c addToList() function would not have been called). - Let's continue with the the \c addToList() slot: + Let's continue with the \c addToList() slot: \snippet examples/network/ftp/ftpwindow.cpp 10 @@ -190,7 +190,7 @@ \snippet examples/network/ftp/ftpwindow.cpp 12 - \c cdToParent() is invoked when the the user requests to go to the + \c cdToParent() is invoked when the user requests to go to the parent directory of the one displayed in the file list. After changing the directory, we QFtp::List its contents. diff --git a/doc/src/examples/icons.qdoc b/doc/src/examples/icons.qdoc index 750ef2e..a81ddb9 100644 --- a/doc/src/examples/icons.qdoc +++ b/doc/src/examples/icons.qdoc @@ -479,7 +479,7 @@ QTableWidget::openPersistentEditor() function to create comboboxes for the mode and state columns of the items. - Due to the the connection between the table widget's \l + Due to the connection between the table widget's \l {QTableWidget::itemChanged()}{itemChanged()} signal and the \c changeIcon() slot, the new image is automatically converted into a pixmap and made part of the set of pixmaps available to the icon diff --git a/doc/src/examples/musicplayerexample.qdoc b/doc/src/examples/musicplayerexample.qdoc index d23c1f1..9f04bf6 100644 --- a/doc/src/examples/musicplayerexample.qdoc +++ b/doc/src/examples/musicplayerexample.qdoc @@ -154,7 +154,7 @@ \snippet examples/phonon/musicplayer/mainwindow.cpp 5 - We move on to the the slots of \c MainWindow, starting with \c + We move on to the slots of \c MainWindow, starting with \c addFiles(): \snippet examples/phonon/musicplayer/mainwindow.cpp 6 diff --git a/doc/src/examples/qobjectxmlmodel.qdoc b/doc/src/examples/qobjectxmlmodel.qdoc index ce1dab6..37c66bc 100644 --- a/doc/src/examples/qobjectxmlmodel.qdoc +++ b/doc/src/examples/qobjectxmlmodel.qdoc @@ -71,7 +71,7 @@ The query engine can only traverse two dimensional trees, because an XML document is always a two dimensional tree. If we want to add the QMetaObject tree to the node model, we have to somehow flatten it - into the the same plane as the QObject tree. This requires that the + into the same plane as the QObject tree. This requires that the node model class must build an auxiliary data structure and make it part of the two dimensional QObject node model. How to do this is explained in \l{Including The QMetaObject Tree}. diff --git a/doc/src/examples/tabdialog.qdoc b/doc/src/examples/tabdialog.qdoc index c9500af..5394b82 100644 --- a/doc/src/examples/tabdialog.qdoc +++ b/doc/src/examples/tabdialog.qdoc @@ -91,7 +91,7 @@ \snippet examples/dialogs/tabdialog/tabdialog.cpp 1 \snippet examples/dialogs/tabdialog/tabdialog.cpp 3 - We arrange the the tab widget above the buttons in the dialog: + We arrange the tab widget above the buttons in the dialog: \snippet examples/dialogs/tabdialog/tabdialog.cpp 4 diff --git a/doc/src/examples/tooltips.qdoc b/doc/src/examples/tooltips.qdoc index 5daa2b2..78b350b 100644 --- a/doc/src/examples/tooltips.qdoc +++ b/doc/src/examples/tooltips.qdoc @@ -353,7 +353,7 @@ Whenever the user creates a new shape item, we want the new item to appear at a random position, and we use the \c randomItemPosition() function to calculate such a position. We - make sure that the item appears within the the visible area of the + make sure that the item appears within the visible area of the \c SortingBox widget, using the widget's current width and heigth when calculating the random coordinates. diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc index eabb803..58c8b80 100644 --- a/doc/src/examples/transformations.qdoc +++ b/doc/src/examples/transformations.qdoc @@ -208,7 +208,7 @@ After transforming the coordinate system, we draw the \c RenderArea's shape, and then we restore the painter state using - the the QPainter::restore() function (i.e. popping the saved state off + the QPainter::restore() function (i.e. popping the saved state off the stack). \snippet examples/painting/transformations/renderarea.cpp 7 diff --git a/doc/src/examples/trollprint.qdoc b/doc/src/examples/trollprint.qdoc index 38251ee..489012e 100644 --- a/doc/src/examples/trollprint.qdoc +++ b/doc/src/examples/trollprint.qdoc @@ -142,7 +142,7 @@ We can easily determine which file must be changed because the translator's "context" is in fact the class name for the class where the texts that must be changed appears. In this case the file is \c - printpanel.cpp, where the there are four lines to change. Add the + printpanel.cpp, where there are four lines to change. Add the second argument "two-sided" in the appropriate \c tr() calls to the first pair of radio buttons: diff --git a/doc/src/layout.qdoc b/doc/src/layout.qdoc index 196999b..d97fcfc 100644 --- a/doc/src/layout.qdoc +++ b/doc/src/layout.qdoc @@ -343,9 +343,9 @@ \snippet doc/src/snippets/code/doc_src_layout.qdoc 4 The layout takes over responsibility of the items added. Since QLayoutItem - does not inherit QObject, we must delete the items manually. The function - QLayout::deleteAllItems() uses \c{takeAt()} defined above to delete all the - items in the layout. + does not inherit QObject, we must delete the items manually. In the + destructor, we remove each item from the list using \c{takeAt()}, and + then delete it. \snippet doc/src/snippets/code/doc_src_layout.qdoc 5 diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc index 1c3f6d2..a11c071 100644 --- a/doc/src/licenses.qdoc +++ b/doc/src/licenses.qdoc @@ -45,7 +45,7 @@ \ingroup licensing \brief Information about other licenses used for Qt components and third-party code. - Qt contains some code that is not provided under the the + Qt contains some code that is not provided under the \l{GNU General Public License (GPL)}, \l{GNU Lesser General Public License (LGPL)} or the \l{Qt Commercial Editions}{Qt Commercial License Agreement}, but rather under diff --git a/doc/src/mac-differences.qdoc b/doc/src/mac-differences.qdoc index 573e62d..5849850 100644 --- a/doc/src/mac-differences.qdoc +++ b/doc/src/mac-differences.qdoc @@ -128,7 +128,7 @@ If you want to build a new dynamic library combining the Qt 4 dynamic libraries, you need to introduce the \c{ld -r} flag. Then - relocation information is stored in the the output file, so that + relocation information is stored in the output file, so that this file could be the subject of another \c ld run. This is done by setting the \c -r flag in the \c .pro file, and the \c LFLAGS settings. diff --git a/doc/src/model-view-programming.qdoc b/doc/src/model-view-programming.qdoc index bf0c1c8..8874cfa 100644 --- a/doc/src/model-view-programming.qdoc +++ b/doc/src/model-view-programming.qdoc @@ -249,7 +249,7 @@ provide an API that allows you to sort your model data programmatically. In addition, you can enable interactive sorting (i.e. allowing the users to sort the data by clicking the view's - headers), by connecting the QHeaderView::sectionClicked() signal + headers), by connecting the QHeaderView::sortIndicatorChanged() signal to the QTableView::sortByColumn() slot or the QTreeView::sortByColumn() slot, respectively. diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc index 501b5a5..dd37fe2 100644 --- a/doc/src/phonon-api.qdoc +++ b/doc/src/phonon-api.qdoc @@ -2973,7 +2973,7 @@ \value ToggledHint If this hint is set it means that - the the control has only two states: zero and non-zero + the control has only two states: zero and non-zero (see isToggleControl()). \value LogarithmicHint diff --git a/doc/src/porting4-overview.qdoc b/doc/src/porting4-overview.qdoc index b0146a6..462f849 100644 --- a/doc/src/porting4-overview.qdoc +++ b/doc/src/porting4-overview.qdoc @@ -364,4 +364,10 @@ In Qt 4.2 and later, \l{Qt Style Sheets} can be used to implement many common modifications to existing styles, and this may be sufficient for Qt 3 applications. + + \section2 Events + In Qt 3, QCloseEvents were not accepted by default. In Qt 4, + the event handler QWidget::closeEvent() receives QCloseEvents, + and accepts them by default closing the application. To avoid + this, please reimplement QWidget::closeEvent(). */ diff --git a/doc/src/q3valuelist.qdoc b/doc/src/q3valuelist.qdoc index be315c2..e3681af 100644 --- a/doc/src/q3valuelist.qdoc +++ b/doc/src/q3valuelist.qdoc @@ -108,7 +108,7 @@ pointing to the removed member become invalid. Inserting into the list does not invalidate any iterator. For convenience, the function last() returns a reference to the last item in the list, - and first() returns a reference to the the first item. If the + and first() returns a reference to the first item. If the list is empty(), both last() and first() have undefined behavior (your application will crash or do unpredictable things). Use last() and first() with caution, for example: diff --git a/doc/src/qalgorithms.qdoc b/doc/src/qalgorithms.qdoc index b33c250..90289f9 100644 --- a/doc/src/qalgorithms.qdoc +++ b/doc/src/qalgorithms.qdoc @@ -59,7 +59,7 @@ If STL is available on all your target platforms, you can use the STL algorithms instead of their Qt counterparts. One reason why - you might want to use the the STL algorithms is that STL provides + you might want to use the STL algorithms is that STL provides dozens and dozens of algorithms, whereas Qt only provides the most important ones, making no attempt to duplicate functionality that is already provided by the C++ standard. diff --git a/doc/src/qtdesigner.qdoc b/doc/src/qtdesigner.qdoc index 7e3b619..9699c5b 100644 --- a/doc/src/qtdesigner.qdoc +++ b/doc/src/qtdesigner.qdoc @@ -632,7 +632,7 @@ /*! \fn void QDesignerContainerExtension::setCurrentIndex(int index) - Sets the the currently selected page in the container to be the + Sets the currently selected page in the container to be the page at the given \a index in the extension's list of pages. \sa currentIndex() diff --git a/doc/src/qtscriptdebugger-manual.qdoc b/doc/src/qtscriptdebugger-manual.qdoc index 3dfe879..75d87f8 100644 --- a/doc/src/qtscriptdebugger-manual.qdoc +++ b/doc/src/qtscriptdebugger-manual.qdoc @@ -367,7 +367,7 @@ \section3 continue Continues execution normally, i.e, gives the execution control over - the script back the the QScriptEngine. + the script back to the QScriptEngine. \section3 eval <program> diff --git a/doc/src/snippets/code/doc_src_layout.qdoc b/doc/src/snippets/code/doc_src_layout.qdoc index fedcf0c..60f36b0 100644 --- a/doc/src/snippets/code/doc_src_layout.qdoc +++ b/doc/src/snippets/code/doc_src_layout.qdoc @@ -67,7 +67,9 @@ void CardLayout::addItem(QLayoutItem *item) //! [5] CardLayout::~CardLayout() { - deleteAllItems(); + QLayoutItem *item; + while ((item = takeAt(0))) + delete item; } //! [5] @@ -121,4 +123,4 @@ QSize CardLayout::minimumSize() const } return s + n*QSize(spacing(), spacing()); } -//! [7]
\ No newline at end of file +//! [7] diff --git a/doc/src/stylesheet.qdoc b/doc/src/stylesheet.qdoc index c0d13da..46ec041 100644 --- a/doc/src/stylesheet.qdoc +++ b/doc/src/stylesheet.qdoc @@ -332,7 +332,7 @@ respect to the reference element. Once positioned, they are treated the same as widgets and can be styled - using the the \l{box model}. + using the \l{box model}. See the \l{List of Sub-Controls} below for a list of supported sub-controls, and \l{Customizing the QPushButton's Menu Indicator @@ -671,7 +671,7 @@ \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin} properties. - Once positioned, sub-controls can be styled using the the \l{box model}. + Once positioned, sub-controls can be styled using the \l{box model}. \note With complex widgets such as QComboBox and QScrollBar, if one property or sub-control is customized, \bold{all} the other properties or @@ -1154,7 +1154,7 @@ \l{#pane-sub}{::pane} subcontrol. The left and right corners are styled using the \l{#left-corner-sub}{::left-corner} and \l{#right-corner-sub}{::right-corner} respectively. - The position of the the tab bar is controlled using the + The position of the tab bar is controlled using the \l{#tab-bar-sub}{::tab-bar} subcontrol. By default, the subcontrols have positions of a QTabWidget in @@ -1254,7 +1254,7 @@ the \l{#menu-button-sub}{::menu-button} subcontrol is used to draw the menu button. \l{#menu-arrow-sub}{::menu-arrow} subcontrol is used to draw the menu arrow inside the menu-button. By default, it is - positioned in the center of the Contents rectangle of the the + positioned in the center of the Contents rectangle of the menu-button subcontrol. When the QToolButton displays arrows, the \l{#up-arrow-sub}{::up-arrow}, @@ -1872,10 +1872,6 @@ \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 54 - \note If you specify more than one parameter in \c font-family, - e.g., \c{font-family: Verdana, Arial}, Qt will only use the first - font. If it cannot be found, Qt uses the system fallbacks instead. - \row \o \c font-size \o \l{#Font Size}{Font Size} diff --git a/doc/src/tech-preview/known-issues.html b/doc/src/tech-preview/known-issues.html index 05df69e..885104e 100644 --- a/doc/src/tech-preview/known-issues.html +++ b/doc/src/tech-preview/known-issues.html @@ -16,7 +16,7 @@ <td align="right" valign="middle"></td></tr></table> <h1>Known Issues: Qt 4.0.0 Technology Preview 1</h1> <p> - This is the list of known and reported issues for the the Qt 4.0.0 + This is the list of known and reported issues for the Qt 4.0.0 Technology Preview 1. This list is updated daily. </p> <br><br> diff --git a/doc/src/timers.qdoc b/doc/src/timers.qdoc index 4f54343..1b48d7d 100644 --- a/doc/src/timers.qdoc +++ b/doc/src/timers.qdoc @@ -62,7 +62,7 @@ In multithreaded applications, you can use the timer mechanism in any thread that has an event loop. To start an event loop from a - non-GUI thread, use QThread::exec(). Qt uses the the object's + non-GUI thread, use QThread::exec(). Qt uses the object's \l{QObject::thread()}{thread affinity} to determine which thread will deliver the QTimerEvent. Because of this, you must start and stop all timers in the object's thread; it is not possible to @@ -105,7 +105,7 @@ In multithreaded applications, you can use QTimer in any thread that has an event loop. To start an event loop from a non-GUI - thread, use QThread::exec(). Qt uses the the timer's + thread, use QThread::exec(). Qt uses the timer's \l{QObject::thread()}{thread affinity} to determine which thread will emit the \l{QTimer::}{timeout()} signal. Because of this, you must start and stop the timer in its thread; it is not possible to diff --git a/doc/src/xquery-introduction.qdoc b/doc/src/xquery-introduction.qdoc index 37a45ac..fe541e2 100644 --- a/doc/src/xquery-introduction.qdoc +++ b/doc/src/xquery-introduction.qdoc @@ -347,7 +347,7 @@ has a more detailed section on the shorthand form, which it calls the \l{http://www.w3.org/TR/xquery/#abbrev} {abbreviated syntax}. More examples of path expressions written in the shorthand form are found there. There is also a section listing examples of path expressions -written in the the \l{http://www.w3.org/TR/xquery/#unabbrev} {longhand +written in the \l{http://www.w3.org/TR/xquery/#unabbrev} {longhand form}. \target Name Tests diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index d90ecae..68649a6 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -53,7 +53,8 @@ SOURCES += \ kernel/qvariant.cpp \ kernel/qcoreglobaldata.cpp \ kernel/qsharedmemory.cpp \ - kernel/qsystemsemaphore.cpp + kernel/qsystemsemaphore.cpp \ + kernel/qpointer.cpp win32 { SOURCES += \ diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 287ac30..9f803fa 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -752,14 +752,18 @@ QObject::~QObject() } // disconnect all senders - for (int i = 0; i < d->senders.count(); ++i) { + for (int i = 0; i < d->senders.count(); ) { QObjectPrivate::Connection *s = d->senders[i]; - if (!s->sender) - continue; QMutex *m = &s->sender->d_func()->threadData->mutex; bool needToUnlock = QOrderedMutexLocker::relock(locker.mutex(), m); - s = d->senders[i]; + if (m < locker.mutex()) { + if (i >= d->senders.count() || s != d->senders[i]) { + if (needToUnlock) + m->unlock(); + continue; + } + } s->receiver = 0; if (s->sender) { QObjectConnectionListVector *senderLists = s->sender->d_func()->connectionLists; @@ -769,6 +773,7 @@ QObject::~QObject() if (needToUnlock) m->unlock(); + ++i; } d->senders.clear(); diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 5f13e5a..32c8d17 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -990,7 +990,7 @@ Q_INLINE_TEMPLATE int QMultiMap<Key, T>::remove(const Key &key, const T &value) { int n = 0; typename QMap<Key, T>::iterator i(find(key)); - typename QMap<Key, T>::const_iterator end(QMap<Key, T>::constEnd()); + typename QMap<Key, T>::iterator end(QMap<Key, T>::end()); while (i != end && !qMapLessThanKey<Key>(key, i.key())) { if (i.value() == value) { i = erase(i); diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index 2c29ebf..b2ed983 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -1469,7 +1469,7 @@ void QWizardPrivate::handleAeroStyleChange() return; // prevent recursion inHandleAeroStyleChange = true; - vistaHelper->backButton()->disconnect(); + vistaHelper->disconnectBackButton(); q->removeEventFilter(vistaHelper); if (isVistaThemeEnabled()) { @@ -1495,7 +1495,7 @@ void QWizardPrivate::handleAeroStyleChange() q->setMouseTracking(true); // ### original value possibly different q->unsetCursor(); // ### ditto antiFlickerWidget->move(0, 0); - vistaHelper->backButton()->hide(); + vistaHelper->hideBackButton(); vistaHelper->setTitleBarIconAndCaptionVisible(true); } diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index 64696de..8aad4af 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -239,9 +239,11 @@ void QVistaBackButton::paintEvent(QPaintEvent *) QVistaHelper::QVistaHelper(QWizard *wizard) : pressed(false) , wizard(wizard) + , backButton_(0) { is_vista = resolveSymbols(); - backButton_ = new QVistaBackButton(wizard); + if (is_vista) + backButton_ = new QVistaBackButton(wizard); } QVistaHelper::~QVistaHelper() @@ -310,6 +312,7 @@ void QVistaHelper::drawTitleBar(QPainter *painter) QRect(0, 0, wizard->width(), titleBarSize() + topOffset()), painter->paintEngine()->getDC()); + Q_ASSERT(backButton_); const int btnTop = backButton_->mapToParent(QPoint()).y(); const int btnHeight = backButton_->size().height(); const int verticalCenter = (btnTop + btnHeight / 2); diff --git a/src/gui/dialogs/qwizard_win_p.h b/src/gui/dialogs/qwizard_win_p.h index cbb3b17..148be26 100644 --- a/src/gui/dialogs/qwizard_win_p.h +++ b/src/gui/dialogs/qwizard_win_p.h @@ -94,6 +94,8 @@ public: void resizeEvent(QResizeEvent *event); void paintEvent(QPaintEvent *event); QVistaBackButton *backButton() const { return backButton_; } + void disconnectBackButton() { if (backButton_) backButton_->disconnect(); } + void hideBackButton() { if (backButton_) backButton_->hide(); } void setWindowPosHack(); QColor basicWindowFrameColor(); enum VistaState { VistaAero, VistaBasic, Classic, Dirty }; diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp index c72ea91..283bbd3 100644 --- a/src/gui/embedded/qsoundqss_qws.cpp +++ b/src/gui/embedded/qsoundqss_qws.cpp @@ -52,6 +52,7 @@ #include <qalgorithms.h> #include <qtimer.h> #include <qpointer.h> +#include <qendian.h> #include <unistd.h> #include <stdlib.h> @@ -335,7 +336,13 @@ public: virtual int readySamples(int) = 0; int getSample(int off, int bps) { - return (bps == 1) ? (data[out+off] - 128) * 128 : ((short*)data)[(out/2)+off]; + + // + // 16-bit audio data is converted to native endian so that it can be scaled + // Yes, this is ugly on a BigEndian machine + // Perhaps it shouldn't be scaled at all + // + return (bps == 1) ? (data[out+off] - 128) * 128 : qToLittleEndian(((short*)data)[(out/2)+off]); } int add(int* mixl, int* mixr, int count) @@ -547,7 +554,7 @@ public: wavedata_remaining = 0; mFinishedRead = true; } else if ( qstrncmp(chunk.id,"data",4) == 0 ) { - wavedata_remaining = chunk.size; + wavedata_remaining = qToLittleEndian( chunk.size ); //out = max = sound_buffer_size; @@ -572,10 +579,23 @@ public: //qDebug("couldn't ready chunkdata"); mFinishedRead = true; } + #define WAVE_FORMAT_PCM 1 - else if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) { - //qDebug("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag); - mFinishedRead = true; + else + { + /* + ** Endian Fix the chuck data + */ + chunkdata.formatTag = qToLittleEndian( chunkdata.formatTag ); + chunkdata.channels = qToLittleEndian( chunkdata.channels ); + chunkdata.samplesPerSec = qToLittleEndian( chunkdata.samplesPerSec ); + chunkdata.avgBytesPerSec = qToLittleEndian( chunkdata.avgBytesPerSec ); + chunkdata.blockAlign = qToLittleEndian( chunkdata.blockAlign ); + chunkdata.wBitsPerSample = qToLittleEndian( chunkdata.wBitsPerSample ); + if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) { + qWarning("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag); + mFinishedRead = true; + } } } else { // ignored chunk @@ -1166,9 +1186,15 @@ bool QWSSoundServerPrivate::openDevice() if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &v)) qWarning("Could not set fragments to %08x",v); #ifdef QT_QWS_SOUND_16BIT - v=AFMT_S16_LE; if (ioctl(fd, SNDCTL_DSP_SETFMT, &v)) + // + // Use native endian + // Since we have manipulated the data volume the data + // is now in native format, even though its stored + // as little endian in the WAV file + // + v=AFMT_S16_NE; if (ioctl(fd, SNDCTL_DSP_SETFMT, &v)) qWarning("Could not set format %d",v); - if (AFMT_S16_LE != v) + if (AFMT_S16_NE != v) qDebug("Want format %d got %d", AFMT_S16_LE, v); #else v=AFMT_U8; if (ioctl(fd, SNDCTL_DSP_SETFMT, &v)) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index cc291e3..8243f32 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4025,8 +4025,8 @@ void QWidgetPrivate::applyMaxAndMinSizeOnWindow() NSSize max = NSMakeSize(SF(extra->maxw), SF(extra->maxh)); NSSize min = NSMakeSize(SF(extra->minw), SF(extra->minh)); #undef SF - [qt_mac_window_for(q) setMinSize:min]; - [qt_mac_window_for(q) setMaxSize:max]; + [qt_mac_window_for(q) setContentMinSize:min]; + [qt_mac_window_for(q) setContentMaxSize:max]; #endif } diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 4a33b92..ec8c1dc 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1425,7 +1425,8 @@ static inline QHomogeneousCoordinate mapHomogeneous(const QTransform &transform, return c; } -static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, bool needsMoveTo) +static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, + bool needsMoveTo, bool needsLineTo = true) { QHomogeneousCoordinate ha = mapHomogeneous(transform, a); QHomogeneousCoordinate hb = mapHomogeneous(transform, b); @@ -1458,7 +1459,8 @@ static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transfor if (needsMoveTo) path.moveTo(ha.toPoint()); - path.lineTo(hb.toPoint()); + if (needsLineTo) + path.lineTo(hb.toPoint()); return true; } @@ -1525,7 +1527,7 @@ static QPainterPath mapProjective(const QTransform &transform, const QPainterPat } if (path.elementCount() > 0 && lastMoveTo != last) - lineTo_clipped(result, transform, last, lastMoveTo, needsMoveTo); + lineTo_clipped(result, transform, last, lastMoveTo, needsMoveTo, false); return result; } diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 8214e54..38621c1 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -1161,13 +1161,20 @@ static bool setFontWeightFromValue(const Value &value, QFont *font) return true; } -static bool setFontFamilyFromValues(const QVector<Value> &values, QFont *font) +/** \internal + * parse the font family from the values (starting from index \a start) + * and set it the \a font + * \returns true if a family was extracted. + */ +static bool setFontFamilyFromValues(const QVector<Value> &values, QFont *font, int start = 0) { QString family; - for (int i = 0; i < values.count(); ++i) { + for (int i = start; i < values.count(); ++i) { const Value &v = values.at(i); - if (v.type == Value::TermOperatorComma) - break; + if (v.type == Value::TermOperatorComma) { + family += QLatin1Char(','); + continue; + } const QString str = v.variant.toString(); if (str.isEmpty()) break; @@ -1221,9 +1228,7 @@ static void parseShorthandFontProperty(const QVector<Value> &values, QFont *font } if (i < values.count()) { - QString fam = values.at(i).variant.toString(); - if (!fam.isEmpty()) - font->setFamily(fam); + setFontFamilyFromValues(values, font, i); } } diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp index 92c12a5..4436c04 100644 --- a/src/gui/widgets/qcalendarwidget.cpp +++ b/src/gui/widgets/qcalendarwidget.cpp @@ -2791,7 +2791,7 @@ QTextCharFormat QCalendarWidget::dateTextFormat(const QDate &date) const void QCalendarWidget::setDateTextFormat(const QDate &date, const QTextCharFormat &format) { Q_D(QCalendarWidget); - if ( date.isNull() && !format.isValid() ) + if (date.isNull()) d->m_model->m_dateFormats.clear(); else d->m_model->m_dateFormats[date] = format; diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 502c1e9..558ba42 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -1408,10 +1408,10 @@ bool QMainWindow::event(QEvent *event) This property is false by default and only has any effect on Mac OS X 10.4 or higher. - If set to true, then the top toolbar area is replaced with a Carbon - HIToolbar and all toolbars in the top toolbar area are moved to that. Any - toolbars added afterwards will also be added to the Carbon HIToolbar. This - means a couple of things. + If set to true, then the top toolbar area is replaced with a Carbon HIToolbar + or a Cocoa NSToolbar (depending on whether Qt was built with Carbon or Cocoa). + All toolbars in the top toolbar area and any toolbars added afterwards are + moved to that. This means a couple of things. \list \i QToolBars in this toolbar area are not movable and you cannot drag other diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 96ccc91..2002641 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -1446,7 +1446,7 @@ QString QHttpRequestHeader::toString() const that indicates if the request finished with an error. To make an HTTP request you must set up suitable HTTP headers. The - following example demonstrates, how to request the main HTML page + following example demonstrates how to request the main HTML page from the Trolltech home page (i.e., the URL \c http://qtsoftware.com/index.html): diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index d4bf008..43fbb16 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -703,27 +703,37 @@ void QHttpNetworkConnectionPrivate::handleStatus(QAbstractSocket *socket, QHttpN switch (statusCode) { case 401: case 407: - handleAuthenticateChallenge(socket, reply, (statusCode == 407), resend); - if (resend) { - int i = indexOf(socket); - - QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice(); - if (uploadByteDevice) { - if (uploadByteDevice->reset()) { - channels[i].written = 0; - } else { - emitReplyError(socket, reply, QNetworkReply::ContentReSendError); - break; + if (handleAuthenticateChallenge(socket, reply, (statusCode == 407), resend)) { + if (resend) { + int i = indexOf(socket); + + QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice(); + if (uploadByteDevice) { + if (uploadByteDevice->reset()) { + channels[i].written = 0; + } else { + emitReplyError(socket, reply, QNetworkReply::ContentReSendError); + break; + } } - } - - eraseData(reply); - // also use async _q_startNextRequest so we dont break with closed - // proxy or server connections.. - channels[i].resendCurrent = true; - QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection); + eraseData(reply); + // also use async _q_startNextRequest so we dont break with closed + // proxy or server connections.. + channels[i].resendCurrent = true; + QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection); + } + } else { + int i = indexOf(socket); + emit channels[i].reply->headerChanged(); + emit channels[i].reply->readyRead(); + QNetworkReply::NetworkError errorCode = (statusCode == 407) + ? QNetworkReply::ProxyAuthenticationRequiredError + : QNetworkReply::AuthenticationRequiredError; + reply->d_func()->errorString = errorDetail(errorCode, socket); + emit q->error(errorCode, reply->d_func()->errorString); + emit channels[i].reply->finished(); } break; default: @@ -826,7 +836,6 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket // authentication is cancelled, send the current contents to the user. emit channels[i].reply->headerChanged(); emit channels[i].reply->readyRead(); - emit channels[i].reply->finished(); QNetworkReply::NetworkError errorCode = isProxy ? QNetworkReply::ProxyAuthenticationRequiredError diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index aee351d..4259a5c 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -2233,7 +2233,7 @@ void QOpenGLPaintEnginePrivate::fillVertexArray(Qt::FillRule fillRule) // Enable color writes. glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - glStencilMask(0); + glStencilMask(stencilMask); setGradientOps(cbrush, QRectF(QPointF(min_x, min_y), QSizeF(max_x - min_x, max_y - min_y))); @@ -2245,12 +2245,14 @@ void QOpenGLPaintEnginePrivate::fillVertexArray(Qt::FillRule fillRule) // Enable stencil func. glStencilFunc(GL_NOTEQUAL, 0, stencilMask); + glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); composite(rect); } else { DEBUG_ONCE qDebug() << "QOpenGLPaintEnginePrivate: Drawing polygon using stencil method (no fragment programs)"; // Enable stencil func. glStencilFunc(GL_NOTEQUAL, 0, stencilMask); + glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); #ifndef QT_OPENGL_ES glBegin(GL_QUADS); glVertex2f(min_x, min_y); @@ -2261,24 +2263,6 @@ void QOpenGLPaintEnginePrivate::fillVertexArray(Qt::FillRule fillRule) #endif } - glStencilMask(~0); - glStencilFunc(GL_ALWAYS, 0, 0); - glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO); - - // clear all stencil values to 0 - glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - -#ifndef QT_OPENGL_ES - glBegin(GL_QUADS); - glVertex2f(min_x, min_y); - glVertex2f(max_x, min_y); - glVertex2f(max_x, max_y); - glVertex2f(min_x, max_y); - glEnd(); -#endif - - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - // Disable stencil writes. glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); glStencilMask(0); diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index cb07c53..c5026b8 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1673,10 +1673,19 @@ static void parseCSStoXMLAttrs(const QVector<QCss::Declaration> &declarations, const QCss::Declaration &decl = declarations.at(i); if (decl.d->property.isEmpty()) continue; - if (decl.d->values.count() != 1) - continue; QCss::Value val = decl.d->values.first(); - QString valueStr = val.toString(); + QString valueStr; + if (decl.d->values.count() != 1) { + for (int i=0; i<decl.d->values.count(); ++i) { + const QString &value = decl.d->values[i].toString(); + if (value.isEmpty()) + valueStr += QLatin1Char(','); + else + valueStr += value; + } + } else { + valueStr = val.toString(); + } if (val.type == QCss::Value::Uri) { valueStr.prepend(QLatin1String("url(")); valueStr.append(QLatin1Char(')')); diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp index 2249e8a..46af232 100644 --- a/src/testlib/qtestlogger.cpp +++ b/src/testlib/qtestlogger.cpp @@ -180,7 +180,7 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description, switch (type) { case QAbstractTestLogger::XPass: - ++passCounter; + ++failureCounter; typeBuf = "xpass"; break; case QAbstractTestLogger::Pass: @@ -188,7 +188,7 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description, typeBuf = "pass"; break; case QAbstractTestLogger::XFail: - ++failureCounter; + ++passCounter; typeBuf = "xfail"; break; case QAbstractTestLogger::Fail: @@ -200,7 +200,8 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description, break; } - if (type == QAbstractTestLogger::Fail || type == QAbstractTestLogger::XFail) { + if (type == QAbstractTestLogger::Fail || type == QAbstractTestLogger::XPass + || ((format != TLF_XunitXml) && (type == QAbstractTestLogger::XFail))) { QTestElement *failureElement = new QTestElement(QTest::LET_Failure); failureElement->addAttribute(QTest::AI_Result, typeBuf); if(file) @@ -230,10 +231,10 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description, if (!strcmp(oldResult, "pass")) { overwrite = true; } - else if (!strcmp(oldResult, "xpass")) { - overwrite = (type == QAbstractTestLogger::XFail || type == QAbstractTestLogger::Fail); - } else if (!strcmp(oldResult, "xfail")) { + overwrite = (type == QAbstractTestLogger::XPass || type == QAbstractTestLogger::Fail); + } + else if (!strcmp(oldResult, "xpass")) { overwrite = (type == QAbstractTestLogger::Fail); } if (overwrite) { @@ -251,6 +252,14 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description, QTest::qt_snprintf(buf, sizeof(buf), "%i", line); currentLogElement->addAttribute(QTest::AI_Line, buf); + + /* + Since XFAIL does not add a failure to the testlog in xunitxml, add a message, so we still + have some information about the expected failure. + */ + if (format == TLF_XunitXml && type == QAbstractTestLogger::XFail) { + QTestLogger::addMessage(QAbstractTestLogger::Info, description, file, line); + } } void QTestLogger::addBenchmarkResult(const QBenchmarkResult &result) diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp index ef77c76..104c5cc 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp @@ -105,7 +105,7 @@ Item XSLTSimpleContentConstructor::evaluateSingleton(const DynamicContext::Ptr & QString result; bool previousIsText = false; - bool discard; + bool discard = false; if(next) { diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp index 67a822f..617832b 100644 --- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp @@ -47,6 +47,8 @@ #include <qspinbox.h> #include <qmenu.h> #include <qdebug.h> +#include <qdatetime.h> +#include <qtextformat.h> //TESTED_CLASS= @@ -68,6 +70,11 @@ public slots: private slots: void getSetCheck(); void buttonClickCheck(); + + void setTextFormat(); + void resetTextFormat(); + + void setWeekdayFormat(); }; // Testing get/set functions @@ -215,6 +222,52 @@ void tst_QCalendarWidget::buttonClickCheck() } +void tst_QCalendarWidget::setTextFormat() +{ + QCalendarWidget calendar; + QTextCharFormat format; + format.setFontItalic(true); + format.setForeground(Qt::green); + + const QDate date(1984, 10, 20); + calendar.setDateTextFormat(date, format); + QCOMPARE(calendar.dateTextFormat(date), format); +} + +void tst_QCalendarWidget::resetTextFormat() +{ + QCalendarWidget calendar; + QTextCharFormat format; + format.setFontItalic(true); + format.setForeground(Qt::green); + + const QDate date(1984, 10, 20); + calendar.setDateTextFormat(date, format); + + calendar.setDateTextFormat(QDate(), QTextCharFormat()); + QCOMPARE(calendar.dateTextFormat(date), QTextCharFormat()); +} + +void tst_QCalendarWidget::setWeekdayFormat() +{ + QCalendarWidget calendar; + + QTextCharFormat format; + format.setFontItalic(true); + format.setForeground(Qt::green); + + calendar.setWeekdayTextFormat(Qt::Wednesday, format); + + // check the format of the a given month + for (int i = 1; i <= 31; ++i) { + const QDate date(1984, 10, i); + const Qt::DayOfWeek dayOfWeek = static_cast<Qt::DayOfWeek>(date.dayOfWeek()); + if (dayOfWeek == Qt::Wednesday) + QCOMPARE(calendar.weekdayTextFormat(dayOfWeek), format); + else + QVERIFY(calendar.weekdayTextFormat(dayOfWeek) != format); + } +} tst_QCalendarWidget::tst_QCalendarWidget() { diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp index ab6bad6..7c4fac1 100644 --- a/tests/auto/qcssparser/tst_cssparser.cpp +++ b/tests/auto/qcssparser/tst_cssparser.cpp @@ -123,7 +123,7 @@ static void debug(const QVector<QCss::Symbol> &symbols, int index = -1) qDebug() << "failure at index" << index; } -static void debug(const QCss::Parser &p) { debug(p.symbols); } +//static void debug(const QCss::Parser &p) { debug(p.symbols); } void tst_CssParser::scanner() { @@ -1473,7 +1473,12 @@ void tst_CssParser::extractFontFamily_data() QTest::newRow("quoted-family-name") << "font-family: 'Times New Roman'" << QString("Times New Roman"); QTest::newRow("unquoted-family-name") << "font-family: Times New Roman" << QString("Times New Roman"); QTest::newRow("unquoted-family-name2") << "font-family: Times New Roman" << QString("Times New Roman"); - QTest::newRow("multiple") << "font-family: Times New Roman , foobar, 'baz'" << QString("Times New Roman"); + QTest::newRow("multiple") << "font-family: Times New Roman , foobar, 'baz'" << QString("Times New Roman"); + QTest::newRow("multiple2") << "font-family: invalid, Times New Roman " << QString("Times New Roman"); + QTest::newRow("invalid") << "font-family: invalid" << QFont().family(); + QTest::newRow("shorthand") << "font: 12pt Times New Roman" << QString("Times New Roman"); + QTest::newRow("shorthand multiple quote") << "font: 12pt invalid, \"Times New Roman\" " << QString("Times New Roman"); + QTest::newRow("shorthand multiple") << "font: 12pt invalid, Times New Roman " << QString("Times New Roman"); } void tst_CssParser::extractFontFamily() @@ -1497,8 +1502,8 @@ void tst_CssParser::extractFontFamily() int adjustment = 0; QFont fnt; extractor.extractFont(&fnt, &adjustment); - - QTEST(fnt.family(), "expectedFamily"); + QFontInfo info(fnt); + QTEST(info.family(), "expectedFamily"); } void tst_CssParser::extractBorder_data() diff --git a/tests/auto/qmap/tst_qmap.cpp b/tests/auto/qmap/tst_qmap.cpp index 99efc80..68ac8d6 100644 --- a/tests/auto/qmap/tst_qmap.cpp +++ b/tests/auto/qmap/tst_qmap.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#define QT_STRICT_ITERATORS #include <QtTest/QtTest> #include <QDebug> @@ -400,7 +401,7 @@ void tst_QMap::operator_eq() QVERIFY(a == b); QVERIFY(!(a != b)); - + a.insert(1,1); b.insert(1,1); QVERIFY(a == b); @@ -422,7 +423,7 @@ void tst_QMap::operator_eq() b.insert(-1, -1); QVERIFY(a != b); - QVERIFY(!(a == b)); + QVERIFY(!(a == b)); } { @@ -468,7 +469,7 @@ void tst_QMap::operator_eq() b.insert("willy", 1); QVERIFY(a != b); QVERIFY(!(a == b)); - } + } } void tst_QMap::empty() @@ -523,9 +524,9 @@ void tst_QMap::find() map1.insertMulti(4, compareString); } - QMap<int, QString>::const_iterator it=map1.find(4); + QMap<int, QString>::const_iterator it=map1.constFind(4); - for(i = 9; i > 2 && it != map1.end() && it.key() == 4; --i) { + for(i = 9; i > 2 && it != map1.constEnd() && it.key() == 4; --i) { compareString = testString.arg(i); QVERIFY(it.value() == compareString); ++it; @@ -546,9 +547,9 @@ void tst_QMap::constFind() map1.insert(1,"Mensch"); map1.insert(1,"Mayer"); map1.insert(2,"Hej"); - + QVERIFY(map1.constFind(4) == map1.constEnd()); - + QVERIFY(map1.constFind(1).value() == "Mayer"); QVERIFY(map1.constFind(2).value() == "Hej"); @@ -677,7 +678,7 @@ void tst_QMap::iterators() cstlIt--; QVERIFY(cstlIt.value() == "Teststring 3"); - for(cstlIt = map.begin(), i = 1; cstlIt != map.constEnd(), i < 100; ++cstlIt, ++i) + for(cstlIt = map.constBegin(), i = 1; cstlIt != map.constEnd(), i < 100; ++cstlIt, ++i) QVERIFY(cstlIt.value() == testString.arg(i)); //Java-Style iterators diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 6c622f7..23a6025 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -237,6 +237,8 @@ private Q_SLOTS: void httpProxyCommands_data(); void httpProxyCommands(); void proxyChange(); + void authorizationError_data(); + void authorizationError(); }; QT_BEGIN_NAMESPACE @@ -3512,5 +3514,55 @@ void tst_QNetworkReply::proxyChange() QVERIFY(int(reply3->error()) > 0); } +void tst_QNetworkReply::authorizationError_data() +{ + + QTest::addColumn<QString>("url"); + QTest::addColumn<int>("errorSignalCount"); + QTest::addColumn<int>("finishedSignalCount"); + QTest::addColumn<int>("error"); + QTest::addColumn<int>("httpStatusCode"); + QTest::addColumn<QString>("httpBody"); + + QTest::newRow("unknown-authorization-method") << "http://" + QtNetworkSettings::serverName() + + "/cgi-bin/http-unknown-authentication-method.cgi?401-authorization-required" << 1 << 1 + << int(QNetworkReply::AuthenticationRequiredError) << 401 << "authorization required"; + QTest::newRow("unknown-proxy-authorization-method") << "http://" + QtNetworkSettings::serverName() + + "/cgi-bin/http-unknown-authentication-method.cgi?407-proxy-authorization-required" << 1 << 1 + << int(QNetworkReply::ProxyAuthenticationRequiredError) << 407 + << "authorization required"; +} + +void tst_QNetworkReply::authorizationError() +{ + QFETCH(QString, url); + QNetworkRequest request(url); + QNetworkReplyPtr reply = manager.get(request); + + QCOMPARE(reply->error(), QNetworkReply::NoError); + + qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError"); + QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError))); + QSignalSpy finishedSpy(reply, SIGNAL(finished())); + // now run the request: + connect(reply, SIGNAL(finished()), + &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + + QFETCH(int, errorSignalCount); + QCOMPARE(errorSpy.count(), errorSignalCount); + QFETCH(int, finishedSignalCount); + QCOMPARE(finishedSpy.count(), finishedSignalCount); + QFETCH(int, error); + QCOMPARE(reply->error(), QNetworkReply::NetworkError(error)); + + QFETCH(int, httpStatusCode); + QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), httpStatusCode); + + QFETCH(QString, httpBody); + QCOMPARE(QString(reply->readAll()), httpBody); +} + QTEST_MAIN(tst_QNetworkReply) #include "tst_qnetworkreply.moc" diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp index 0c88f29..fcfd528 100644 --- a/tests/auto/qobjectrace/tst_qobjectrace.cpp +++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp @@ -50,6 +50,7 @@ class tst_QObjectRace: public QObject Q_OBJECT private slots: void moveToThreadRace(); + void destroyRace(); }; class RaceObject : public QObject @@ -147,5 +148,93 @@ void tst_QObjectRace::moveToThreadRace() delete object; } + +class MyObject : public QObject +{ Q_OBJECT + public slots: + void slot1() { emit signal1(); } + void slot2() { emit signal2(); } + void slot3() { emit signal3(); } + void slot4() { emit signal4(); } + void slot5() { emit signal5(); } + void slot6() { emit signal6(); } + void slot7() { emit signal7(); } + signals: + void signal1(); + void signal2(); + void signal3(); + void signal4(); + void signal5(); + void signal6(); + void signal7(); +}; + + + +class DestroyThread : public QThread +{ + Q_OBJECT + QObject **objects; + int number; + +public: + void setObjects(QObject **o, int n) + { + objects = o; + number = n; + for(int i = 0; i < number; i++) + objects[i]->moveToThread(this); + } + + void run() { + for(int i = 0; i < number; i++) + delete objects[i]; + } +}; + +void tst_QObjectRace::destroyRace() +{ + enum { ThreadCount = 10, ObjectCountPerThread = 733, + ObjectCount = ThreadCount * ObjectCountPerThread }; + + const char *_slots[] = { SLOT(slot1()) , SLOT(slot2()) , SLOT(slot3()), + SLOT(slot4()) , SLOT(slot5()) , SLOT(slot6()), + SLOT(slot7()) }; + + const char *_signals[] = { SIGNAL(signal1()), SIGNAL(signal2()), SIGNAL(signal3()), + SIGNAL(signal4()), SIGNAL(signal5()), SIGNAL(signal6()), + SIGNAL(signal7()) }; + + QObject *objects[ObjectCount]; + for (int i = 0; i < ObjectCount; ++i) + objects[i] = new MyObject; + + + for (int i = 0; i < ObjectCount * 11; ++i) { + connect(objects[(i*13) % ObjectCount], _signals[(2*i)%7], + objects[((i+2)*17) % ObjectCount], _slots[(3*i+2)%7] ); + connect(objects[((i+6)*23) % ObjectCount], _signals[(5*i+4)%7], + objects[((i+8)*41) % ObjectCount], _slots[(i+6)%7] ); + } + + DestroyThread *threads[ThreadCount]; + for (int i = 0; i < ThreadCount; ++i) { + threads[i] = new DestroyThread; + threads[i]->setObjects(objects + i*ObjectCountPerThread, ObjectCountPerThread); + } + + for (int i = 0; i < ThreadCount; ++i) + threads[i]->start(); + + QVERIFY(threads[0]->wait(TwoMinutes)); + // the other threads should finish pretty quickly now + for (int i = 1; i < ThreadCount; ++i) + QVERIFY(threads[i]->wait(3000)); + + for (int i = 0; i < ThreadCount; ++i) + delete threads[i]; +} + + QTEST_MAIN(tst_QObjectRace) #include "tst_qobjectrace.moc" diff --git a/tests/auto/selftests/expected_xunit.txt b/tests/auto/selftests/expected_xunit.txt index 875dda6..cb74491 100644 --- a/tests/auto/selftests/expected_xunit.txt +++ b/tests/auto/selftests/expected_xunit.txt @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="3" failures="2" tests="6" name="tst_Xunit"> +<testsuite errors="5" failures="3" tests="9" name="tst_Xunit"> <properties> <property value="4.6.0" name="QTestVersion"/> <property value="4.6.0" name="QtVersion"/> @@ -20,10 +20,21 @@ <testcase result="fail" name="testFunc4"> <failure message="a forced failure!" result="fail"/> </testcase> + <testcase result="xfail" name="testFunc5"> + <!-- message="this failure is expected" type="info" --> + </testcase> + <testcase result="xfail" name="testFunc6"> + <!-- message="this failure is also expected" type="info" --> + </testcase> + <testcase result="xpass" name="testFunc7"> + <failure message="'true' returned FALSE. ()" result="xpass"/> + </testcase> <testcase result="pass" name="cleanupTestCase"/> <system-err> <![CDATA[just a QWARN() !]]> <![CDATA[a qDebug() call with comment-ending stuff -->]]> <![CDATA[skipping this function!]]> +<![CDATA[this failure is expected]]> +<![CDATA[this failure is also expected]]> </system-err> </testsuite> diff --git a/tests/auto/selftests/xunit/tst_xunit.cpp b/tests/auto/selftests/xunit/tst_xunit.cpp index dbe9fec..c3c90ab 100644 --- a/tests/auto/selftests/xunit/tst_xunit.cpp +++ b/tests/auto/selftests/xunit/tst_xunit.cpp @@ -53,6 +53,9 @@ private slots: void testFunc2(); void testFunc3(); void testFunc4(); + void testFunc5(); + void testFunc6(); + void testFunc7(); }; tst_Xunit::tst_Xunit() @@ -81,6 +84,32 @@ void tst_Xunit::testFunc4() QFAIL("a forced failure!"); } +/* + Note there are two testfunctions which give expected failures. + This is so we can test that expected failures don't add to failure + counts and unexpected passes do. If we had one xfail and one xpass + testfunction, we couldn't test which one of them adds to the failure + count. +*/ + +void tst_Xunit::testFunc5() +{ + QEXPECT_FAIL("", "this failure is expected", Abort); + QVERIFY(false); +} + +void tst_Xunit::testFunc6() +{ + QEXPECT_FAIL("", "this failure is also expected", Abort); + QVERIFY(false); +} + +void tst_Xunit::testFunc7() +{ + QEXPECT_FAIL("", "this pass is unexpected", Abort); + QVERIFY(true); +} + QTEST_APPLESS_MAIN(tst_Xunit) #include "tst_xunit.moc" diff --git a/tests/auto/uic/baseline/languagesdialog.ui.h b/tests/auto/uic/baseline/languagesdialog.ui.h index a0b9cae..fbe57ca 100644 --- a/tests/auto/uic/baseline/languagesdialog.ui.h +++ b/tests/auto/uic/baseline/languagesdialog.ui.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'languagesdialog.ui' ** -** Created: Mon Jun 16 17:57:32 2008 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Fri May 15 16:58:03 2009 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -57,7 +57,7 @@ public: upButton->setObjectName(QString::fromUtf8("upButton")); upButton->setEnabled(false); QIcon icon; - icon.addPixmap(QPixmap(QString::fromUtf8(":/images/up.png")), QIcon::Normal, QIcon::Off); + icon.addFile(QString::fromUtf8(":/images/up.png"), QSize(), QIcon::Normal, QIcon::Off); upButton->setIcon(icon); hboxLayout->addWidget(upButton); @@ -66,7 +66,7 @@ public: downButton->setObjectName(QString::fromUtf8("downButton")); downButton->setEnabled(false); QIcon icon1; - icon1.addPixmap(QPixmap(QString::fromUtf8(":/images/down.png")), QIcon::Normal, QIcon::Off); + icon1.addFile(QString::fromUtf8(":/images/down.png"), QSize(), QIcon::Normal, QIcon::Off); downButton->setIcon(icon1); hboxLayout->addWidget(downButton); @@ -75,7 +75,7 @@ public: removeButton->setObjectName(QString::fromUtf8("removeButton")); removeButton->setEnabled(false); QIcon icon2; - icon2.addPixmap(QPixmap(QString::fromUtf8(":/images/editdelete.png")), QIcon::Normal, QIcon::Off); + icon2.addFile(QString::fromUtf8(":/images/editdelete.png"), QSize(), QIcon::Normal, QIcon::Off); removeButton->setIcon(icon2); hboxLayout->addWidget(removeButton); @@ -84,7 +84,7 @@ public: openFileButton->setObjectName(QString::fromUtf8("openFileButton")); openFileButton->setEnabled(true); QIcon icon3; - icon3.addPixmap(QPixmap(QString::fromUtf8(":/images/mac/fileopen.png")), QIcon::Normal, QIcon::Off); + icon3.addFile(QString::fromUtf8(":/images/mac/fileopen.png"), QSize(), QIcon::Normal, QIcon::Off); openFileButton->setIcon(icon3); hboxLayout->addWidget(openFileButton); diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp index 7270628..58127b0 100644 --- a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp +++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp @@ -57,16 +57,20 @@ using namespace qdesigner_internal; FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) : QObject(parent), m_formContainer(new QWidget), - m_formContainerLayout(new QVBoxLayout), + m_formContainerLayout(new QStackedLayout), m_layout(new QStackedLayout) { m_layout->setMargin(0); m_layout->setSpacing(0); m_layout->setStackingMode(QStackedLayout::StackAll); + // We choose a QStackedLayout as immediate layout for + // the form windows as it ignores the sizePolicy of + // its child (for example, Fixed would cause undesired side effects). m_formContainerLayout->setMargin(0); m_formContainer->setObjectName(QLatin1String("formContainer")); m_formContainer->setLayout(m_formContainerLayout); + m_formContainerLayout->setStackingMode(QStackedLayout::StackAll); // System settings might have different background colors, autofill them // (affects for example mainwindow status bars) m_formContainer->setAutoFillBackground(true); diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.h b/tools/designer/src/components/formeditor/formwindow_widgetstack.h index 92323c5..f21c4f0 100644 --- a/tools/designer/src/components/formeditor/formwindow_widgetstack.h +++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.h @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE class QDesignerFormWindowToolInterface; class QStackedLayout; -class QVBoxLayout; class QWidget; namespace qdesigner_internal { @@ -92,7 +91,7 @@ protected: private: QList<QDesignerFormWindowToolInterface*> m_tools; QWidget *m_formContainer; - QVBoxLayout *m_formContainerLayout; + QStackedLayout *m_formContainerLayout; QStackedLayout *m_layout; }; diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp index ff3b50b..94e8044 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp @@ -316,6 +316,10 @@ Qt::Alignment variantToAlignment(const QVariant & q) // find changed subproperties of a variant unsigned compareSubProperties(const QVariant & q1, const QVariant & q2, qdesigner_internal::SpecialProperty specialProperty) { + // Do not clobber new value in the comparison function in + // case someone sets a QString on a PropertySheetStringValue. + if (q1.type() != q2.type()) + return SubPropertyAll; switch (q1.type()) { case QVariant::Rect: return compareSubProperties(q1.toRect(), q2.toRect()); diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css index 6cf7377..3704a15 100644 --- a/tools/qdoc3/test/classic.css +++ b/tools/qdoc3/test/classic.css @@ -1,7 +1,29 @@ +BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV { + font-family: Geneva, Arial, Helvetica, sans-serif; +} +BODY,TD { + font-size: 90%; +} +H1 { + text-align: center; + font-size: 160%; +} +H2 { + font-size: 120%; +} +H3 { + font-size: 100%; +} + h3.fn,span.fn { - margin-left: 1cm; - text-indent: -1cm; + background-color: #d5e1e8; + border-width: 1px; + border-style: solid; + border-color: #84b0c7; + font-weight: bold; + -moz-border-radius: 8px 8px 8px 8px; + padding: 6px 0px 6px 10px; } a:link @@ -56,6 +78,44 @@ body color: black } +table td.memItemLeft { + width: 200px; + padding: 1px 0px 0px 8px; + margin: 4px; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-color: #E0E0E0; + border-right-color: #E0E0E0; + border-bottom-color: #E0E0E0; + border-left-color: #E0E0E0; + border-top-style: solid; + border-right-style: none; + border-bottom-style: none; + border-left-style: none; + background-color: #FAFAFA; + font-size: 80%; +} +table td.memItemRight { + padding: 1px 8px 0px 8px; + margin: 4px; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-color: #E0E0E0; + border-right-color: #E0E0E0; + border-bottom-color: #E0E0E0; + border-left-color: #E0E0E0; + border-top-style: solid; + border-right-style: none; + border-bottom-style: none; + border-left-style: none; + background-color: #FAFAFA; + font-size: 80%; +} + table tr.odd { background: #f0f0f0; color: black; diff --git a/translations/assistant_de.qm b/translations/assistant_de.qm Binary files differindex 54146f6..5b31aea 100644 --- a/translations/assistant_de.qm +++ b/translations/assistant_de.qm diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index 0411ef1..9b0d628 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -163,7 +163,7 @@ <context> <name>CentralWidget</name> <message> - <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+195"/> + <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+208"/> <source>Add new page</source> <translation>Neue Seite hinzufügen</translation> </message> @@ -173,38 +173,38 @@ <translation>Aktuelle Seite schließen</translation> </message> <message> - <location line="+265"/> + <location line="+282"/> <source>Print Document</source> <translation>Drucken</translation> </message> <message> - <location line="+147"/> + <location line="+148"/> <location line="+2"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location line="+96"/> + <location line="+91"/> <source>Add New Page</source> <translation>Neue Seite hinzufügen</translation> </message> <message> - <location line="+1"/> + <location line="+3"/> <source>Close This Page</source> <translation>Aktuelle Seite schließen</translation> </message> <message> - <location line="+1"/> + <location line="+3"/> <source>Close Other Pages</source> <translation>Andere Seiten schließen</translation> </message> <message> - <location line="+2"/> + <location line="+5"/> <source>Add Bookmark for this Page...</source> <translation>Lesezeichen für diese Seite hinzufügen...</translation> </message> <message> - <location line="+257"/> + <location line="+259"/> <source>Search</source> <translation>Suchen</translation> </message> @@ -242,17 +242,17 @@ <context> <name>FindWidget</name> <message> - <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-863"/> + <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-899"/> <source>Previous</source> <translation>Vorherige</translation> </message> <message> - <location line="+7"/> + <location line="+4"/> <source>Next</source> <translation>Nächste</translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>Case Sensitive</source> <translation>Gross/ Kleinschreibung beachten</translation> </message> @@ -298,7 +298,7 @@ <context> <name>HelpViewer</name> <message> - <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+481"/> + <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+492"/> <source>Help</source> <translation>Hilfe</translation> </message> @@ -329,12 +329,12 @@ <translation>Link in neuem Tab öffnen </translation> </message> <message> - <location line="-267"/> + <location line="-275"/> <source>Open Link in New Tab</source> <translation>Link in neuem Tab öffnen</translation> </message> <message> - <location line="+201"/> + <location line="+209"/> <source>Unable to launch external application. </source> <translation>Fehler beim Starten der externen Anwendung. @@ -463,38 +463,37 @@ <name>MainWindow</name> <message> <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+108"/> - <location line="+350"/> + <location line="+354"/> <source>Index</source> <translation>Index</translation> </message> <message> - <location line="-344"/> - <location line="+342"/> + <location line="-348"/> + <location line="+346"/> <source>Contents</source> <translation>Inhalt</translation> </message> <message> - <location line="-337"/> - <location line="+341"/> + <location line="-341"/> + <location line="+345"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location line="-329"/> - <location line="+331"/> + <location line="+2"/> <source>Search</source> <translation>Suchen</translation> </message> <message> - <location line="-319"/> - <location line="+192"/> - <location line="+470"/> + <location line="-335"/> + <location line="+208"/> + <location line="+476"/> <source>Qt Assistant</source> <translation>Qt Assistant</translation> </message> <message> - <location line="-501"/> - <location line="+4"/> + <location line="-508"/> + <location line="+5"/> <source>Unfiltered</source> <translation>Ohne Filter</translation> </message> @@ -718,7 +717,7 @@ <translation>Navigationsleiste</translation> </message> <message> - <location line="+74"/> + <location line="+76"/> <source>Toolbars</source> <translation>Werkzeugleisten</translation> </message> @@ -743,7 +742,7 @@ <translation>Adresse:</translation> </message> <message> - <location line="+110"/> + <location line="+114"/> <source>Could not find the associated content item.</source> <translation>Der zugehörige Inhaltseintrag konnte nicht gefunden werden.</translation> </message> @@ -769,12 +768,12 @@ <translation>Über %1</translation> </message> <message> - <location line="+115"/> + <location line="+113"/> <source>Updating search index</source> <translation>Suchindex wird aufgebaut</translation> </message> <message> - <location line="-597"/> + <location line="-601"/> <source>Looking for Qt Documentation...</source> <translation>Suche nach Qt Dokumentationen...</translation> </message> @@ -862,46 +861,45 @@ <translation type="obsolete">Von Helpserver herunterladen...</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+237"/> - <location line="+7"/> - <location line="+6"/> + <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+256"/> + <location line="+43"/> <source>Add Documentation</source> <translation>Dokumentation hinzufügen</translation> </message> <message> - <location line="-13"/> + <location line="-43"/> <source>Qt Compressed Help Files (*.qch)</source> <translation>Komprimierte Hilfe Dateien (*.qch)</translation> </message> <message> - <location line="+8"/> + <location line="+37"/> <source>The specified file is not a valid Qt Help File!</source> <translation>Die angegebene Datei ist keine Qt Hilfe Datei!</translation> </message> <message> - <location line="+6"/> + <location line="-8"/> <source>The namespace %1 is already registered!</source> <translation>Der Namespace %1 ist bereits registriert!</translation> </message> <message> - <location line="+23"/> + <location line="+31"/> <source>Remove Documentation</source> - <translation type="unfinished"></translation> + <translation>Dokumentation entfernen</translation> </message> <message> <location line="+1"/> <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source> - <translation type="unfinished"></translation> + <translation>Einige der gegenwärtig geöffneten Dokumente stammen aus der Dokumentation, die Sie gerade zu löschen versuchen. Sie werden beim Löschen geschlossen.</translation> </message> <message> <location line="+2"/> <source>Cancel</source> - <translation type="unfinished">Abbrechen</translation> + <translation>Abbrechen</translation> </message> <message> <location line="+1"/> <source>OK</source> - <translation type="unfinished">OK</translation> + <translation>OK</translation> </message> <message> <location line="+86"/> @@ -1000,22 +998,22 @@ <message> <location/> <source>Options</source> - <translation type="unfinished"></translation> + <translation>Einstellungen</translation> </message> <message> <location/> <source>Current Page</source> - <translation type="unfinished"></translation> + <translation>Aktuelle Seite</translation> </message> <message> <location/> <source>Restore to default</source> - <translation type="unfinished"></translation> + <translation>Vorgabe wiederherstellen</translation> </message> <message> <location/> <source>Homepage</source> - <translation type="unfinished"></translation> + <translation>Startseite</translation> </message> </context> <context> @@ -1025,7 +1023,7 @@ <translation type="obsolete">Neuer Ordner</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+110"/> + <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+112"/> <source>The specified collection file does not exist!</source> <translation>Die angegeben Katalogdatei (collection file) konnte nicht gefunden werden!</translation> </message> @@ -1073,10 +1071,10 @@ <message> <location line="+7"/> <source>Missing filter argument!</source> - <translation type="unfinished"></translation> + <translation>Das Filter-Argument fehlt!</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Unknown option: %1</source> <translation>Unbekannte Option: %1</translation> </message> @@ -1087,7 +1085,7 @@ <translation>Qt Assistant</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/main.cpp" line="+190"/> + <location filename="../tools/assistant/tools/assistant/main.cpp" line="+203"/> <source>Could not register documentation file %1 @@ -1115,9 +1113,9 @@ Reason: <translation>Dokumentation erfolgreich entfernt.</translation> </message> <message> - <location line="+18"/> + <location line="+40"/> <source>Cannot load sqlite database driver!</source> - <translation type="unfinished"></translation> + <translation>Der Datenbanktreiber für SQLite kann nicht geladen werden!</translation> </message> <message> <location line="+9"/> @@ -1147,7 +1145,7 @@ Reason: <context> <name>SearchWidget</name> <message> - <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+193"/> + <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+195"/> <source>&Copy</source> <translation>&Kopieren</translation> </message> @@ -1157,20 +1155,18 @@ Reason: <translation>&Link Adresse kopieren</translation> </message> <message> - <location line="+3"/> - <location line="+36"/> + <location line="+4"/> <source>Open Link in New Tab</source> <translation>Link in neuem Tab öffnen</translation> </message> <message> - <location line="-29"/> + <location line="+8"/> <source>Select All</source> <translation>Alles markieren</translation> </message> <message> - <location line="+28"/> <source>Open Link</source> - <translation>Link öffnen</translation> + <translation type="obsolete">Link öffnen</translation> </message> </context> <context> diff --git a/translations/designer_de.qm b/translations/designer_de.qm Binary files differindex d51c51d..f9b0a03 100644 --- a/translations/designer_de.qm +++ b/translations/designer_de.qm diff --git a/translations/designer_de.ts b/translations/designer_de.ts index 4cd9914..002fc8d 100644 --- a/translations/designer_de.ts +++ b/translations/designer_de.ts @@ -339,7 +339,7 @@ ate the goose who was loose.</source> <message> <location line="-220"/> <source>Change signal-slot connection</source> - <translation type="unfinished"></translation> + <translation>Signale-Slotverbindung ändern</translation> </message> <message> <location line="+234"/> @@ -1384,7 +1384,7 @@ ate the goose who was loose.</source> <message> <location filename="../tools/designer/src/lib/shared/plugindialog.ui"/> <source>Plugin Information</source> - <translation type="unfinished">Plugins</translation> + <translation>Plugins</translation> </message> <message> <location/> @@ -4026,7 +4026,7 @@ Möchten Sie sie überschreiben?</translation> <message> <location line="+1"/> <source>Go to slot...</source> - <translation type="unfinished">Slot anzeigen...</translation> + <translation>Slot anzeigen...</translation> </message> <message> <location line="+1"/> @@ -5963,14 +5963,14 @@ Please select another name.</source> <translation>Detailansicht</translation> </message> <message> - <location line="+596"/> + <location line="+597"/> <source>Object: %1 Class: %2</source> <translation>Objekt: %1 Klasse: %2</translation> </message> <message> - <location line="-599"/> + <location line="-600"/> <source>Sorting</source> <translation>Sortiert</translation> </message> @@ -5980,7 +5980,7 @@ Klasse: %2</translation> <translation>Farbige Hervorhebung</translation> </message> <message> - <location line="+65"/> + <location line="+66"/> <source>Configure Property Editor</source> <translation>Anzeige der Eigenschaften konfigurieren</translation> </message> diff --git a/translations/linguist_de.qm b/translations/linguist_de.qm Binary files differindex f411122..a39c3bf 100644 --- a/translations/linguist_de.qm +++ b/translations/linguist_de.qm diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts index 712f75d..cb8e4d2 100644 --- a/translations/linguist_de.ts +++ b/translations/linguist_de.ts @@ -6,7 +6,7 @@ <message> <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="+59"/> <source>(New Entry)</source> - <translation type="unfinished"></translation> + <translation>(Neuer Eintrag)</translation> </message> </context> <context> @@ -29,7 +29,7 @@ <message> <location filename="../tools/linguist/linguist/batchtranslationdialog.cpp" line="+79"/> <source>Batch Translation of '%1' - Qt Linguist</source> - <translation type="unfinished"></translation> + <translation>Automatische Übersetzung von '%1' - Qt Linguist</translation> </message> <message> <location line="+37"/> @@ -57,62 +57,62 @@ <message> <location filename="../tools/linguist/linguist/batchtranslation.ui"/> <source>Qt Linguist - Batch Translation</source> - <translation type="unfinished">Qt Linguist - Automatische Übersetzung</translation> + <translation>Qt Linguist - Automatische Übersetzung</translation> </message> <message> <location/> <source>Options</source> - <translation type="unfinished">Optionen</translation> + <translation>Optionen</translation> </message> <message> <location/> <source>Set translated entries to finished</source> - <translation type="unfinished">Markiere Übersetzung als erledigt</translation> + <translation>Markiere Übersetzung als erledigt</translation> </message> <message> <location/> <source>Retranslate entries with existing translation</source> - <translation type="unfinished"></translation> + <translation>Einträge mit bereits existierender Übersetzung neu übersetzen</translation> </message> <message> <location/> <source>Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked.</source> - <translation type="unfinished"></translation> + <translation>Beachten Sie, dass die geänderten Einträge in den Status 'unerledigt' zurückgesetzt werden, wenn 'Markiere Übersetzung als erledigt' deaktiviert ist.</translation> </message> <message> <location/> <source>Translate also finished entries</source> - <translation type="unfinished"></translation> + <translation>Erledigte Einträge übersetzen</translation> </message> <message> <location/> <source>Phrase book preference</source> - <translation type="unfinished">Wörterbücher</translation> + <translation>Wörterbücher</translation> </message> <message> <location/> <source>Move up</source> - <translation type="unfinished">Nach oben</translation> + <translation>Nach oben</translation> </message> <message> <location/> <source>Move down</source> - <translation type="unfinished">Nach unten</translation> + <translation>Nach unten</translation> </message> <message> <location/> <source>The batch translator will search through the selected phrase books in the order given above.</source> - <translation type="unfinished"></translation> + <translation>Der automatische Übersetzer wird in der angegebenen Reihenfolge durch die ausgewählten Wörterbücher gehen.</translation> </message> <message> <location/> <source>&Run</source> - <translation type="unfinished">&Ausführen</translation> + <translation>&Ausführen</translation> </message> <message> <location/> <source>Cancel</source> - <translation type="unfinished">Abbrechen</translation> + <translation>Abbrechen</translation> </message> </context> <context> @@ -120,38 +120,39 @@ <message> <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+214"/> <source><qt>Duplicate messages found in '%1':</source> - <translation type="unfinished"></translation> + <translation><qt>Mehrfach vorhandene Meldungen in '%1':</translation> </message> <message> <location line="+4"/> <source><p>[more duplicates omitted]</source> - <translation type="unfinished"></translation> + <translation><p>[weitere mehrfach vorhandene Nachrichten weggelassen]</translation> </message> <message> <location line="+3"/> <source><p>* Context: %1<br>* Source: %2</source> - <translation type="unfinished"></translation> + <translation><p>* Kontext: %1<br>* Quelle: %2</translation> </message> <message> <location line="+3"/> <source><br>* Comment: %3</source> - <translation type="unfinished"></translation> + <translation><br>* Kommentar: %3</translation> </message> <message> <location line="+70"/> <source>Linguist does not know the plural rules for '%1'. Will assume a single universal form.</source> - <translation type="unfinished"></translation> + <translation>Die Regeln zur Pluralbildung der Sprache '%1' sind in Linguist nicht definiert. +Es wird mit einer einfachen Universalform gearbeitet.</translation> </message> <message> <location line="+56"/> <source>Cannot create '%2': %1</source> - <translation type="unfinished"></translation> + <translation>'%2' kann nicht erzeugt werden: %1</translation> </message> <message> <location line="+56"/> <source>Universal Form</source> - <translation type="unfinished"></translation> + <translation>Universalform</translation> </message> </context> <context> @@ -239,7 +240,7 @@ Will assume a single universal form.</source> <message> <location line="+3"/> <source>Translation does not contain the necessary %n place marker.</source> - <translation type="unfinished"></translation> + <translation>Der erforderliche Platzhalter (%n) fehlt in der Übersetzung.</translation> </message> <message> <location line="+3"/> @@ -311,37 +312,37 @@ Will assume a single universal form.</source> <message> <location/> <source>Find</source> - <translation type="unfinished"></translation> + <translation>Suchen</translation> </message> <message> <location/> <source>&Find what:</source> - <translation type="unfinished"></translation> + <translation>&Suchmuster:</translation> </message> <message> <location/> <source>&Source texts</source> - <translation type="unfinished"></translation> + <translation>&Quelltexte</translation> </message> <message> <location/> <source>&Translations</source> - <translation type="unfinished"></translation> + <translation>&Übersetzungen</translation> </message> <message> <location/> <source>&Match case</source> - <translation type="unfinished"></translation> + <translation>&Groß-/Kleinschreibung beachten</translation> </message> <message> <location/> <source>&Comments</source> - <translation type="unfinished"></translation> + <translation>&Kommentare</translation> </message> <message> <location/> <source>Ignore &accelerators</source> - <translation type="unfinished"></translation> + <translation>Tastenkürzel &ignorieren</translation> </message> <message> <location/> @@ -612,102 +613,102 @@ p, li { white-space: pre-wrap; } <message> <location/> <source>Previous unfinished item.</source> - <translation type="unfinished"></translation> + <translation>Vorherige Unerledigte</translation> </message> <message> <location/> <source>Move to the previous unfinished item.</source> - <translation type="unfinished"></translation> + <translation>Gehe zum vorangehenden unerledigten Eintrag.</translation> </message> <message> <location/> <source>Next unfinished item.</source> - <translation type="unfinished"></translation> + <translation>Nächste Unerledigte</translation> </message> <message> <location/> <source>Move to the next unfinished item.</source> - <translation type="unfinished"></translation> + <translation>Gehe zum nächsten unerledigten Eintrag.</translation> </message> <message> <location/> <source>Move to previous item.</source> - <translation type="unfinished"></translation> + <translation>Gehe zum vorigen Eintrag.</translation> </message> <message> <location/> <source>Move to the previous item.</source> - <translation type="unfinished"></translation> + <translation>Gehe zum vorigen Eintrag.</translation> </message> <message> <location/> <source>Next item.</source> - <translation type="unfinished"></translation> + <translation>Nächster EIntrag.</translation> </message> <message> <location/> <source>Move to the next item.</source> - <translation type="unfinished"></translation> + <translation>Gehe zum nächsten Eintrag.</translation> </message> <message> <location/> <source>Mark item as done and move to the next unfinished item.</source> - <translation type="unfinished"></translation> + <translation>Markiere Eintrag als erledigt und gehe zum nächsten unerledigten Eintrag.</translation> </message> <message> <location/> <source>Mark this item as done and move to the next unfinished item.</source> - <translation type="unfinished"></translation> + <translation>Markiert diesen Eintrag als erledigt und geht zum nächsten unerledigten Eintrag.</translation> </message> <message> <location/> <source>Copy from source text</source> - <translation type="unfinished"></translation> + <translation>Übernehme &Ursprungstext</translation> </message> <message> <location/> <source>Toggle the validity check of accelerators.</source> - <translation type="unfinished"></translation> + <translation>Schalte Prüfung der Tastenkürzel um.</translation> </message> <message> <location/> <source>Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source> - <translation type="unfinished"></translation> + <translation>Schalte Prüfung der Tastenkürzel um; das heisst, die Übereinstimmung der kaufmännischen Und-Zeichen in Quelle und Übersetzung. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation> </message> <message> <location/> <source>Toggle the validity check of ending punctuation.</source> - <translation type="unfinished"></translation> + <translation>Schalte Prüfung der Satzendezeichen am Ende des Textes um.</translation> </message> <message> <location/> <source>Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source> - <translation type="unfinished"></translation> + <translation>Schaltet die Prüfung der Satzendezeichen am Ende des Textes um. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation> </message> <message> <location/> <source>Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source> - <translation type="unfinished"></translation> + <translation>Schaltet die Prüfung der Verwendung der Wörterbuchvorschläge um. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation> </message> <message> <location/> <source>Toggle the validity check of place markers.</source> - <translation type="unfinished"></translation> + <translation>Schaltet die Prüfung der Platzhalter um.</translation> </message> <message> <location/> <source>Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source> - <translation type="unfinished"></translation> + <translation>Schaltet die Prüfung der Platzhalter um; das heisst, ob %1, %2,... in Quelltext und Übersetzung übereinstimmend verwendet werden. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation> </message> <message> <location/> <source>Open Read-O&nly...</source> - <translation type="unfinished"></translation> + <translation>Schr&eibgeschützt öffnen...</translation> </message> <message> <location/> <source>&Save All</source> - <translation type="unfinished"></translation> + <translation>&Alles Speichern</translation> </message> <message> <location/> @@ -767,22 +768,22 @@ p, li { white-space: pre-wrap; } <message> <location/> <source>Recently Opened &Files</source> - <translation type="unfinished"></translation> + <translation>Zu&letzt bearbeitete Dateien</translation> </message> <message> <location/> <source>Save</source> - <translation type="unfinished"></translation> + <translation>Speichern</translation> </message> <message> <location/> <source>Print a list of all the translation units in the current translation source file.</source> - <translation type="unfinished"></translation> + <translation>Liste aller Übersetzungseinheiten in der aktuellen Übersetzungsdatei drucken.</translation> </message> <message> <location/> <source>Undo the last editing operation performed on the current translation.</source> - <translation type="unfinished"></translation> + <translation>Mache die letzte Änderung an der Übersetzung rückgängig.</translation> </message> <message> <location/> @@ -902,12 +903,12 @@ p, li { white-space: pre-wrap; } <message> <location/> <source>Close</source> - <translation type="unfinished">Schließen</translation> + <translation>Schließen</translation> </message> <message> <location/> <source>&Close All</source> - <translation type="unfinished"></translation> + <translation>A&lle schließen</translation> </message> <message> <location/> @@ -1170,49 +1171,49 @@ p, li { white-space: pre-wrap; } <message> <location line="+195"/> <source>Source text</source> - <translation type="unfinished">Ursprungstext</translation> + <translation>Ursprungstext</translation> </message> <message> <location line="+1"/> <location line="+25"/> <source>Index</source> - <translation type="unfinished">Index</translation> + <translation>Index</translation> </message> <message> <location line="-2"/> <location line="+61"/> <source>Context</source> - <translation type="unfinished">Kontext</translation> + <translation>Kontext</translation> </message> <message> <location line="-60"/> <source>Items</source> - <translation type="unfinished">Einträge</translation> + <translation>Einträge</translation> </message> <message> <location line="+77"/> <source>This panel lists the source contexts.</source> - <translation type="unfinished">Dieser Bereich zeigt die Kontexte an.</translation> + <translation>Dieser Bereich zeigt die Kontexte an.</translation> </message> <message> <location line="+15"/> <source>Strings</source> - <translation type="unfinished">Zeichenketten</translation> + <translation>Zeichenketten</translation> </message> <message> <location line="+39"/> <source>Phrases and guesses</source> - <translation type="unfinished">Wörterbuch und Vorschläge</translation> + <translation>Wörterbuch und Vorschläge</translation> </message> <message> <location line="+10"/> <source>Sources and Forms</source> - <translation type="unfinished"></translation> + <translation>Quelldateien und Formulare</translation> </message> <message> <location line="+15"/> <source>Warnings</source> - <translation type="unfinished">Warnungen</translation> + <translation>Hinweise</translation> </message> <message> <location line="+59"/> @@ -1223,120 +1224,124 @@ p, li { white-space: pre-wrap; } <message> <location line="+125"/> <source>Loading...</source> - <translation type="unfinished">Lade...</translation> + <translation>Lade...</translation> </message> <message> <location line="+32"/> <location line="+22"/> <source>Loading File - Qt Linguist</source> - <translation type="unfinished"></translation> + <translation>Laden - Qt Linguist</translation> </message> <message> <location line="-21"/> <source>The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first?</source> - <translation type="unfinished"></translation> + <translation>Die Datei '%1' scheint nicht zu den bereits geöffneten Dateien '%2' zu passen. + +Sollen die bereits geöffneten Dateien vorher geschlossen werden?</translation> </message> <message> <location line="+22"/> <source>The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file?</source> - <translation type="unfinished"></translation> + <translation>Die Datei '%1' scheint nicht zu der Datei '%2' zu passen, die ebenfalls geladen wird. + +Soll die erstgenannte Datei übersprungen werden?</translation> </message> <message numerus="yes"> <location line="+61"/> <source>%n translation unit(s) loaded.</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Eine Übersetzungseinheit geladen.</numerusform> + <numerusform>%n Übersetzungseinheiten geladen.</numerusform> </translation> </message> <message> <location line="+93"/> <source>Related files (%1);;</source> - <translation type="unfinished"></translation> + <translation>Verwandte Dateien (%1);;</translation> </message> <message> <location line="+4"/> <source>Open Translation Files</source> - <translation type="unfinished"></translation> + <translation>Übersetzungsdateien öffnen</translation> </message> <message> <location line="+10"/> <location line="+31"/> <source>File saved.</source> - <translation type="unfinished">Datei gespeichert.</translation> + <translation>Datei gespeichert.</translation> </message> <message> <location line="+15"/> <location line="+1164"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>Release</source> - <translation type="unfinished">Freigeben</translation> + <translation>Freigeben</translation> </message> <message> <location line="-1163"/> <source>Qt message files for released applications (*.qm) All files (*)</source> - <translation type="unfinished">Qt Nachrichtendateien (*.qm) + <translation>Qt Nachrichtendateien (*.qm) Alle Dateien (*)</translation> </message> <message> <location line="+3"/> <location line="+12"/> <source>File created.</source> - <translation type="unfinished">Datei erzeugt.</translation> + <translation>Datei erzeugt.</translation> </message> <message> <location line="+27"/> <location line="+355"/> <source>Printing...</source> - <translation type="unfinished">Drucke...</translation> + <translation>Drucke...</translation> </message> <message> <location line="-347"/> <source>Context: %1</source> - <translation type="unfinished">Kontext: %1</translation> + <translation>Kontext: %1</translation> </message> <message> <location line="+32"/> <source>finished</source> - <translation type="unfinished">erledigt</translation> + <translation>erledigt</translation> </message> <message> <location line="+3"/> <source>unresolved</source> - <translation type="unfinished">ungelöst</translation> + <translation>ungelöst</translation> </message> <message> <location line="+3"/> <source>obsolete</source> - <translation type="unfinished">veraltet</translation> + <translation>veraltet</translation> </message> <message> <location line="+15"/> <location line="+307"/> <source>Printing... (page %1)</source> - <translation type="unfinished">Drucke... (Seite %1)</translation> + <translation>Drucke... (Seite %1)</translation> </message> <message> <location line="-300"/> <location line="+307"/> <source>Printing completed</source> - <translation type="unfinished">Drucken beendet</translation> + <translation>Drucken beendet</translation> </message> <message> <location line="-305"/> <location line="+307"/> <source>Printing aborted</source> - <translation type="unfinished">Drucken abgebrochen</translation> + <translation>Drucken abgebrochen</translation> </message> <message> <location line="-232"/> <source>Search wrapped.</source> - <translation type="unfinished">Suche beginnt von oben.</translation> + <translation>Suche beginnt von oben.</translation> </message> <message> <location line="+17"/> @@ -1356,7 +1361,7 @@ Alle Dateien (*)</translation> <location line="-1204"/> <location line="+102"/> <source>Cannot find the string '%1'.</source> - <translation type="unfinished">Kann Zeichenkette '%1' nicht finden.</translation> + <translation>Kann Zeichenkette '%1' nicht finden.</translation> </message> <message numerus="yes"> <source>Translated %n entries to '%1'</source> @@ -1368,59 +1373,59 @@ Alle Dateien (*)</translation> <message> <location line="-82"/> <source>Search And Translate in '%1' - Qt Linguist</source> - <translation type="unfinished"></translation> + <translation>Suchen und übersetzen '%1' - Qt Linguist</translation> </message> <message> <location line="+34"/> <location line="+23"/> <location line="+24"/> <source>Translate - Qt Linguist</source> - <translation type="unfinished"></translation> + <translation>Übersetzung - Qt Linguist</translation> </message> <message numerus="yes"> <location line="-46"/> <source>Translated %n entry(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Ein Eintrag übersetzt</numerusform> + <numerusform>%n Einträge übersetzt</numerusform> </translation> </message> <message> <location line="+23"/> <source>No more occurrences of '%1'. Start over?</source> - <translation type="unfinished"></translation> + <translation>Keine weiteren Fundstellen von '%1'. Von vorn beginnen?</translation> </message> <message> <location line="+30"/> <source>Create New Phrase Book</source> - <translation type="unfinished">Erzeugen eines neuen Wörterbuchs</translation> + <translation>Erzeugen eines neuen Wörterbuchs</translation> </message> <message> <location line="+1"/> <source>Qt phrase books (*.qph) All files (*)</source> - <translation type="unfinished">Qt Wörterbücher (*.qph) + <translation>Qt Wörterbücher (*.qph) Alle Dateien (*)</translation> </message> <message> <location line="+11"/> <source>Phrase book created.</source> - <translation type="unfinished">Wörterbuch erzeugt.</translation> + <translation>Wörterbuch erzeugt.</translation> </message> <message> <location line="+17"/> <source>Open Phrase Book</source> - <translation type="unfinished">Öffne Wörterbuch</translation> + <translation>Öffne Wörterbuch</translation> </message> <message> <location line="+1"/> <source>Qt phrase books (*.qph);;All files (*)</source> - <translation type="unfinished">Qt Wörterbücher (*.qph);;Alle Dateien (*)</translation> + <translation>Qt Wörterbücher (*.qph);;Alle Dateien (*)</translation> </message> <message numerus="yes"> <location line="+7"/> <source>%n phrase(s) loaded.</source> - <translation type="unfinished"> + <translation> <numerusform>Ein Wörterbucheintrag geladen.</numerusform> <numerusform>%n Wörterbucheinträge geladen.</numerusform> </translation> @@ -1430,32 +1435,32 @@ Alle Dateien (*)</translation> <location line="+3"/> <location line="+7"/> <source>Add to phrase book</source> - <translation type="unfinished">Hinzufügen zum Wörterbuch</translation> + <translation>Hinzufügen zum Wörterbuch</translation> </message> <message> <location line="-9"/> <source>No appropriate phrasebook found.</source> - <translation type="unfinished"></translation> + <translation>Es wurde kein geeignetes Wörterbuch gefunden.</translation> </message> <message> <location line="+3"/> <source>Adding entry to phrasebook %1</source> - <translation type="unfinished"></translation> + <translation>Eintrag zu Wörterbuch %1 hinzufügen</translation> </message> <message> <location line="+7"/> <source>Select phrase book to add to</source> - <translation type="unfinished">Zu welchem Wörterbuch soll der Eintrag hinzugefügt werden?</translation> + <translation>Zu welchem Wörterbuch soll der Eintrag hinzugefügt werden?</translation> </message> <message> <location line="+29"/> <source>Unable to launch Qt Assistant (%1)</source> - <translation type="unfinished">Kann Qt Assistant nicht starten (%1)</translation> + <translation>Kann Qt Assistant nicht starten (%1)</translation> </message> <message> <location line="+17"/> <source>Version %1</source> - <translation type="unfinished">Version %1</translation> + <translation>Version %1</translation> </message> <message> <source> Open Source Edition</source> @@ -1464,17 +1469,17 @@ Alle Dateien (*)</translation> <message> <location line="+6"/> <source><center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p></source> - <translation type="unfinished"><center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist ist ein Werkzeug zum Übersetzen von Qt Anwendungen.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p></translation> + <translation><center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist ist ein Werkzeug zum Übersetzen von Qt Anwendungen.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p></translation> </message> <message> <location line="+41"/> <source>Do you want to save the modified files?</source> - <translation type="unfinished"></translation> + <translation>Möchten Sie die geänderten Dateien speichern?</translation> </message> <message> <location line="+22"/> <source>Do you want to save '%1'?</source> - <translation type="unfinished">Wollen Sie '%1' speichern?</translation> + <translation>Möchten Sie '%1' speichern?</translation> </message> <message> <location line="+43"/> @@ -1490,99 +1495,99 @@ Alle Dateien (*)</translation> <location line="+267"/> <location line="+12"/> <source>No untranslated translation units left.</source> - <translation type="unfinished"></translation> + <translation>Es wurden alle Übersetzungseinheiten abgearbeitet.</translation> </message> <message> <location line="+176"/> <source>&Window</source> - <translation type="unfinished">&Fenster</translation> + <translation>&Fenster</translation> </message> <message> <location line="+2"/> <source>Minimize</source> - <translation type="unfinished">Minimieren</translation> + <translation>Minimieren</translation> </message> <message> <location line="+1"/> <source>Ctrl+M</source> - <translation type="unfinished">Ctrl+M</translation> + <translation type="unfinished"></translation> </message> <message> <location line="+12"/> <source>Display the manual for %1.</source> - <translation type="unfinished">Zeige Handbuch für %1 an.</translation> + <translation>Zeige Handbuch für %1 an.</translation> </message> <message> <location line="+1"/> <source>Display information about %1.</source> - <translation type="unfinished">Zeige Informationen über %1 an.</translation> + <translation>Zeige Informationen über %1 an.</translation> </message> <message> <location line="+70"/> <source>&Save '%1'</source> - <translation type="unfinished"></translation> + <translation>'%1' &Speichern</translation> </message> <message> <location line="+1"/> <source>Save '%1' &As...</source> - <translation type="unfinished"></translation> + <translation>Speichere '%1' &unter...</translation> </message> <message> <location line="+1"/> <source>Release '%1'</source> - <translation type="unfinished"></translation> + <translation>'%1' freigeben</translation> </message> <message> <location line="+1"/> <source>Release '%1' As...</source> - <translation type="unfinished"></translation> + <translation>Gebe '%1'frei unter ...</translation> </message> <message> <location line="+1"/> <source>&Close '%1'</source> - <translation type="unfinished"></translation> + <translation>'%1' &Schließen</translation> </message> <message> <location line="+6"/> <location line="+13"/> <source>&Close</source> - <translation type="unfinished">&Schließen</translation> + <translation>&Schließen</translation> </message> <message> <location line="-10"/> <source>Save All</source> - <translation type="unfinished"></translation> + <translation>Alles speichern</translation> </message> <message> <location line="+1"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>&Release All</source> - <translation type="unfinished"></translation> + <translation>Alles f&reigeben</translation> </message> <message> <location line="+1"/> <source>Close All</source> - <translation type="unfinished">Alle schließen</translation> + <translation>Alle schließen</translation> </message> <message> <location line="+23"/> <source>Translation File &Settings for '%1'...</source> - <translation type="unfinished"></translation> + <translation>Einstellungen der Übersetzungs&datei für '%1'...</translation> </message> <message> <location line="+1"/> <source>&Batch Translation of '%1'...</source> - <translation type="unfinished"></translation> + <translation>&Automatische Übersetzung von '%1'...</translation> </message> <message> <location line="+1"/> <source>Search And &Translate in '%1'...</source> - <translation type="unfinished"></translation> + <translation>Suchen und &Übersetzen in '%1'...</translation> </message> <message> <location line="+4"/> <source>Search And &Translate...</source> - <translation type="unfinished"></translation> + <translation>Suchen und &Übersetzen...</translation> </message> <message> <location line="+51"/> @@ -1617,37 +1622,37 @@ Alle Dateien (*)</translation> <message> <location line="+84"/> <source>Cannot read from phrase book '%1'.</source> - <translation type="unfinished">Kann Wörterbuch '%1' nicht lesen.</translation> + <translation>Kann Wörterbuch '%1' nicht lesen.</translation> </message> <message> <location line="+15"/> <source>Close this phrase book.</source> - <translation type="unfinished">Schließe dieses Wörterbuch.</translation> + <translation>Schließe dieses Wörterbuch.</translation> </message> <message> <location line="+4"/> <source>Enables you to add, modify, or delete entries in this phrase book.</source> - <translation type="unfinished"></translation> + <translation>Erlaubt das Hinzufügen, Ändern und Entfernen von Einträgen aus dem Wörterbuch.</translation> </message> <message> <location line="+5"/> <source>Print the entries in this phrase book.</source> - <translation type="unfinished"></translation> + <translation>Drucke die Einträge des Wörterbuchs.</translation> </message> <message> <location line="+16"/> <source>Cannot create phrase book '%1'.</source> - <translation type="unfinished">Kann Wörterbuch '%1' nicht erzeugen.</translation> + <translation>Kann Wörterbuch '%1' nicht erzeugen.</translation> </message> <message> <location line="+10"/> <source>Do you want to save phrase book '%1'?</source> - <translation type="unfinished"></translation> + <translation>Möchten Sie das Wörterbuch '%1' speichern?</translation> </message> <message> <location line="+314"/> <source>All</source> - <translation type="unfinished"></translation> + <translation>Alle</translation> </message> <message> <location filename="../tools/linguist/linguist/mainwindow.ui"/> @@ -1704,27 +1709,27 @@ Alle Dateien (*)</translation> <message> <location filename="../tools/linguist/linguist/messageeditor.cpp" line="+72"/> <source>German</source> - <translation type="unfinished">Deutsch</translation> + <translation>Deutsch</translation> </message> <message> <location line="+1"/> <source>Japanese</source> - <translation type="unfinished">Japanisch</translation> + <translation>Japanisch</translation> </message> <message> <location line="+1"/> <source>French</source> - <translation type="unfinished">Französisch</translation> + <translation>Französisch</translation> </message> <message> <location line="+1"/> <source>Polish</source> - <translation type="unfinished">Polnisch</translation> + <translation>Polnisch</translation> </message> <message> <location line="+1"/> <source>Chinese</source> - <translation type="unfinished">Chinesisch</translation> + <translation>Chinesisch</translation> </message> <message> <location line="+50"/> @@ -1732,59 +1737,59 @@ Alle Dateien (*)</translation> <translation>Dieser Bereich erlaubt die Darstellung und Änderung der Übersetzung eines Textes.</translation> </message> <message> - <location line="+25"/> + <location line="+18"/> <source>Source text</source> - <translation type="unfinished">Ursprungstext</translation> + <translation>Ursprungstext</translation> </message> <message> <location line="+2"/> <source>This area shows the source text.</source> - <translation type="unfinished">Dieser Bereich zeigt den Ursprungstext.</translation> + <translation>Dieser Bereich zeigt den Ursprungstext.</translation> </message> <message> <location line="+3"/> <source>Source text (Plural)</source> - <translation type="unfinished"></translation> + <translation>Ursprungstext (Plural)</translation> </message> <message> <location line="+2"/> <source>This area shows the plural form of the source text.</source> - <translation type="unfinished"></translation> + <translation>Dieser Bereich zeigt die Pluralform des Ursprungstexts.</translation> </message> <message> <location line="+3"/> <source>Developer comments</source> - <translation type="unfinished"></translation> + <translation>Hinweise des Entwicklers</translation> </message> <message> <location line="+3"/> <source>This area shows a comment that may guide you, and the context in which the text occurs.</source> - <translation type="unfinished">Dieser Bereich zeigt eventuelle Kommentare und den Kontext, in dem der Text auftritt.</translation> + <translation>Dieser Bereich zeigt eventuelle Kommentare und den Kontext, in dem der Text auftritt.</translation> </message> <message> <location line="+59"/> <source>Here you can enter comments for your own use. They have no effect on the translated applications.</source> - <translation type="unfinished"></translation> + <translation>Hier können Sie Hinweise für den eigenen Gebrauch eintragen. Diese haben keinen Einflusse auf die Übersetzung.</translation> </message> <message> <location line="+205"/> <source>%1 translation (%2)</source> - <translation type="unfinished">Übersetzung %1 (%2)</translation> + <translation>Übersetzung %1 (%2)</translation> </message> <message> <location line="+19"/> <source>This is where you can enter or modify the translation of the above source text.</source> - <translation type="unfinished"></translation> + <translation>Hier können Sie die Übersetzung des Ursprungstextes eingeben bzw. ändern.</translation> </message> <message> <location line="+5"/> <source>%1 translation</source> - <translation type="unfinished">Übersetzung %1</translation> + <translation>Übersetzung %1</translation> </message> <message> <location line="+1"/> <source>%1 translator comments</source> - <translation type="unfinished"></translation> + <translation>%1 Hinweise des Übersetzers</translation> </message> <message> <location line="+138"/> @@ -1839,22 +1844,22 @@ Zeile: %2</translation> <message> <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+832"/> <source>Completion status for %1</source> - <translation type="unfinished"></translation> + <translation>Bearbeitungsstand von %1</translation> </message> <message> <location line="+15"/> <source><file header></source> - <translation type="unfinished"></translation> + <translation><Dateikopf></translation> </message> <message> <location line="+2"/> <source><context comment></source> - <translation type="unfinished"></translation> + <translation><Kontexthinweis></translation> </message> <message> <location line="+71"/> <source><unnamed context></source> - <translation type="unfinished"></translation> + <translation><unbenannter Kontext></translation> </message> </context> <context> @@ -1867,7 +1872,7 @@ Zeile: %2</translation> <context> <name>MsgEdit</name> <message> - <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-579"/> + <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-572"/> <source></source> <comment>This is the right panel of the main window.</comment> <translation></translation> @@ -1912,7 +1917,7 @@ Zeile: %2</translation> <message> <location/> <source>This window allows you to add, modify, or delete entries in a phrase book.</source> - <translation type="unfinished"></translation> + <translation>Dieses Fenster erlaubt das Hinzufügen, Ändern und Entfernen von Einträgen aus dem Wörterbuch.</translation> </message> <message> <location/> @@ -1952,22 +1957,22 @@ Zeile: %2</translation> <message> <location/> <source>&New Entry</source> - <translation type="unfinished"></translation> + <translation>&Neuer Eintrag</translation> </message> <message> <location/> <source>Click here to remove the entry from the phrase book.</source> - <translation type="unfinished"></translation> + <translation>Entferne den Eintrag aus dem Wörterbuch.</translation> </message> <message> <location/> <source>&Remove Entry</source> - <translation type="unfinished"></translation> + <translation>&Entferne Eintrag</translation> </message> <message> <location/> <source>Settin&gs...</source> - <translation type="unfinished"></translation> + <translation>&Einstellungen...</translation> </message> <message> <source>&New Phrase</source> @@ -2053,12 +2058,12 @@ Zeile: %2</translation> <message> <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1279"/> <source>Translation files (%1);;</source> - <translation type="unfinished"></translation> + <translation>Übersetzungsdateien (%1);;</translation> </message> <message> <location line="+5"/> <source>All files (*)</source> - <translation type="unfinished"></translation> + <translation>Alle Dateien (*)</translation> </message> <message> <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1118"/> @@ -2074,57 +2079,57 @@ Zeile: %2</translation> <message> <location filename="../tools/linguist/shared/cpp.cpp" line="+1072"/> <source>C++ source files</source> - <translation type="unfinished"></translation> + <translation>C++-Quelltextdateien'</translation> </message> <message> <location filename="../tools/linguist/shared/java.cpp" line="+646"/> <source>Java source files</source> - <translation type="unfinished"></translation> + <translation>Java-Quelltextdateien</translation> </message> <message> <location filename="../tools/linguist/shared/po.cpp" line="+651"/> <source>GNU Gettext localization files</source> - <translation type="unfinished"></translation> + <translation>GNU-Gettext Übersetzungsdateien</translation> </message> <message> <location filename="../tools/linguist/shared/qscript.cpp" line="+2399"/> <source>Qt Script source files</source> - <translation type="unfinished"></translation> + <translation>Qt-Skript-Quelltextdateien</translation> </message> <message> <location filename="../tools/linguist/shared/ts.cpp" line="+752"/> <source>Qt translation sources (format 1.1)</source> - <translation type="unfinished"></translation> + <translation>Qt-Übersetzungsdateien (Formatversion 1.1)</translation> </message> <message> <location line="+8"/> <source>Qt translation sources (format 2.0)</source> - <translation type="unfinished"></translation> + <translation>Qt-Übersetzungsdateien (Formatversion 2.0)</translation> </message> <message> <location line="+9"/> <source>Qt translation sources (latest format)</source> - <translation type="unfinished"></translation> + <translation>Qt Übersetzungsdateien (aktuelles Format)</translation> </message> <message> <location filename="../tools/linguist/shared/ui.cpp" line="+213"/> <source>Qt Designer form files</source> - <translation type="unfinished"></translation> + <translation>Qt Designer Formulardateien</translation> </message> <message> <location line="+9"/> <source>Qt Jambi form files</source> - <translation type="unfinished"></translation> + <translation>Qt Jambi Formulardateien</translation> </message> <message> <location filename="../tools/linguist/shared/xliff.cpp" line="+817"/> <source>XLIFF localization files</source> - <translation type="unfinished"></translation> + <translation>XLIFF Übersetzungsdateien</translation> </message> <message> <location filename="../tools/linguist/shared/qph.cpp" line="+192"/> <source>Qt Linguist 'Phrase Book'</source> - <translation type="unfinished"></translation> + <translation>Qt Linguist-Wörterbuch</translation> </message> </context> <context> @@ -2223,7 +2228,7 @@ Zeile: %2</translation> <message> <location/> <source>Close</source> - <translation type="unfinished">Schließen</translation> + <translation>Schließen</translation> </message> </context> <context> @@ -2727,27 +2732,27 @@ Alle Dateien (*)</translation> <location line="+11"/> <location line="+8"/> <source>Settings for '%1' - Qt Linguist</source> - <translation type="unfinished"></translation> + <translation>Einstellungen für '%1' - Qt Linguist</translation> </message> <message> <location filename="../tools/linguist/linguist/translationsettings.ui"/> <source>Source language</source> - <translation type="unfinished"></translation> + <translation>Ursprungssprache</translation> </message> <message> <location/> <source>Language</source> - <translation type="unfinished">Sprache</translation> + <translation>Sprache</translation> </message> <message> <location/> <source>Country/Region</source> - <translation type="unfinished">Land/Region</translation> + <translation>Land/Region</translation> </message> <message> <location/> <source>Target language</source> - <translation type="unfinished">Zielsprache</translation> + <translation>Zielsprache</translation> </message> </context> <context> diff --git a/translations/qt_de.qm b/translations/qt_de.qm Binary files differindex 5d68bf7..9ea09a7 100644 --- a/translations/qt_de.qm +++ b/translations/qt_de.qm diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 70cf6f3..33f9ea8 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -22,7 +22,7 @@ <context> <name>CloseButton</name> <message> - <location filename="../src/gui/widgets/qtabbar.cpp" line="+2251"/> + <location filename="../src/gui/widgets/qtabbar.cpp" line="+2252"/> <source>Close Tab</source> <translation>Schließen</translation> </message> @@ -186,7 +186,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa <context> <name>Q3FileDialog</name> <message> - <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+864"/> + <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+865"/> <source>Copy or Move a File</source> <translation>Datei kopieren oder verschieben</translation> </message> @@ -203,7 +203,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa </message> <message> <location line="-22"/> - <location line="+1575"/> + <location line="+1579"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -886,7 +886,7 @@ nach <context> <name>QApplication</name> <message> - <location filename="../src/gui/kernel/qapplication.cpp" line="+2248"/> + <location filename="../src/gui/kernel/qapplication.cpp" line="+2247"/> <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> @@ -1170,7 +1170,7 @@ nach <context> <name>QDialogButtonBox</name> <message> - <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1866"/> + <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1869"/> <location line="+464"/> <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+561"/> <source>OK</source> @@ -1392,7 +1392,7 @@ nach <message> <location line="-108"/> <source>Cannot remove source file</source> - <translation type="unfinished"></translation> + <translation>Die Quelldatei kann nicht entfernt werden</translation> </message> <message> <location line="+120"/> @@ -1418,8 +1418,8 @@ nach <context> <name>QFileDialog</name> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+515"/> - <location line="+444"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+514"/> + <location line="+447"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> @@ -1448,7 +1448,7 @@ nach <translation>Datei</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-461"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-464"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -1458,26 +1458,26 @@ nach <translation>Speichern unter</translation> </message> <message> - <location line="+678"/> + <location line="+681"/> <location line="+50"/> - <location line="+1471"/> + <location line="+1467"/> <location line="+75"/> <source>&Open</source> <translation>&Öffnen</translation> </message> <message> - <location line="-1596"/> + <location line="-1592"/> <location line="+50"/> <source>&Save</source> <translation>S&peichern</translation> </message> <message> - <location line="+1822"/> + <location line="+1818"/> <source>Recent Places</source> <translation>Zuletzt besucht</translation> </message> <message> - <location line="-2521"/> + <location line="-2520"/> <source>&Rename</source> <translation>&Umbenennen</translation> </message> @@ -1492,17 +1492,17 @@ nach <translation>&Versteckte Dateien anzeigen</translation> </message> <message> - <location line="+1964"/> + <location line="+1963"/> <source>New Folder</source> <translation>Neues Verzeichnis</translation> </message> <message> - <location line="-1999"/> + <location line="-1998"/> <source>Find Directory</source> <translation>Verzeichnis suchen</translation> </message> <message> - <location line="+685"/> + <location line="+688"/> <source>Directories</source> <translation>Verzeichnisse</translation> </message> @@ -1512,13 +1512,13 @@ nach <translation>Alle Dateien (*.*)</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-644"/> - <location line="+648"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-647"/> + <location line="+651"/> <source>Directory:</source> <translation>Verzeichnis:</translation> </message> <message> - <location line="+828"/> + <location line="+825"/> <source>%1 already exists. Do you want to replace it?</source> <translation>Die Datei %1 existiert bereits. @@ -1552,7 +1552,7 @@ Stellen Sie sicher, dass der Dateiname richtig ist.</translation> </message> <message> <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-54"/> - <location line="+862"/> + <location line="+861"/> <source>%1 Directory not found. Please verify the correct directory name was given.</source> @@ -1588,7 +1588,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation>Unbekannt</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2118"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2117"/> <source>Show </source> <translation>Anzeigen </translation> </message> @@ -1604,19 +1604,19 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation>&Neues Verzeichnis</translation> </message> <message> - <location line="+656"/> + <location line="+659"/> <location line="+38"/> <source>&Choose</source> <translation>&Auswählen</translation> </message> <message> - <location filename="../src/gui/dialogs/qsidebar.cpp" line="+418"/> + <location filename="../src/gui/dialogs/qsidebar.cpp" line="+437"/> <source>Remove</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-687"/> - <location line="+652"/> + <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-690"/> + <location line="+655"/> <source>File &name:</source> <translation>Datei&name:</translation> </message> @@ -1698,7 +1698,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation>Änderungsdatum</translation> </message> <message> - <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+234"/> + <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+242"/> <source>My Computer</source> <translation>Mein Computer</translation> </message> @@ -2161,7 +2161,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <context> <name>QHttp</name> <message> - <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+876"/> + <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+901"/> <location filename="../src/qt3support/network/q3http.cpp" line="+1836"/> <source>Connection refused</source> <translation>Verbindung verweigert</translation> @@ -2253,7 +2253,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <message> <location line="+28"/> <source>Unknown authentication method</source> - <translation type="unfinished"></translation> + <translation>Unbekannte Authentifizierungsmethode</translation> </message> <message> <location line="+97"/> @@ -2365,7 +2365,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <context> <name>QIBaseDriver</name> <message> - <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1428"/> + <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1435"/> <source>Error opening database</source> <translation>Die Datenbankverbindung konnte nicht geöffnet werden</translation> </message> @@ -2643,7 +2643,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <name>QLocalServer</name> <message> <location filename="../src/network/socket/qlocalserver.cpp" line="+226"/> - <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+231"/> + <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+233"/> <source>%1: Name error</source> <translation>%1: Fehlerhafter Name</translation> </message> @@ -2738,7 +2738,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <context> <name>QMYSQLDriver</name> <message> - <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1231"/> + <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1252"/> <source>Unable to open database '</source> <translation>Die Datenbankverbindung konnte nicht geöffnet werden '</translation> </message> @@ -2766,12 +2766,12 @@ Möchten sie die Datei trotzdem löschen?</translation> <context> <name>QMYSQLResult</name> <message> - <location line="-922"/> + <location line="-935"/> <source>Unable to fetch data</source> <translation>Es konnten keine Daten abgeholt werden</translation> </message> <message> - <location line="+176"/> + <location line="+183"/> <source>Unable to execute query</source> <translation>Die Abfrage konnte nicht ausgeführt werden</translation> </message> @@ -2781,13 +2781,13 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation>Das Ergebnis konnte nicht gespeichert werden</translation> </message> <message> - <location line="+190"/> + <location line="+194"/> <location line="+8"/> <source>Unable to prepare statement</source> <translation>Der Befehl konnte nicht initialisiert werden</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Unable to reset statement</source> <translation>Der Befehl konnte nicht zurückgesetzt werden</translation> </message> @@ -2813,7 +2813,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation>Die Ergebnisse des Befehls konnten nicht gespeichert werden</translation> </message> <message> - <location line="-253"/> + <location line="-257"/> <source>Unable to execute next query</source> <translation>Die folgende Abfrage kann nicht ausgeführt werden</translation> </message> @@ -2971,7 +2971,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation type="obsolete"><p>Dieses Programm verwendet Qt-Version %1.</p></translation> </message> <message> - <location line="-1097"/> + <location line="-1100"/> <source>Show Details...</source> <translation>Details einblenden...</translation> </message> @@ -2981,7 +2981,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <translation>Details ausblenden...</translation> </message> <message> - <location line="+1570"/> + <location line="+1573"/> <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>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</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> @@ -3310,7 +3310,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <context> <name>QODBCDriver</name> <message> - <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1785"/> + <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1781"/> <source>Unable to connect</source> <translation>Es kann keine Verbindung aufgebaut werden</translation> </message> @@ -3444,7 +3444,7 @@ Möchten sie die Datei trotzdem löschen?</translation> <context> <name>QPPDOptionsModel</name> <message> - <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1195"/> + <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1197"/> <source>Name</source> <translation>Name</translation> </message> @@ -4009,7 +4009,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <translation>Benutzerdefiniert</translation> </message> <message> - <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-522"/> + <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-524"/> <location line="+68"/> <source>&Options >></source> <translation>&Einstellungen >></translation> @@ -4030,7 +4030,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <translation>Druck in Postscript-Datei</translation> </message> <message> - <location line="+45"/> + <location line="+47"/> <source>Local file</source> <translation>Lokale Datei</translation> </message> @@ -4040,7 +4040,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <translation>Schreiben der Datei %1</translation> </message> <message> - <location line="-367"/> + <location line="-369"/> <source>&Print</source> <translation>&Drucken</translation> </message> @@ -4373,7 +4373,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <message> <location line="+912"/> <source>No program defined</source> - <translation type="unfinished"></translation> + <translation>Es wurde kein Programm angegeben</translation> </message> <message> <location filename="../src/corelib/io/qprocess_win.cpp" line="-341"/> @@ -5985,7 +5985,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <translation>%1 (%2x%3 Pixel)</translation> </message> <message> - <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+382"/> + <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+384"/> <source>Bad HTTP request</source> <translation>Ungültige HTTP-Anforderung</translation> </message> @@ -6077,15 +6077,15 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <message> <location line="+15"/> <source>JavaScript Confirm - %1</source> - <translation type="unfinished">JavaScript-Bestätigung - %1</translation> + <translation>JavaScript-Bestätigung - %1</translation> </message> <message> <location line="+17"/> <source>JavaScript Prompt - %1</source> - <translation type="unfinished">JavaScript-Eingabeaufforderung - %1</translation> + <translation>JavaScript-Eingabeaufforderung - %1</translation> </message> <message> - <location line="+333"/> + <location line="+340"/> <source>Move the cursor to the next character</source> <translation>Positionsmarke auf folgendes Zeichen setzen</translation> </message> @@ -6147,7 +6147,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <message> <location line="+3"/> <source>Select all</source> - <translation type="unfinished"></translation> + <translation>Alles auswählen</translation> </message> <message> <location line="+3"/> @@ -6222,12 +6222,12 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <message> <location line="+33"/> <source>Insert a new paragraph</source> - <translation type="unfinished"></translation> + <translation>Neuen Abschnitt einfügen</translation> </message> <message> <location line="+3"/> <source>Insert a new line</source> - <translation type="unfinished"></translation> + <translation>Neue Zeile einfügen</translation> </message> </context> <context> @@ -6241,7 +6241,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <context> <name>QWidget</name> <message> - <location filename="../src/gui/kernel/qwidget.cpp" line="+5326"/> + <location filename="../src/gui/kernel/qwidget.cpp" line="+5340"/> <source>*</source> <translation>*</translation> </message> @@ -6787,7 +6787,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <translation>%1 ist kein gültiger regulärer Ausdruck: %2</translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+347"/> + <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+346"/> <source>It will not be possible to retrieve %1.</source> <translation>%1 kann nicht bestimmt werden.</translation> </message> @@ -7508,7 +7508,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> <message> <location filename="../src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp" line="+69"/> <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source> - <translation type="unfinished"></translation> + <translation>Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein.</translation> </message> <message> <location line="+11"/> diff --git a/translations/qt_help_de.qm b/translations/qt_help_de.qm Binary files differindex e28a97e..e3d8d87 100644 --- a/translations/qt_help_de.qm +++ b/translations/qt_help_de.qm diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts index ed8a3c3..8f67ec3 100644 --- a/translations/qt_help_de.ts +++ b/translations/qt_help_de.ts @@ -39,7 +39,7 @@ <message> <location line="+22"/> <source>Cannot load sqlite database driver!</source> - <translation type="unfinished"></translation> + <translation>Der Datenbanktreiber für SQLite kann nicht geladen werden!</translation> </message> <message> <location line="+11"/> |