diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-09 18:55:51 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-09 18:55:51 (GMT) |
| commit | 7f2540ad80f56ccb4d81b897d90581130e9b9e91 (patch) | |
| tree | 1e1ff4c8f9846faddd58a8ff6d0810bdac7c6f20 | |
| parent | f33359fb0c56fe88e0ae3c564b7847f90889eac2 (diff) | |
| parent | 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9 (diff) | |
| download | Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.zip Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.gz Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
98 files changed, 6942 insertions, 3136 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index f748f3d..e1efa21 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,8 +19,8 @@ $$unixstyle { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES QDOC = $$replace(QDOC, "/", "\\") } -ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf -QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ +ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf +QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/demos/spectrum.qdoc new file mode 100644 index 0000000..b720ce1 --- /dev/null +++ b/doc/src/demos/spectrum.qdoc @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in a +** written agreement between you and Nokia. +** +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example demos/spectrum + \title Spectrum Analyzer +This application is a demo which uses the QtMultimedia APIs to capture and +play back PCM audio. While either recording or playback is ongoing, the +application performs real-time level and frequency spectrum analysis, +displaying the results in its main window. +*/ diff --git a/doc/src/examples/imagegestures.qdoc b/doc/src/examples/imagegestures.qdoc index 57479d8..3d4e467 100644 --- a/doc/src/examples/imagegestures.qdoc +++ b/doc/src/examples/imagegestures.qdoc @@ -32,8 +32,6 @@ This example shows how to enable gestures for a widget and use gesture input to perform actions. - \image imagegestures-example.png Screenshot of the Image Gestures example. - We use two classes to create the user interface for the application: \c MainWidget and \c ImageWidget. The \c MainWidget class is simply used as a container for the \c ImageWidget class, which we will configure to accept gesture input. Since we diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index b2895ba..1bf86e5 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -529,7 +529,7 @@ \title OpenVG Examples \brief Accessing OpenVG from Qt - \image openvg-examples.png + \image opengl-examples.png Qt provides support for integration with OpenVG implementations on platforms with suitable drivers. diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index 145982b..e58305a 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.qdoc @@ -30,7 +30,13 @@ \group gettingStarted - Following is a list. + \section1 + Creating applications using Qt and QML is easy enough once you get started. + To get you started we have created two tutorials creating two similar applications, + but using diiferent approaches. One tutorial implements the user interface using + QML, while the other implements the whole application using traditional Qt. + + Please click on the links below to start the ride. \generatelist{related} */ diff --git a/doc/src/images/arrow.png b/doc/src/images/arrow.png Binary files differnew file mode 100644 index 0000000..14978c2 --- /dev/null +++ b/doc/src/images/arrow.png diff --git a/doc/src/images/qml-texteditor1_button.png b/doc/src/images/qml-texteditor1_button.png Binary files differnew file mode 100644 index 0000000..aab64bc --- /dev/null +++ b/doc/src/images/qml-texteditor1_button.png diff --git a/doc/src/images/qml-texteditor1_editmenu.png b/doc/src/images/qml-texteditor1_editmenu.png Binary files differnew file mode 100644 index 0000000..af8028b --- /dev/null +++ b/doc/src/images/qml-texteditor1_editmenu.png diff --git a/doc/src/images/qml-texteditor1_filemenu.png b/doc/src/images/qml-texteditor1_filemenu.png Binary files differnew file mode 100644 index 0000000..ccc008c --- /dev/null +++ b/doc/src/images/qml-texteditor1_filemenu.png diff --git a/doc/src/images/qml-texteditor1_simplebutton.png b/doc/src/images/qml-texteditor1_simplebutton.png Binary files differnew file mode 100644 index 0000000..21ce509 --- /dev/null +++ b/doc/src/images/qml-texteditor1_simplebutton.png diff --git a/doc/src/images/qml-texteditor2_menubar.png b/doc/src/images/qml-texteditor2_menubar.png Binary files differnew file mode 100644 index 0000000..691a833 --- /dev/null +++ b/doc/src/images/qml-texteditor2_menubar.png diff --git a/doc/src/images/qml-texteditor3_textarea.png b/doc/src/images/qml-texteditor3_textarea.png Binary files differnew file mode 100644 index 0000000..95abcd6 --- /dev/null +++ b/doc/src/images/qml-texteditor3_textarea.png diff --git a/doc/src/images/qml-texteditor3_texteditor.png b/doc/src/images/qml-texteditor3_texteditor.png Binary files differnew file mode 100644 index 0000000..bdf6957 --- /dev/null +++ b/doc/src/images/qml-texteditor3_texteditor.png diff --git a/doc/src/images/qml-texteditor4_texteditor.png b/doc/src/images/qml-texteditor4_texteditor.png Binary files differnew file mode 100644 index 0000000..85d216b --- /dev/null +++ b/doc/src/images/qml-texteditor4_texteditor.png diff --git a/doc/src/images/qml-texteditor5_editmenu.png b/doc/src/images/qml-texteditor5_editmenu.png Binary files differnew file mode 100644 index 0000000..7365690 --- /dev/null +++ b/doc/src/images/qml-texteditor5_editmenu.png diff --git a/doc/src/images/qml-texteditor5_filemenu.png b/doc/src/images/qml-texteditor5_filemenu.png Binary files differnew file mode 100644 index 0000000..7078022 --- /dev/null +++ b/doc/src/images/qml-texteditor5_filemenu.png diff --git a/doc/src/images/qml-texteditor5_newfile.png b/doc/src/images/qml-texteditor5_newfile.png Binary files differnew file mode 100644 index 0000000..e493941 --- /dev/null +++ b/doc/src/images/qml-texteditor5_newfile.png diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 499667c..a4294e9 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -96,6 +96,7 @@ <li><a href="designer-manual.html">Qt Designer</a></li> <li><a href="linguist-manual.html">Qt Linguist</a></li> <li><a href="assistant-manual.html">Qt Assistant</a></li> + <li><a href="qmake-manual.html">Qt qmake</a></li> <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li> <li><a href="http://qt.nokia.com/developer/eclipse-integration">Integration</a> and <a href="http://qt.nokia.com/products/appdev">add-ins</a></li> <li><a href="qvfb.html">Virtual Framebuffer</a></li> @@ -105,4 +106,5 @@ </div> \endraw + */ diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index c7b88cf..51456ef 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -29,6 +29,7 @@ \page overviews.html \title All Overviews and HOWTOs + \ingroup qt-basic-concepts \generatelist overviews */ diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp index 088e043..0bd5fdf 100644 --- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp @@ -87,14 +87,9 @@ void myFunction(bool useSubClass) // is equivalent to: const QScopedPointer<QWidget> p(new QWidget()); - QWidget *const p = new QWidget(); - // is equivalent to: - const QScopedPointer<QWidget> p(new QWidget()); - const QWidget *p = new QWidget(); // is equivalent to: QScopedPointer<const QWidget> p(new QWidget()); - //! [2] //! [3] diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h index 18b47e0..2c9ba6f 100644 --- a/doc/src/snippets/sharedemployee/employee.h +++ b/doc/src/snippets/sharedemployee/employee.h @@ -48,7 +48,7 @@ class EmployeeData : public QSharedData { public: - EmployeeData() : id(-1) { name.clear(); } + EmployeeData() : id(-1) { } EmployeeData(const EmployeeData &other) : QSharedData(other), id(other.id), name(other.name) { } ~EmployeeData() { } diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index 18b8be1..f2475c2 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,6 +29,7 @@ \page widgets-and-layouts.html \title Widgets and Layouts \ingroup qt-gui-concepts + \ingroup qt-basic-concepts \brief The primary elements for designing user interfaces in Qt. \section1 Widgets diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 6316dc9..74df2aa 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -27,11 +27,13 @@ /*! \group standard-dialogs + \ingroup qt-basic-concepts \title Standard Dialog Classes */ /*! \group dialog-classes + \ingroup qt-basic-concepts \title Classes for Building Dialogs */ diff --git a/examples/tutorials/gettingStarted/gsQml/core/button.qml b/examples/tutorials/gettingStarted/gsQml/core/button.qml new file mode 100644 index 0000000..dd5dcad --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/button.qml @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + //identifier of the item + id: button + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //attaches to the Text element's text content + property string label + property color textColor: buttonLabel.color + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "lightsteelblue" + property color borderColor: "transparent" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + property real labelSize: 14 + + //set appearance properties + radius: 6 + smooth: true + border { width: 2; color: borderColor } + width: buttonWidth; height: buttonHeight + + Text { + id: buttonLabel + anchors.centerIn: parent + text: label //bind the text to the parent's text + color: "#DCDCCC" + font.pointSize: labelSize + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + + //define the clickable area to be the whole rectangle + MouseArea { + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + //animate the color whenever the color property changes + Behavior on color { ColorAnimation{ duration: 55 } } + + //scale the button when pressed + scale: buttonMouseArea.pressed ? 1.1 : 1.00 + //Animate the scale property change + Behavior on scale { NumberAnimation{ duration: 55 } } + +}
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml new file mode 100644 index 0000000..7f47d9f --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property color buttonBorderColor: "#7A8182" + property color buttonFillColor: "#61BDCACD" + property string menuName:"Edit" + gradient: Gradient { + GradientStop { position: 0.0; color: "#6A7570" } + GradientStop { position: 1.0; color: Qt.darker("#6A7570") } + } + + Rectangle { + id:actionContainer + color:"transparent" + anchors.centerIn: parent + width: parent.width; height: parent.height / 5 + Row { + anchors.centerIn: parent + spacing: parent.width/9 + Button { + id: loadButton + buttonColor: buttonFillColor + label: "Copy" + labelSize: 16 + borderColor: buttonBorderColor + height: actionContainer.height; width: actionContainer.width/6 + onButtonClick: textArea.copy() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: saveButton + height: actionContainer.height; width: actionContainer.width/6 + buttonColor: buttonFillColor + label: "Paste" + borderColor: buttonBorderColor + labelSize: 16 + onButtonClick: textArea.paste() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: exitButton + label: "Select All" + height: actionContainer.height; width: actionContainer.width/6 + labelSize: 16 + buttonColor: buttonFillColor + borderColor:buttonBorderColor + onButtonClick: textArea.selectAll() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } +}
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml new file mode 100644 index 0000000..425f717 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id:dialog + height: 200 * partition; width: 200 + color: "transparent" + + signal selectChanged() + signal notifyRefresh() + onNotifyRefresh:dirView.model = directory.files + + property string selectedFile + property int selectedIndex: 0 + + Rectangle { + id: dirBox + radius: 10 + anchors.centerIn:parent + height: parent.height -15; width: parent.width -30 + + Rectangle { + id:header + height: parent.height*0.1; width: parent.width + radius:3 + z:1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text { + height: header.height; anchors.centerIn: header + text: "files:" + color: "lightblue" + font.weight: Font.Light + font.italic: true + } + } + GridView { + id:dirView + width:parent.width; height:parent.height*.9 + anchors.top: header.bottom + cellWidth: 100; cellHeight: 75 + model: directory.files + delegate: dirDelegate + clip: true + highlightMoveDuration: 40 + } + Component { + id: dirDelegate + Rectangle { + id:file + color: "transparent" + width: GridView.view.cellWidth; height: GridView.view.cellHeight + + Text { + id:fileName + width: parent.width + anchors.centerIn: parent + text: name + color: "#BDCACD" + font.weight: GridView.view.currentIndex == index ? Font.DemiBold : Font.Normal + font.pointSize: GridView.view.currentIndex == index ? 12 : 10 + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Rectangle { + id: selection + width: parent.width; height: parent.height + anchors.centerIn: parent + radius: 10 + smooth: true + scale: GridView.view.currentIndex == index ? 1 : 0.5 + opacity: GridView.view.currentIndex == index ? 1 : 0 + Text { + id: overlay + width: parent.width + anchors.centerIn: parent + text: name + color: "#696167" + font.weight: Font.DemiBold + font.pointSize: 12 + smooth: true + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Behavior on opacity { NumberAnimation{ duration: 45 } } + Behavior on scale { NumberAnimation{ duration: 45 } } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter("lightsteelblue",1.25) } + GradientStop { position: 0.67; color: Qt.darker("lightsteelblue",1.3) } + } + border.color: "lightsteelblue" + border.width: 1 + } + MouseArea { + id:fileMouseArea + anchors.fill:parent + hoverEnabled: true + + onClicked: { + GridView.view.currentIndex = index + selectedFile = directory.files[index].name + selectChanged() + } + onEntered: { + fileName.color = "lightsteelblue" + fileName.font.weight = Font.DemiBold + } + onExited: { + fileName.font.weight = Font.Normal + fileName.color = "#BDCACD" + } + } + } + } + gradient: Gradient { + GradientStop { position: 0.0; color: "#A5333333" } + GradientStop { position: 1.0; color: "#03333333" } + } + } +}
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml new file mode 100644 index 0000000..afe48c7 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml @@ -0,0 +1,232 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: fileMenu + height: 480; width:1000 + property color buttonBorderColor: "#7F8487" + property color buttonFillColor: "#8FBDCACD" + property string fileContent:directory.fileContent + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //used to divide the screen into parts. + property real partition: 1/3 + + color: "#6C646A" + gradient: Gradient { + GradientStop { position: 0.0; color: "#6C646A" } + GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } + } + + Directory { + id:directory + filename: textInput.text + onDirectoryChanged:fileDialog.notifyRefresh() + } + + Rectangle { + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.left: parent.left + + //the height is a good proportion that creates more space at the top of + //the column of buttons + width: fileMenu.width * partition; height: fileMenu.height + + Column { + anchors.centerIn: parent + spacing: parent.height/32 + Button { + id: saveButton + label: "Save" + borderColor: buttonBorderColor + buttonColor: buttonFillColor + width: actionContainer.width/ 1.3 + height:actionContainer.height / 8 + labelSize:24 + onButtonClick: { + directory.fileContent = textArea.textContent + directory.filename = textInput.text + directory.saveFile() + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: loadButton + width: actionContainer.width/ 1.3 + height:actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "Load" + labelSize:24 + onButtonClick:{ + directory.filename = textInput.text + directory.loadFile() + textArea.textContent = directory.fileContent + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: newButton + width: actionContainer.width/ 1.3 + height: actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "New" + labelSize: 24 + onButtonClick:{ + textArea.textContent = "" + textInput.text = "" + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + + } + Rectangle { + id: space + width: actionContainer.width/ 1.3 + height: actionContainer.height / 16 + color: "transparent" + } + Button { + id: exitButton + width: actionContainer.width/ 1.3 + height: actionContainer.height/ 8 + label: "Exit" + labelSize: 24 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + onButtonClick: Qt.quit() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } + Rectangle { + id:dialogContainer + + width: 2*fileMenu.width * partition; height: fileMenu.height + anchors.right:parent.right + color: "transparent" + + Column { + anchors.centerIn: parent + spacing: parent.height /640 + FileDialog { + id:fileDialog + height: 2*dialogContainer.height * partition + width: dialogContainer.width + onSelectChanged: textInput.text = selectedFile + } + + Rectangle { + id:lowerPartition + height: dialogContainer.height * partition; width: dialogContainer.width + color: "transparent" + + Rectangle { + id: nameField + gradient: Gradient { + GradientStop { position: 0.0; color: "#806F6F6F" } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + radius: 10 + anchors { centerIn:parent; leftMargin: 15; rightMargin: 15; topMargin: 15 } + height: parent.height-15 + width: parent.width -20 + border { color: "#4A4A4A"; width:1 } + + TextInput { + id: textInput + z:2 + anchors { bottom: parent.bottom; topMargin: 10; horizontalCenter: parent.horizontalCenter } + width: parent.width - 10 + height: parent.height -10 + font.pointSize: 40 + color: "lightsteelblue" + focus: true + } + Text { + id: textInstruction + anchors.centerIn: parent + text: "Select file name and press save or load" + font {pointSize: 11; weight: Font.Light; italic: true} + color: "lightblue" + z: 2 + opacity: (textInput.text == "") ? 1 : 0 + } + Text { + id:fieldLabel + anchors { top: parent.top; left: parent.left } + text: " file name: " + font { pointSize: 11; weight: Font.Light; italic: true } + color: "lightblue" + z:2 + } + MouseArea { + anchors.centerIn:parent + width: nameField.width; height: nameField.height + onClicked: { + textInput.text = "" + textInput.focus = true + textInput.forceFocus() + } + } + } + } + } + } +} diff --git a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml new file mode 100644 index 0000000..0695772 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml @@ -0,0 +1,147 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: menuBar + width: 1000; height:300 + color:"transparent" + property color fileColor: "plum" + property color editColor: "powderblue" + + property real partition: 1/10 + + Column { + anchors.fill: parent + //container for the header and the buttons + z: 1 + Rectangle { + id: labelList + height:menuBar.height*partition + width: menuBar.width + color: "beige" + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text { + height: parent.height + anchors { right: labelRow.left ; verticalCenter: parent.bottom } + text: "menu: " + color: "lightblue" + font { weight: Font.Light; italic: true } + smooth: true + } + //row displays its children in a vertical row + Row { + id: labelRow + anchors.centerIn: parent + spacing:40 + Button { + id: fileButton + height: 20; width: 50 + label: "File" + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + labelSize: menuListView.currentIndex == 0? 16:12 + radius: 1 + smooth:true + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: menuListView.currentIndex = 0 + gradient: Gradient { + GradientStop { position: 0.0; color: fileColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + Button { + id: editButton + height: 20; width: 50 + buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + labelSize: menuListView.currentIndex == 1? 16:12 + smooth:true + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: menuListView.currentIndex = 1 + gradient: Gradient { + GradientStop { position: 0.0; color: editColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + } + } + + //list view will display a model according to a delegate + ListView { + id: menuListView + width:menuBar.width; height: 9*menuBar.height*partition + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + } + //a list of visual items already have delegates handling their display + VisualItemModel { + id: menuListModel + + FileMenu { + id:fileMenu + width: menuListView.width; height: menuListView.height + color: fileColor + } + EditMenu { + color: editColor + width: menuListView.width; height: menuListView.height + } + } +} diff --git a/examples/tutorials/gettingStarted/gsQml/core/qmldir b/examples/tutorials/gettingStarted/gsQml/core/qmldir new file mode 100644 index 0000000..08575cc --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/qmldir @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +Button ./button.qml +FileDialog ./fileDialog.qml +TextArea ./textArea.qml +TextEditor ./textEditor.qml +EditMenu ./editMenu.qml +MenuBar ./menuBar.qml +FileMenu ./fileMenu.qml + +plugin FileDialog ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml new file mode 100644 index 0000000..6d3d214 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id:textArea + + function paste() { textEdit.paste() } + function copy() { textEdit.copy() } + function selectAll() { textEdit.selectAll() } + + width :400; height:400 + + property color fontColor: "white" + property alias textContent: textEdit.text + Flickable { + id: flickArea + width: parent.width; height: parent.height + anchors.fill:parent + + boundsBehavior: Flickable.StopAtBounds + flickableDirection: Flickable.HorizontalFlick + interactive: true + //Will move the text Edit area to make the area visible when + //scrolled with keyboard strokes + function ensureVisible(r) { + if (contentX >= r.x) + contentX = r.x; + else if (contentX+width <= r.x+r.width) + contentX = r.x+r.width-width; + if (contentY >= r.y) + contentY = r.y; + else if (contentY+height <= r.y+r.height) + contentY = r.y+r.height-height; + } + + TextEdit { + id: textEdit + anchors.fill:parent + width:parent.width; height:parent.height + color:fontColor + focus: true + wrapMode: TextEdit.Wrap + font.pointSize:10 + onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) + selectByMouse: true + } + } +}
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro new file mode 100644 index 0000000..d85787d --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro @@ -0,0 +1,17 @@ +TEMPLATE = lib +CONFIG += qt plugin +QT += declarative + +DESTDIR += ../plugins +OBJECTS_DIR = tmp +MOC_DIR = tmp + +TARGET = FileDialog + +HEADERS += directory.h \ + file.h \ + dialogPlugin.h + +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp new file mode 100644 index 0000000..e3a82dc --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dialogPlugin.h" +#include "directory.h" +#include "file.h" +#include <QtDeclarative/qdeclarative.h> + +void DialogPlugin::registerTypes(const char *uri) +{ + //register the class Directory into QML as a "Directory" element version 1.0 + qmlRegisterType<Directory>(uri, 1, 0, "Directory"); + qmlRegisterType<File>(uri,1,0,"File"); +} + +//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs +Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h new file mode 100644 index 0000000..c345641 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIALOGPLUGIN_H +#define DIALOGPLUGIN_H + +#include <QtDeclarative/QDeclarativeExtensionPlugin> + +class DialogPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT + + public: + //registerTypes is inherited from QDeclarativeExtensionPlugin + void registerTypes(const char *uri); + +}; + +#endif + diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp new file mode 100644 index 0000000..c46a65b --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp @@ -0,0 +1,224 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "directory.h" +#include <QDebug> + +/* +Directory constructor + +Initialize the saves directory and creates the file list +*/ +Directory::Directory(QObject *parent) : QObject(parent) +{ + m_dir.cd( QDir::currentPath() ); + + //go to the saved directory. if not found, create save directory + m_saveDir = "saves"; + if ( m_dir.cd(m_saveDir) == 0 ) { + m_dir.mkdir(m_saveDir); + m_dir.cd(m_saveDir); + } + m_filterList << "*.txt"; + refresh(); +} + +/* +Directory::filesNumber +Return the number of Files +*/ +int Directory::filesCount() const +{ + return m_fileList.size(); +} + +/* +Function called to append data onto list property +*/ +void appendFiles(QDeclarativeListProperty<File> * property, File * file) +{ + Q_UNUSED(property); + Q_UNUSED(file); + //Do nothing. can't add to a directory using this method +} + +/* +Function called to retrieve file in the list using an index +*/ +File* fileAt(QDeclarativeListProperty<File> * property, int index) +{ + return static_cast< QList<File *> *>(property->data)->at(index); +} + +/* +Returns the number of files in the list +*/ +int filesSize(QDeclarativeListProperty<File> * property) +{ + return static_cast< QList<File *> *>(property->data)->size(); +} + +/* +Function called to empty the list property contents +*/ +void clearFilesPtr(QDeclarativeListProperty<File> *property) +{ + return static_cast< QList<File *> *>(property->data)->clear(); +} + +/* +Returns the list of files as a QDeclarativeListProperty. +*/ +QDeclarativeListProperty<File> Directory::files() +{ + refresh(); + return QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); +} + +/* +Return the name of the currently selected file +*/ +QString Directory::filename() const +{ + return currentFile.name(); +} + +/* +Return the file's content as a string. +*/ +QString Directory::fileContent() const +{ + return m_fileContent; +} + +/* +Set the file name of the current file +*/ +void Directory::setFilename(const QString &str) +{ + if( str != currentFile.name() ) { + currentFile.setName(str); + emit filenameChanged(); + } +} + +/* +Set the content of the file as a string +*/ +void Directory::setFileContent(const QString &str) +{ + if(str != m_fileContent){ + m_fileContent = str; + emit fileContentChanged(); + } +} + +/* +Called from QML to save the file using the filename and file content. +Saving makes sure that the file has a .txt extension. +*/ +void Directory::saveFile() +{ + if(currentFile.name().size() == 0){ + qWarning()<< "Empty filename. no save"; + return; + } + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::WriteOnly | QFile::Truncate) ) { + QTextStream outStream(&file); + outStream << m_fileContent; + } + file.close(); + refresh(); + emit directoryChanged(); +} + +/* +Load the contents of a file. +Only loads files with a .txt extension +*/ +void Directory::loadFile() +{ + m_fileContent.clear(); + QString extendedName = currentFile.name(); + if( !currentFile.name().endsWith(".txt") ) { + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::ReadOnly ) ) { + QTextStream inStream(&file); + + QString line; + do { + line = inStream.read(75); + m_fileContent.append(line); + } while ( !line.isNull() ) ; + } + file.close(); +} + +/* +Reloads the content of the files list. This is to ensure that the newly +created files are added onto the list. +*/ +void Directory::refresh() +{ + m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); + m_fileList.clear(); + + File * file; + for(int i = 0; i < m_dirFiles.size() ; i ++) { + file = new File(); + + if( m_dirFiles.at(i).endsWith(".txt") ) { + QString name = m_dirFiles.at(i); + file->setName( name.remove(".txt",Qt::CaseSensitive) ); + } + else { + file->setName(m_dirFiles.at(i)); + } + m_fileList.append(file); + } +}
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h new file mode 100644 index 0000000..0dc388a --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h @@ -0,0 +1,107 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIRECTORY_H +#define DIRECTORY_H + +#include "file.h" + +#include <QDir> +#include <QStringList> +#include <QTextStream> +#include <QDeclarativeListProperty> +#include <QObject> + +class Directory : public QObject { + + Q_OBJECT + + //number of files in the directory + Q_PROPERTY(int filesCount READ filesCount) + + //list property containing file names as QString + Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT ) + + //file name of the text file to read/write + Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) + + //text content of the file + Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) + + public: + Directory(QObject *parent = 0); + + //properties' read functions + int filesCount() const; + QString filename() const; + QString fileContent() const; + QDeclarativeListProperty<File> files(); + + //properties' write functions + void setFilename(const QString &str); + void setFileContent(const QString &str); + + //accessible from QML + Q_INVOKABLE void saveFile(); + Q_INVOKABLE void loadFile(); + + signals: + void directoryChanged(); + void filenameChanged(); + void fileContentChanged(); + + private: + QDir m_dir; + QStringList m_dirFiles; + File currentFile; + QString m_saveDir; + QStringList m_filterList; + + //contains the file data in QString format + QString m_fileContent; + + //Registered to QML in a plugin. Accessible from QML as a property of Directory + QList<File *> m_fileList; + + //refresh content of the directory + void refresh(); +}; + +#endif diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp new file mode 100644 index 0000000..ccf762c --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "file.h" + +File::File(QObject *parent) : QObject(parent) +{ + m_name = ""; +} + +QString File::name() const{ + return m_name; +} +void File::setName(const QString &str){ + if(str != m_name){ + m_name = str; + emit nameChanged(); + } +}
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h new file mode 100644 index 0000000..606f374 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILE_H +#define FILE_H + + +#include <QString> +#include <QObject> + +class File : public QObject{ + + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + public: + File(QObject *parent = 0); + + QString name() const; + void setName(const QString &str); + + signals: + void nameChanged(); + + private: + QString m_name; +}; + +#endif
\ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir new file mode 100644 index 0000000..c2b27da --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir @@ -0,0 +1 @@ +plugin FileDialog plugins diff --git a/examples/tutorials/gettingStarted/gsQml/images/arrow.png b/examples/tutorials/gettingStarted/gsQml/images/arrow.png Binary files differnew file mode 100644 index 0000000..14978c2 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/images/arrow.png diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png Binary files differnew file mode 100644 index 0000000..27feed5 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png Binary files differnew file mode 100644 index 0000000..4d8f9f2 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png Binary files differnew file mode 100644 index 0000000..680acfe --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml new file mode 100644 index 0000000..3bd9d55 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import "core" + +Rectangle { + id: screen + width: 1000; height: 1000 + property int partition: height/3 + border { width: 1; color: "#DCDCCC"} + state: "DRAWER_CLOSED" + + //Item 1: MenuBar on the top portion of the screen + MenuBar { + id:menuBar + height: screen.partition; width: screen.width + z: 1 + } + + //Item 2: The editable text area + TextArea { + id: textArea + y: drawer.height + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2; width:parent.width + } + + //Item 3: The drawer handle + Rectangle { + id: drawer + height: 15; width: parent.width + border { color : "#6A6D6A"; width: 1 } + z: 1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + Image { + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + Behavior{ NumberAnimation { property: "rotation"; easing.type: Easing.OutExpo } } + } + + MouseArea { + id: drawerMouseArea + anchors.fill: parent + hoverEnabled: true + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + onExited: parent.border.color = "#6A6D6A" + onClicked: { + if (screen.state == "DRAWER_CLOSED") { + screen.state = "DRAWER_OPEN" + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + } + } + } + } + + states:[ + State { + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y: 0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State { + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-height; } + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height } + PropertyChanges { target: drawer; y: 0 } + PropertyChanges { target: arrowIcon; rotation: 0 } + } + ] + + transitions: [ + Transition { + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + } + ] +} diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 718ea9d..fb2703e 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -d6aa024c84f61d0602bef4eef84efaed7cfeefcc +413404da27312051bb3ff2cfd0f3fca42aa4b245 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 1826cb6..c256434 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - d6aa024c84f61d0602bef4eef84efaed7cfeefcc + 413404da27312051bb3ff2cfd0f3fca42aa4b245 diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 94aca65..5083ba5 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,20 @@ +2010-08-05 David Leong <david.leong@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Input mode states are not reset after entering a password field + https://bugs.webkit.org/show_bug.cgi?id=43530 + + Input mode hints are not reset if clicking on password <input> elements then + clicking on <textarea> elements + + * WebCoreSupport/EditorClientQt.cpp: + (WebCore::EditorClientQt::setInputMethodState): + * tests/qwebview/resources/input_types.html: + * tests/qwebview/tst_qwebview.cpp: + (tst_QWebView::focusInputTypes): + + 2010-07-27 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp index cdc4013..87e047e 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp @@ -599,6 +599,13 @@ void EditorClientQt::setInputMethodState(bool active) QWebPageClient* webPageClient = m_page->d->client; if (webPageClient) { #if QT_VERSION >= 0x040600 + // Make sure to reset input method hint + webPageClient->setInputMethodHint(Qt::ImhDialableCharactersOnly, false); + webPageClient->setInputMethodHint(Qt::ImhDigitsOnly, false); + webPageClient->setInputMethodHint(Qt::ImhEmailCharactersOnly, false); + webPageClient->setInputMethodHint(Qt::ImhUrlCharactersOnly, false); + webPageClient->setInputMethodHint(Qt::ImhHiddenText, false); + HTMLInputElement* inputElement = 0; Frame* frame = m_page->d->page->focusController()->focusedOrMainFrame(); if (frame && frame->document() && frame->document()->focusedNode()) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/resources/input_types.html b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/resources/input_types.html index 18ab314..2e893af 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/resources/input_types.html +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/resources/input_types.html @@ -4,5 +4,6 @@ <input type='tel' style='position: absolute; left: 10px; top: 100px; height: 50px; width: 100px;'/><br> <input type='number' style='position: absolute; left: 10px; top: 150px; height: 50px; width: 100px;'/><br> <input type='email' style='position: absolute; left: 10px; top: 200px; height: 50px; width: 100px;'/><br> -<input type='url' style='position: absolute; left: 10px; top: 250px; height: 50px; width: 100px;'/><br>" -</body></html>
\ No newline at end of file +<input type='url' style='position: absolute; left: 10px; top: 250px; height: 50px; width: 100px;'/><br> +<textarea style='position: absolute; left: 10px; top: 310px; height: 50px; width: 100px;' rows="2" cols="20">blah blah blah blah</textarea><br> +</body></html> diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp index 5dc5e41..bd19578 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp @@ -264,30 +264,37 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'tel' field webView->fireMouseClick(QPoint(20, 110)); QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'number' field webView->fireMouseClick(QPoint(20, 160)); QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'email' field webView->fireMouseClick(QPoint(20, 210)); QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'url' field webView->fireMouseClick(QPoint(20, 260)); QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'text' type webView->fireMouseClick(QPoint(20, 10)); @@ -297,6 +304,18 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'password' field + webView->fireMouseClick(QPoint(20, 60)); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + qWarning("clicking on text area"); + // 'text area' field + webView->fireMouseClick(QPoint(20, 320)); + QVERIFY(webView->inputMethodHints() == Qt::ImhNone); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); delete webView; diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index d176170..d595ac1 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -54,7 +54,8 @@ QT_BEGIN_NAMESPACE This is a fast, lightweight, and low-level class used by Qt internally. We recommend using the higher-level QTimer class rather than this class if you want to use timers in your - applications. + applications. Note that this timer is a repeating timer that + will send subsequent timer events unless the stop() function is called. To use this class, create a QBasicTimer, and call its start() function with a timeout interval and with a pointer to a QObject @@ -88,8 +89,8 @@ QT_BEGIN_NAMESPACE /*! \fn bool QBasicTimer::isActive() const - Returns true if the timer is running, has not yet timed - out, and has not been stopped; otherwise returns false. + Returns true if the timer is running and has not been stopped; otherwise + returns false. \sa start() stop() */ diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index d6ab5da..2fd9a0b 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6645,8 +6645,9 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillCha QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; - locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, - flags | QLocalePrivate::ThousandsGroup); + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -6688,8 +6689,9 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; - locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, - flags | QLocalePrivate::ThousandsGroup); + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -6822,7 +6824,8 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, const QChar & if (d.locale_occurrences > 0) { QLocale locale; - flags |= QLocalePrivate::ThousandsGroup; + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags); } diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 87ee3d1..bf771a8 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -173,6 +173,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP The connection is then torn down using the disconnectFromBus() function. + Once disconnected, calling connectToBus() will not reestablish a + connection, you must create a new QDBusConnection instance. + As a convenience for the two most common connection types, the sessionBus() and systemBus() functions return open connections to the session server daemon and the system server daemon, @@ -209,6 +212,7 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportScriptableSlots export this object's scriptable slots \value ExportScriptableSignals export this object's scriptable signals \value ExportScriptableProperties export this object's scriptable properties + \value ExportScriptableInvokables export this object's scriptable invokables \value ExportScriptableContents shorthand form for ExportScriptableSlots | ExportScriptableSignals | ExportScriptableProperties @@ -216,6 +220,7 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportNonScriptableSlots export this object's non-scriptable slots \value ExportNonScriptableSignals export this object's non-scriptable signals \value ExportNonScriptableProperties export this object's non-scriptable properties + \value ExportNonScriptableInvokables export this object's non-scriptable invokables \value ExportNonScriptableContents shorthand form for ExportNonScriptableSlots | ExportNonScriptableSignals | ExportNonScriptableProperties @@ -223,14 +228,10 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportAllSlots export all of this object's slots \value ExportAllSignals export all of this object's signals \value ExportAllProperties export all of this object's properties + \value ExportAllInvokables export all of this object's invokables \value ExportAllContents export all of this object's contents - \value ExportChildObjects export this object's child objects - \value ExportScriptableInvokables export this object's scriptable methods - \value ExportNonScriptableInvokables export this object's non-scriptable methods - \value ExportAllInvokables export all of this object's methods - \sa registerObject(), QDBusAbstractAdaptor, {usingadaptors.html}{Using adaptors} */ @@ -857,10 +858,6 @@ QDBusConnectionInterface *QDBusConnection::interface() const /*! Returns true if this QDBusConnection object is connected. - - If it isn't connected, calling connectToBus() on the same - connection name will not make be connected. You need to call the - QDBusConnection constructor again. */ bool QDBusConnection::isConnected() const { diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 5b74129..ff05997 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -3196,8 +3196,7 @@ bool QDeclarativeItem::hasActiveFocus() const { Q_D(const QDeclarativeItem); return focusItem() == this || - (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0) || - (!parentItem() && focusItem() != 0); + (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0); } /*! @@ -3217,10 +3216,8 @@ bool QDeclarativeItem::hasActiveFocus() const } \endqml - For the purposes of this property, the top level item in the scene - is assumed to act like a focus scope, and to always have active focus - when the scene has focus. On a practical level, that means the following - QML will give active focus to \c input on startup. + For the purposes of this property, the scene as a whole is assumed to act like a focus scope. + On a practical level, that means the following QML will give active focus to \c input on startup. \qml Rectangle { @@ -3246,7 +3243,7 @@ bool QDeclarativeItem::hasFocus() const p = p->parentItem(); } - return hasActiveFocus() ? true : (!QGraphicsItem::parentItem() ? true : false); + return hasActiveFocus(); } /*! \internal */ diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index ba757fc..2b4a4a5 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2215,10 +2215,11 @@ bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) if (propNames.contains(prop.name)) COMPILE_EXCEPTION(&prop, tr("Duplicate property name")); - if (QString::fromUtf8(prop.name).at(0).isUpper()) + QString propName = QString::fromUtf8(prop.name); + if (propName.at(0).isUpper()) COMPILE_EXCEPTION(&prop, tr("Property names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(prop.name)) + if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(propName)) COMPILE_EXCEPTION(&prop, tr("Illegal property name")); propNames.insert(prop.name); @@ -2228,9 +2229,10 @@ bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) QByteArray name = obj->dynamicSignals.at(ii).name; if (methodNames.contains(name)) COMPILE_EXCEPTION(obj, tr("Duplicate signal name")); - if (QString::fromUtf8(name).at(0).isUpper()) + QString nameStr = QString::fromUtf8(name); + if (nameStr.at(0).isUpper()) COMPILE_EXCEPTION(obj, tr("Signal names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(name)) + if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(nameStr)) COMPILE_EXCEPTION(obj, tr("Illegal signal name")); methodNames.insert(name); } @@ -2238,9 +2240,10 @@ bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) QByteArray name = obj->dynamicSlots.at(ii).name; if (methodNames.contains(name)) COMPILE_EXCEPTION(obj, tr("Duplicate method name")); - if (QString::fromUtf8(name).at(0).isUpper()) + QString nameStr = QString::fromUtf8(name); + if (nameStr.at(0).isUpper()) COMPILE_EXCEPTION(obj, tr("Method names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(name)) + if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(nameStr)) COMPILE_EXCEPTION(obj, tr("Illegal method name")); methodNames.insert(name); } diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index 399b2a1..c10bc11 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -98,16 +98,16 @@ public: private: static void qlist_append(QDeclarativeListProperty *p, T *v) { - ((QList<T *> *)p->data)->append(v); + reinterpret_cast<QList<T *> *>(p->data)->append(v); } static int qlist_count(QDeclarativeListProperty *p) { - return ((QList<T *> *)p->data)->count(); + return reinterpret_cast<QList<T *> *>(p->data)->count(); } static T *qlist_at(QDeclarativeListProperty *p, int idx) { - return ((QList<T *> *)p->data)->at(idx); + return reinterpret_cast<QList<T *> *>(p->data)->at(idx); } static void qlist_clear(QDeclarativeListProperty *p) { - return ((QList<T *> *)p->data)->clear(); + return reinterpret_cast<QList<T *> *>(p->data)->clear(); } }; #endif diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index cb916bf..d45ddbc 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -105,7 +105,7 @@ namespace QDeclarativePrivate template<class From, class To> struct StaticCastSelectorClass<From, To, sizeof(int)> { - static inline int cast() { return (int)((intptr_t)static_cast<To *>((From *)0x10000000)) - 0x10000000; } + static inline int cast() { return int(reinterpret_cast<intptr_t>(static_cast<To *>(reinterpret_cast<From *>(0x10000000)))) - 0x10000000; } }; template<class From, class To> @@ -119,7 +119,7 @@ namespace QDeclarativePrivate static inline int cast() { - return StaticCastSelectorClass<From, To, sizeof(check((From *)0))>::cast(); + return StaticCastSelectorClass<From, To, sizeof(check(reinterpret_cast<From *>(0)))>::cast(); } }; diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 919727f..6b43040 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -104,22 +104,25 @@ void QDeclarativePropertyMapMetaObject::propertyCreated(int, QMetaPropertyBuilde The following example shows how you might declare data in C++ and then access it in QML. - Setup in C++: + In the C++ file: \code - //create our data + // create our data QDeclarativePropertyMap ownerData; ownerData.insert("name", QVariant(QString("John Smith"))); ownerData.insert("phone", QVariant(QString("555-5555"))); - //expose it to the UI layer - QDeclarativeContext *ctxt = view->rootContext(); - ctxt->setProperty("owner", &data); + // expose it to the UI layer + QDeclarativeView view; + QDeclarativeContext *ctxt = view.rootContext(); + ctxt->setContextProperty("owner", &ownerData); + + view.setSource(QUrl::fromLocalFile("main.qml")); + view.show(); \endcode - Then, in QML: + Then, in \c main.qml: \code - Text { text: owner.name } - Text { text: owner.phone } + Text { text: owner.name + " " + owner.phone } \endcode The binding is dynamic - whenever a key's value is updated, anything bound to that diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index d6eabf6..0b3b164 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7758,6 +7758,21 @@ void QGraphicsItemPrivate::resetHeight() } /*! + \property QGraphicsObject::children + \internal +*/ + +/*! + \property QGraphicsObject::width + \internal +*/ + +/*! + \property QGraphicsObject::height + \internal +*/ + +/*! \property QGraphicsObject::parent \brief the parent of the item diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index 27dceb8..bd3f2ef 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -345,6 +345,24 @@ void QGraphicsScale::applyTo(QMatrix4x4 *matrix) const */ /*! + \fn QGraphicsScale::xScaleChanged() + + QGraphicsScale emits this signal when its xScale changes. +*/ + +/*! + \fn QGraphicsScale::yScaleChanged() + + QGraphicsScale emits this signal when its yScale changes. +*/ + +/*! + \fn QGraphicsScale::zScaleChanged() + + QGraphicsScale emits this signal when its zScale changes. +*/ + +/*! \fn QGraphicsScale::scaleChanged() This signal is emitted whenever the xScale, yScale, or zScale diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 185c06f..5d4c54e 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -136,13 +136,16 @@ TFileName QS60MainApplication::ResourceFileName() const return KNullDesC(); } +/*! + \internal +*/ void QS60MainApplication::PreDocConstructL() { QS60MainApplicationBase::PreDocConstructL(); } /*! - \internal + \internal */ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const { @@ -150,7 +153,7 @@ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const } /*! - \internal + \internal */ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index 72cf577..ea9dbb3 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -282,7 +282,7 @@ void QS60MainAppUi::RestoreMenuL(CCoeControl *menuWindow, TInt resourceId, TMenu } /*! - \internal + \internal */ void QS60MainAppUi::Exit() { @@ -290,7 +290,7 @@ void QS60MainAppUi::Exit() } /*! - \internal + \internal */ void QS60MainAppUi::SetFadedL(TBool aFaded) { @@ -298,7 +298,7 @@ void QS60MainAppUi::SetFadedL(TBool aFaded) } /*! - \internal + \internal */ TRect QS60MainAppUi::ApplicationRect() const { @@ -306,7 +306,7 @@ TRect QS60MainAppUi::ApplicationRect() const } /*! - \internal + \internal */ void QS60MainAppUi::HandleScreenDeviceChangedL() { @@ -314,7 +314,7 @@ void QS60MainAppUi::HandleScreenDeviceChangedL() } /*! - \internal + \internal */ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) { @@ -322,7 +322,7 @@ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent & } /*! - \internal + \internal */ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) { @@ -330,7 +330,7 @@ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) } /*! - \internal + \internal */ void QS60MainAppUi::ProcessCommandL(TInt aCommand) { @@ -338,7 +338,7 @@ void QS60MainAppUi::ProcessCommandL(TInt aCommand) } /*! - \internal + \internal */ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText) { @@ -346,7 +346,7 @@ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedEr } /*! - \internal + \internal */ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId) { @@ -354,7 +354,7 @@ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactiva } /*! - \internal + \internal */ void QS60MainAppUi::PrepareToExit() { @@ -362,7 +362,7 @@ void QS60MainAppUi::PrepareToExit() } /*! - \internal + \internal */ void QS60MainAppUi::HandleTouchPaneSizeChange() { @@ -370,7 +370,7 @@ void QS60MainAppUi::HandleTouchPaneSizeChange() } /*! - \internal + \internal */ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) { @@ -378,7 +378,7 @@ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) } /*! - \internal + \internal */ void QS60MainAppUi::Reserved_MtsmPosition() { @@ -386,7 +386,7 @@ void QS60MainAppUi::Reserved_MtsmPosition() } /*! - \internal + \internal */ void QS60MainAppUi::Reserved_MtsmObject() { @@ -394,7 +394,7 @@ void QS60MainAppUi::Reserved_MtsmObject() } /*! - \internal + \internal */ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground) { diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 7396bcd..21c2e02 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -109,10 +109,18 @@ QT_BEGIN_NAMESPACE QPainter::drawStaticText() and can change from call to call with a minimal impact on performance. - QStaticText will attempt to guess the format of the input text using Qt::mightBeRichText(). - To force QStaticText to display its contents as either plain text or rich text, use the - function QStaticText::setTextFormat() and pass in, respectively, Qt::PlainText and - Qt::RichText. + For extra convenience, it is possible to apply formatting to the text using the HTML subset + supported by QTextDocument. QStaticText will attempt to guess the format of the input text using + Qt::mightBeRichText(), and interpret it as rich text if this function returns true. To force + QStaticText to display its contents as either plain text or rich text, use the function + QStaticText::setTextFormat() and pass in, respectively, Qt::PlainText and Qt::RichText. + + QStaticText can only represent text, so only HTML tags which alter the layout or appearance of + the text will be respected. Adding an image to the input HTML, for instance, will cause the + image to be included as part of the layout, affecting the positions of the text glyphs, but it + will not be displayed. The result will be an empty area the size of the image in the output. + Similarly, using tables will cause the text to be laid out in table format, but the borders + will not be drawn. If it's the first time the static text is drawn, or if the static text, or the painter's font has been altered since the last time it was drawn, the text's layout has to be diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 5a11c87..da43913 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1709,14 +1709,18 @@ namespace { return glyphs.glyphs[logClusters[currentPosition - 1]]; } + inline void adjustRightBearing(glyph_t glyph) + { + qreal rb; + fontEngine->getGlyphBearings(glyph, 0, &rb); + rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); + } + inline void adjustRightBearing() { if (currentPosition <= 0) return; - - qreal rb; - fontEngine->getGlyphBearings(currentGlyph(), 0, &rb); - rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); + adjustRightBearing(currentGlyph()); } inline void resetRightBearing() @@ -1901,6 +1905,9 @@ void QTextLine::layout_helper(int maxGlyphs) } else { lbh.whiteSpaceOrObject = false; bool sb_or_ws = false; + glyph_t previousGlyph = 0; + if (lbh.currentPosition > 0 && lbh.logClusters[lbh.currentPosition - 1] <lbh.glyphs.numGlyphs) + previousGlyph = lbh.currentGlyph(); // needed to calculate right bearing later do { addNextCluster(lbh.currentPosition, end, lbh.tmpData, lbh.glyphCount, current, lbh.logClusters, lbh.glyphs); @@ -1944,9 +1951,15 @@ void QTextLine::layout_helper(int maxGlyphs) // We ignore the right bearing if the minimum negative bearing is too little to // expand the text beyond the edge. if (sb_or_ws|breakany) { + QFixed rightBearing = lbh.rightBearing; // store previous right bearing if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width) lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { + // we are too wide, fix right bearing + if (rightBearing <= 0) + lbh.rightBearing = rightBearing; // take from cache + else if (previousGlyph > 0) + lbh.adjustRightBearing(previousGlyph); if (!breakany) { line.textWidth += lbh.softHyphenWidth; } diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index dcc328f..917a325 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -910,7 +910,7 @@ QComboBox::QComboBox(bool rw, QWidget *parent, const char *name) interaction. The highlighted() signal is emitted when the user highlights an item in the combobox popup list. All three signals exist in two versions, one with a QString argument and one with an - \c int argument. If the user selectes or highlights a pixmap, only + \c int argument. If the user selects or highlights a pixmap, only the \c int signals are emitted. Whenever the text of an editable combobox is changed the editTextChanged() signal is emitted. diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 8710cb6..d3084cf 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -105,7 +105,8 @@ QT_BEGIN_NAMESPACE /*! \enum QNetworkRequest::Attribute - + \since 4.7 + Attribute codes for the QNetworkRequest and QNetworkReply. Attributes are extra meta-data that are used to control the @@ -186,9 +187,9 @@ QT_BEGIN_NAMESPACE \value CustomVerbAttribute Requests only, type: QVariant::ByteArray - Holds the value for the custom HTTP verb to send (destined for usage - of other verbs than GET, POST, PUT and DELETE). This verb is set - when calling QNetworkAccessManager::sendCustomRequest(). + Holds the value for the custom HTTP verb to send (destined for usage + of other verbs than GET, POST, PUT and DELETE). This verb is set + when calling QNetworkAccessManager::sendCustomRequest(). \value CookieLoadControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) @@ -198,20 +199,20 @@ QT_BEGIN_NAMESPACE XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag}{here} for more information. (This value was introduced in 4.7.) + \value CookieSaveControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to save 'Cookie' headers received from the server in reply to the request. - This attribute is set to false by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. (This value was introduced in 4.7.) @@ -221,12 +222,11 @@ QT_BEGIN_NAMESPACE if available. If this is set to QNetworkRequest::Manual and the authentication mechanism is 'Basic' or 'Digest', Qt will not send an an 'Authorization' HTTP header with any cached credentials it may have for the request's URL. - This attribute is set to QNetworkRequest::Manual by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. (This value was introduced in 4.7.) diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 3190a30..60851ac 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -406,6 +406,13 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const This function is deprecated. It is equivalent to calling bearerTypeName(), however bearerType() should be used in preference. */ +QString QNetworkConfiguration::bearerName() const +{ + // This function cannot be inline as it would break Qt Mobility. + // Qt Mobility uses the Qt header as well and since the Mobility Bearer library + // does not provide bearerTypeName() we cannot use an inline function. + return bearerTypeName(); +} /*! Returns the type of bearer used by this network configuration. diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index 02f9cb6..18b92a9 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -121,7 +121,7 @@ public: // Required to maintain source compatibility with Qt Mobility. #ifdef QT_DEPRECATED - QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } + QT_DEPRECATED QString bearerName() const; #endif BearerType bearerType() const; QString bearerTypeName() const; diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index 6b34a19..2442ee8 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -1131,7 +1131,7 @@ EXPORTS _ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME _ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME _ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME - _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME ABSENT + _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME _ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME _ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME _ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp index 6329fbe..a298698 100644 --- a/src/xmlpatterns/data/qabstractdatetime.cpp +++ b/src/xmlpatterns/data/qabstractdatetime.cpp @@ -163,7 +163,7 @@ QDateTime AbstractDateTime::create(AtomicValue::Ptr &errorMessage, QString msecondsStr(getSafeCapt(mseconds)); if(!msecondsStr.isEmpty()) - msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0')); + msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0'), true); const MSecondProperty msecs = msecondsStr.toInt(); if(hour == 24) diff --git a/tests/auto/compilerwarnings/test_cpp.txt b/tests/auto/compilerwarnings/test_cpp.txt index 62b35eb..1d317b8 100644 --- a/tests/auto/compilerwarnings/test_cpp.txt +++ b/tests/auto/compilerwarnings/test_cpp.txt @@ -58,6 +58,9 @@ #include <QtDBus/QtDBus> #endif +#include <QtDeclarative/QtDeclarative> + + #ifndef Q_OS_MAC int main(int, char **) { diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index b138f61..ec8f048 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -336,7 +336,7 @@ void tst_qdeclarativefocusscope::noParentFocus() view->setSource(QUrl::fromLocalFile(SRCDIR "/data/chain.qml")); QVERIFY(view->rootObject()); - QVERIFY(view->rootObject()->property("focus1") == true); + QVERIFY(view->rootObject()->property("focus1") == false); QVERIFY(view->rootObject()->property("focus2") == false); QVERIFY(view->rootObject()->property("focus3") == true); QVERIFY(view->rootObject()->property("focus4") == true); diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index c887936..ef82769 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -208,6 +208,7 @@ private slots: void repeated_data() const; void task262677remove(); void QTBUG10404_compareRef(); + void QTBUG9281_arg_locale(); }; typedef QList<int> IntList; @@ -4860,6 +4861,17 @@ void tst_QString::QTBUG10404_compareRef() QVERIFY(QStringRef(&a2, 1, 2).compare(QStringRef(&a, 1, 3), Qt::CaseInsensitive) < 0); } +void tst_QString::QTBUG9281_arg_locale() +{ + QLocale l(QLocale::English, QLocale::UnitedKingdom); + l.setNumberOptions(QLocale::OmitGroupSeparator); + QLocale::setDefault(l); + QString str("*%L1*%L2*"); + str = str.arg(123456).arg(1234.56); + QCOMPARE(str, QString::fromLatin1("*123456*1234.56*")); + QLocale::setDefault(QLocale::C); +} + QTEST_APPLESS_MAIN(tst_QString) diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index f798faf..659ba1a 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -122,6 +122,7 @@ private slots: void smallTextLengthWrapAtWordBoundaryOrAnywhere(); void testLineBreakingAllSpaces(); void lineWidthFromBOM(); + void textWidthVsWIdth(); private: @@ -1359,5 +1360,34 @@ void tst_QTextLayout::glyphLessItems() } } +void tst_QTextLayout::textWidthVsWIdth() +{ + QTextLayout layout; + QTextOption opt; + opt.setWrapMode(QTextOption::WrapAnywhere); + layout.setTextOption(opt); + layout.setText(QString::fromLatin1( + "g++ -c -m64 -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -D_REENTRANT -fPIC -DCORE_LIBRARY -DIDE_LIBRARY_BASENAME=\"lib\" -DWITH_TESTS " + "-DQT_NO_CAST_TO_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_PLUGIN -DQT_TESTLIB_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_SQL_LIB -DQT_XM" + "L_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -I../../../../qt-qml/mkspecs/linux-g++-64 -I. -I../../../../qt-qml/include/QtCore -I../../../." + "./qt-qml/include/QtNetwork -I../../../../qt-qml/include/QtGui -I../../../../qt-qml/include/QtXml -I../../../../qt-qml/include/QtSql -I../../../../qt-qml/inc" + "lude/QtSvg -I../../../../qt-qml/include/QtScript -I../../../../qt-qml/include/QtTest -I../../../../qt-qml/include -I../../../../qt-qml/include/QtHelp -I../." + "./libs -I/home/ettrich/dev/creator/tools -I../../plugins -I../../shared/scriptwrapper -I../../libs/3rdparty/botan/build -Idialogs -Iactionmanager -Ieditorma" + "nager -Iprogressmanager -Iscriptmanager -I.moc/debug-shared -I.uic -o .obj/debug-shared/sidebar.o sidebar.cpp")); + + // textWidth includes right bearing, but it should never be LARGER than width if there is space for at least one character + for (int width = 100; width < 1000; ++width) { + layout.beginLayout(); + QTextLine line = layout.createLine(); + line.setLineWidth(width); + layout.endLayout(); + + qreal textWidthIsLargerBy = qMax(qreal(0), line.naturalTextWidth() - line.width()); + qreal thisMustBeZero = 0; + QCOMPARE(textWidthIsLargerBy, thisMustBeZero); + } +} + + QTEST_MAIN(tst_QTextLayout) #include "tst_qtextlayout.moc" diff --git a/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml new file mode 100644 index 0000000..b17739a --- /dev/null +++ b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml @@ -0,0 +1 @@ +<date>2009-12-16T23:14:10.823218Z</date> diff --git a/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd new file mode 100644 index 0000000..55557f1 --- /dev/null +++ b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + + <xsd:element name="date" type="xsd:dateTime"/> + + <xsd:simpleType name="microsecondsType"> + <xsd:restriction base="xsd:dateTime"> + <xsd:pattern value="\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d\d\d\dZ"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> diff --git a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp index 3517b5a..092e966 100644 --- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp +++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp @@ -216,6 +216,12 @@ void tst_XmlPatternsValidator::xsdSupport_data() const << 0 << (QStringList() << QLatin1String("files/complex-type-including-anonymous-type.xsd")) << QString(); + + QTest::newRow("QTBUG-11559 A schema and instance with a dateTime containing microseconds") + << 0 + << (QStringList() << QLatin1String("files/dateTime-with-microseconds.xml") + << QLatin1String("files/dateTime-with-microseconds.xsd")) + << QString(); } QTEST_MAIN(tst_XmlPatternsValidator) diff --git a/tools/designer/src/lib/shared/stylesheeteditor.cpp b/tools/designer/src/lib/shared/stylesheeteditor.cpp index b76d700..e809447 100644 --- a/tools/designer/src/lib/shared/stylesheeteditor.cpp +++ b/tools/designer/src/lib/shared/stylesheeteditor.cpp @@ -79,6 +79,7 @@ StyleSheetEditor::StyleSheetEditor(QWidget *parent) : QTextEdit(parent) { setTabStopWidth(fontMetrics().width(QLatin1Char(' '))*4); + setAcceptRichText(false); new CssHighlighter(document()); } diff --git a/tools/linguist/phrasebooks/french.qph b/tools/linguist/phrasebooks/french.qph index 9e1a580..1884ed3 100644 --- a/tools/linguist/phrasebooks/french.qph +++ b/tools/linguist/phrasebooks/french.qph @@ -801,7 +801,7 @@ </phrase> <phrase> <source>Redo</source> - <target>Annuler Annuler</target> + <target>Rétablir</target> </phrase> <phrase> <source>region selection</source> @@ -1111,10 +1111,6 @@ <target>&Édition</target> </phrase> <phrase> - <source>&Redo</source> - <target>Re&faire</target> -</phrase> -<phrase> <source>debugger</source> <target>débogueur</target> </phrase> @@ -1438,4 +1434,60 @@ <source>&Debug</source> <target>&Déboguer</target> </phrase> +<phrase> + <source>Slider</source> + <target>Barre de défilement</target> +</phrase> +<phrase> + <source>&Restore</source> + <target>&Restaurer</target> +</phrase> +<phrase> + <source>&Move</source> + <target>&Déplacer</target> +</phrase> +<phrase> + <source>New</source> + <target>Créer</target> +</phrase> +<phrase> + <source>Play</source> + <target>Lecture</target> +</phrase> +<phrase> + <source>Slider</source> + <target>Barre de défilement</target> +</phrase> +<phrase> + <source>&Restore</source> + <target>&Restaurer</target> +</phrase> +<phrase> + <source>&Move</source> + <target>&Déplacer</target> +</phrase> +<phrase> + <source>New</source> + <target>Créer</target> +</phrase> +<phrase> + <source>Play</source> + <target>Lecture</target> +</phrase> +<phrase> + <source>&Redo</source> + <target>&Refaire</target> +</phrase> +<phrase> + <source>Raised</source> + <target>Bombé</target> +</phrase> +<phrase> + <source>Sunken</source> + <target>Enfoncé</target> +</phrase> +<phrase> + <source>Run:</source> + <target>Exécution :</target> +</phrase> </QPH> diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h index 7665f1a..335a0d6 100644 --- a/tools/qdoc3/config.h +++ b/tools/qdoc3/config.h @@ -143,9 +143,7 @@ class Config #define CONFIG_MACRO "macro" #define CONFIG_NATURALLANGUAGE "naturallanguage" #define CONFIG_OBSOLETELINKS "obsoletelinks" -#define CONFIG_ONLINE "online" -#define CONFIG_OFFLINE "offline" -#define CONFIG_CREATOR "creator" +#define CONFIG_APPLICATION "application" #define CONFIG_OUTPUTDIR "outputdir" #define CONFIG_OUTPUTENCODING "outputencoding" #define CONFIG_OUTPUTLANGUAGE "outputlanguage" diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 4789c67..816ab9f 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -440,7 +440,6 @@ void DitaXmlGenerator::initializeGenerator(const Config &config) DITAXMLGENERATOR_GENERATEMACREFS); project = config.getString(CONFIG_PROJECT); - offlineDocs = !config.getBool(CONFIG_ONLINE); projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) projectDescription = project + " Reference Documentation"; diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 24219a1..7f39be2 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -1068,8 +1068,11 @@ void Generator::generateSince(const Node *node, CodeMarker *marker) Text text; text << Atom::ParaLeft << "This " - << typeString(node) - << " was introduced in "; + << typeString(node); + if (node->type() == Node::Enum) + text << " was introduced or modified in "; + else + text << " was introduced in "; if (project.isEmpty()) text << "version"; else diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 723f516..d23b41e 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -219,9 +219,7 @@ HtmlGenerator::HtmlGenerator() inTableHeader(false), numTableRows(0), threeColumnEnumValueTable(true), - offlineDocs(false), - onlineDocs(false), - creatorDocs(true), + application(Online), funcLeftParen("\\S(\\()"), myTree(0), slow(false), @@ -290,11 +288,17 @@ void HtmlGenerator::initializeGenerator(const Config &config) project = config.getString(CONFIG_PROJECT); - onlineDocs = config.getBool(CONFIG_ONLINE); - - offlineDocs = config.getBool(CONFIG_OFFLINE); - - creatorDocs = config.getBool(CONFIG_CREATOR); + QString app = config.getString(CONFIG_APPLICATION); + if (app == "online") + application = Online; + else if (app == "creator") + application = Creator; + else if (app == "assistant") + application = Assistant; + else if (app == "base") + application = Assistant; + else + application = Online; projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) @@ -1811,9 +1815,8 @@ void HtmlGenerator::generateHeader(const QString& title, // Setting some additional style sheet related details depending on configuration (e.g. online/offline) - - if(onlineDocs==true) // onlineDocs is for the web - { + switch (application) { + case Online: // Browser spec styles out() << " <!--[if IE]>\n"; out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n"; @@ -1832,22 +1835,19 @@ void HtmlGenerator::generateHeader(const QString& title, out() << "</head>\n"; // CheckEmptyAndLoadList activating search out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n"; - } - else if (offlineDocs == true) // offlineDocs is for ??? - { + break; + case Assistant: out() << "</head>\n"; - out() << "<body class=\"offline \">\n"; // offline - } - else if (creatorDocs == true) // creatorDocs is for Assistant/Creator - { + out() << "<body class=\"offline \">\n"; + break; + case Creator: out() << "</head>\n"; out() << "<body class=\"offline narrow creator\">\n"; // offline narrow - } - // default -- not used except if one forgets to set any of the above settings to true - else - { + break; + default: out() << "</head>\n"; - out() << "<body>\n"; + out() << "<body>\n"; + break; } #ifdef GENERATE_MAC_REFS @@ -1855,31 +1855,82 @@ void HtmlGenerator::generateHeader(const QString& title, generateMacRef(node, marker); #endif - - if(onlineDocs==true) // onlineDocs is for the web - { + switch (application) { + case Online: out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version()); generateBreadCrumbs(title,node,marker); out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); - } - else if (offlineDocs == true) // offlineDocs is for ??? - { + break; + case Assistant: out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); generateBreadCrumbs(title,node,marker); - out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); - } - else if (creatorDocs == true) // creatorDocs is for Assistant/Creator - { + out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + break; + case Creator: out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); generateBreadCrumbs(title,node,marker); out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); - } - // default -- not used except if one forgets to set any of the above settings to true - else - { + break; + default: // default -- not used except if one forgets to set any of the above settings to true out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); generateBreadCrumbs(title,node,marker); - out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + break; + } + + navigationLinks.clear(); + + if (node && !node->links().empty()) { + QPair<QString,QString> linkPair; + QPair<QString,QString> anchorPair; + const Node *linkNode; + + if (node->links().contains(Node::PreviousLink)) { + linkPair = node->links()[Node::PreviousLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " <link rel=\"prev\" href=\"" + << anchorPair.first << "\" />\n"; + + navigationLinks += "[Previous: <a href=\"" + anchorPair.first + "\">"; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protect(anchorPair.second); + else + navigationLinks += protect(linkPair.second); + navigationLinks += "</a>]\n"; + } + if (node->links().contains(Node::NextLink)) { + linkPair = node->links()[Node::NextLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " <link rel=\"next\" href=\"" + << anchorPair.first << "\" />\n"; + + navigationLinks += "[Next: <a href=\"" + anchorPair.first + "\">"; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protect(anchorPair.second); + else + navigationLinks += protect(linkPair.second); + navigationLinks += "</a>]\n"; + } + if (node->links().contains(Node::StartLink)) { + linkPair = node->links()[Node::StartLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + out() << " <link rel=\"start\" href=\"" + << anchorPair.first << "\" />\n"; + } } #if 0 // Removed for new doc format. MWS @@ -1914,34 +1965,33 @@ void HtmlGenerator::generateFooter(const Node *node) out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version()) << QString(address).replace("\\" + COMMAND_VERSION, myTree->version()); - - if (onlineDocs == true) - { - out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; - out() << " <!-- <script type=\"text/javascript\">\n"; - out() << " var _gaq = _gaq || [];\n"; - out() << " _gaq.push(['_setAccount', 'UA-4457116-5']);\n"; - out() << " _gaq.push(['_trackPageview']);\n"; - out() << " (function() {\n"; - out() << " var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n"; - out() << " ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n"; - out() << " var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n"; - out() << " })();\n"; - out() << " </script> -->\n"; - out() << "</body>\n"; - } - else if (offlineDocs == true) - { - out() << "</body>\n"; - } - else if (creatorDocs == true) - { - out() << "</body>\n"; - } - else - { - out() << "</body>\n"; - } + + switch (application) { + case Online: + out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; + out() << " <!-- <script type=\"text/javascript\">\n"; + out() << " var _gaq = _gaq || [];\n"; + out() << " _gaq.push(['_setAccount', 'UA-4457116-5']);\n"; + out() << " _gaq.push(['_trackPageview']);\n"; + out() << " (function() {\n"; + out() << " var ga = document.createElement('script'); "; + out() << "ga.type = 'text/javascript'; ga.async = true;\n"; + out() << " ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + "; + out() << "'.google-analytics.com/ga.js';\n"; + out() << " var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n"; + out() << " })();\n"; + out() << " </script> -->\n"; + out() << "</body>\n"; + break; + case Assistant: + out() << "</body>\n"; + break; + case Creator: + out() << "</body>\n"; + break; + default: + out() << "</body>\n"; + } out() << "</html>\n"; } diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index d92c349..ec79896 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -95,6 +95,11 @@ class HtmlGenerator : public PageGenerator LastSinceType }; + enum Application { + Online, + Assistant, + Creator}; + public: HtmlGenerator(); ~HtmlGenerator(); @@ -294,9 +299,7 @@ class HtmlGenerator : public PageGenerator bool inTableHeader; int numTableRows; bool threeColumnEnumValueTable; - bool onlineDocs; - bool offlineDocs; - bool creatorDocs; + Application application; QString link; QStringList sectionNumber; QRegExp funcLeftParen; diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp index 47a4b67..38b76a4 100644 --- a/tools/qdoc3/main.cpp +++ b/tools/qdoc3/main.cpp @@ -105,8 +105,7 @@ static bool showInternal = false; static bool obsoleteLinks = false; static QStringList defines; static QHash<QString, Tree *> trees; -static QString application = "base"; //application -static bool applicationArg = 0; //if 1, then the argument is provided and it will override the qdocconf file +static QString appArg; // application /*! Find the Tree for language \a lang and return a pointer to it. @@ -194,36 +193,25 @@ static void processQdocconfFile(const QString &fileName) config.load(fileName); /* - Set the application to which qdoc will create the output. - The three applications are: - base: simple, basic html output. Best suited for offline viewing - creator: additional formatting. - online: full-featured online version with search and links to Qt topics - - Note: This will override the offline, online, creator defines. + Set the application to which qdoc will create the output. + The three applications are: + + base or assistant: simple, basic html output + for offline viewing in the Assistant application. + + creator: additional formatting for viewing in + the Creator application. + + online: full-featured online version with search and + links to Qt topics */ - if(applicationArg == false){ - - QString appConfig = config.getString(CONFIG_APPLICATION); - if (!appConfig.isEmpty()){ - application = appConfig; - } - } - if(application == "online"){ - config.setStringList(CONFIG_ONLINE, QStringList("true")); - config.setStringList(CONFIG_OFFLINE, QStringList("false")); - config.setStringList(CONFIG_CREATOR, QStringList("false")); - } - else if(application == "creator"){ - config.setStringList(CONFIG_ONLINE, QStringList("false")); - config.setStringList(CONFIG_OFFLINE, QStringList("true")); - config.setStringList(CONFIG_CREATOR, QStringList("false")); - } - else if(application == "base"){ - config.setStringList(CONFIG_ONLINE, QStringList("false")); - config.setStringList(CONFIG_OFFLINE, QStringList("false")); - config.setStringList(CONFIG_CREATOR, QStringList("true")); + if (appArg.isEmpty()) { + qDebug() << "Warning: Application flag not specified on" + << "command line. Options are -assistant, -creator," + << "and -online (default)."; + appArg = "online"; } + config.setStringList(CONFIG_APPLICATION, QStringList(appArg)); /* Add the defines to the configuration variables. @@ -496,18 +484,14 @@ int main(int argc, char **argv) else if (opt == "-obsoletelinks") { obsoleteLinks = true; } - else if (opt == "-base") { - application = "base"; - applicationArg = true; - } - else if (opt == "-creator") { - application = "creator"; - applicationArg = true; - } - else if (opt == "-online") { - application = "online"; - applicationArg = true; - } + else if (opt == "-base") + appArg = "base"; + else if (opt == "-assistant") + appArg = "assistant"; + else if (opt == "-creator") + appArg = "creator"; + else if (opt == "-online") + appArg = "online"; else { qdocFiles.append(opt); } @@ -522,7 +506,7 @@ int main(int argc, char **argv) Main loop. */ foreach (QString qf, qdocFiles) { - qDebug() << "PROCESSING:" << qf; + //qDebug() << "PROCESSING:" << qf; processQdocconfFile(qf); } diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 119a676..8cf5722 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt Assistant description = Qt Assistant Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 0595417..b1f37dc 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt Designer description = Qt Designer Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 7dd57fb..26fb55c 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt Linguist description = Qt Linguist Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 7628519..80bca29 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -8,9 +8,6 @@ project = Qml description = Qml Reference Documentation url = http://qt.nokia.com/doc/4.7/ qmlonly = true -online = false -offline = false -creator = true edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index c666288..f069129 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = QMake description = QMake Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/qt-api-only.qdocconf b/tools/qdoc3/test/qt-api-only.qdocconf index 7387810..cdd7a7c 100644 --- a/tools/qdoc3/test/qt-api-only.qdocconf +++ b/tools/qdoc3/test/qt-api-only.qdocconf @@ -5,9 +5,6 @@ include(qt-build-docs.qdocconf) # qmake.qdocconf). url = ./ -online = false -offline = false -creator = true # Ensures that the documentation for the tools is not included in the generated # .qhp file. diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 415457e..bb47b57 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true sourceencoding = UTF-8 outputencoding = UTF-8 diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 089b11f..70f3a40 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -9,7 +9,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <div id=\"nav-logo\">\n" \ " <a href=\"index.html\">Home</a></div>\n" \ " <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \ - " <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \ + " <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearchTop\">\n" \ " <fieldset>\n" \ " <input type=\"text\" value=\"\" id=\"pageType2\" name=\"searchstring\"/>\n" \ " </fieldset>\n" \ @@ -38,7 +38,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <li><a href=\"functions.html\">Function index</a></li> \n" \ " <li><a href=\"modules.html\">Modules</a></li> \n" \ " <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \ - " <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \ + " <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \ " <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \ " </ul> \n" \ " </li> \n" \ @@ -146,6 +146,7 @@ HTML.footer = " <!-- /div -->\n" \ " <span></span>\n" \ " </div>\n" \ " </div> \n" \ + " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ @@ -158,8 +159,8 @@ HTML.footer = " <!-- /div -->\n" \ " <div id=\"feedbackBox\">\n" \ " <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \ " <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \ - " <p id=\"noteHead\">Thank you for giving your feedback. <div class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \ - " requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</div></p>\n" \ + " <p id=\"noteHead\">Thank you for giving your feedback.</p> <div class=\"note\"><p>Make sure it is related to this specific page. For more general bugs and \n" \ + " requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p></div>\n" \ " <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \ " <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \ " </form>\n" \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index a5e6578..f78bd38 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -9,9 +9,6 @@ versionsym = version = %VERSION% description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -online = true -offline = false -creator = false sourceencoding = UTF-8 outputencoding = UTF-8 diff --git a/translations/assistant_fr.ts b/translations/assistant_fr.ts index 4c6c5a0..e117663 100644 --- a/translations/assistant_fr.ts +++ b/translations/assistant_fr.ts @@ -4,7 +4,7 @@ <context> <name>AboutDialog</name> <message> - <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="+110"/> + <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="+117"/> <source>&Close</source> <translation>&Fermer</translation> </message> @@ -12,7 +12,7 @@ <context> <name>AboutLabel</name> <message> - <location line="-14"/> + <location line="-15"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -24,12 +24,81 @@ </translation> </message> <message> - <location line="+1"/> + <location line="+0"/> <source>OK</source> <translation>OK</translation> </message> </context> <context> + <name>Assistant</name> + <message> + <location filename="../tools/assistant/tools/assistant/main.cpp" line="+177"/> + <source>Error registering documentation file '%1': %2</source> + <translation>Erreur lors de l'enregistrement du fichier de documentation '%1' : %2</translation> + </message> + <message> + <location line="+39"/> + <source>Error: %1</source> + <translation>Erreur : %1</translation> + </message> + <message> + <location line="+42"/> + <source>Could not register documentation file +%1 + +Reason: +%2</source> + <translation>Impossible d'enregistrer le fichier de documentation +%1 + +Raison : +%2</translation> + </message> + <message> + <location line="+6"/> + <source>Documentation successfully registered.</source> + <translation>Documentation enregistrée avec succès.</translation> + </message> + <message> + <location line="+12"/> + <source>Could not unregister documentation file +%1 + +Reason: +%2</source> + <translation>Impossible de retirer le fichier de documentation +%1 + +Raison : +%2</translation> + </message> + <message> + <location line="+8"/> + <source>Documentation successfully unregistered.</source> + <translation>Documentation retirée avec succès.</translation> + </message> + <message> + <location line="+55"/> + <source>Error reading collection file '%1': %2.</source> + <translation>Erreur lors de la lecture du fichier de collection '%1' : %2.</translation> + </message> + <message> + <location line="+11"/> + <source>Error creating collection file '%1': %2.</source> + <translation>Erreur lors de la création du fichier de collection '%1' : %2.</translation> + </message> + <message> + <location line="+7"/> + <source>Error reading collection file '%1': %2</source> + <translation>Erreur lors de la lecture du fichier de collection '%1' : %2</translation> + </message> + <message> + <location line="+53"/> + <source>Cannot load sqlite database driver!</source> + <translation>Impossible de charger le driver de la base de données sqlite !</translation> + </message> +</context> +<context> <name>BookmarkDialog</name> <message> <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui"/> @@ -57,21 +126,15 @@ <translation>Nouveau dossier</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="+184"/> - <location line="+18"/> - <location line="+39"/> - <location line="+18"/> - <location line="+30"/> <source>Bookmarks</source> - <translation>Signets</translation> + <translation type="obsolete">Signets</translation> </message> <message> - <location line="-61"/> <source>Delete Folder</source> - <translation>Supprimer le dossier</translation> + <translation type="obsolete">Supprimer le dossier</translation> </message> <message> - <location line="+1"/> + <location filename="../tools/assistant/tools/assistant/bookmarkdialog.cpp" line="+227"/> <source>Rename Folder</source> <translation>Renommer le dossier</translation> </message> @@ -79,12 +142,16 @@ <context> <name>BookmarkManager</name> <message> - <location line="+435"/> <source>Bookmarks</source> - <translation>Signets</translation> + <translation type="obsolete">Signets</translation> </message> <message> - <location line="+37"/> + <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="+151"/> + <source>Untitled</source> + <translation>Sans titre</translation> + </message> + <message> + <location line="+65"/> <source>Remove</source> <translation>Suppression</translation> </message> @@ -94,16 +161,127 @@ <translation>Vous allez supprimer un dossier, ceci va aussi<br>supprimer son contenu. Voulez-vous continuer ?</translation> </message> <message> - <location line="+143"/> - <location line="+9"/> + <location line="+148"/> + <source>Manage Bookmarks...</source> + <translation>Gestion des signets...</translation> + </message> + <message> + <location line="+3"/> + <source>Add Bookmark...</source> + <translation>Ajouter un signet...</translation> + </message> + <message> + <location line="+1"/> + <source>Ctrl+D</source> + <translation>Ctrl+D</translation> + </message> + <message> + <location line="+68"/> + <source>Delete Folder</source> + <translation>Supprimer le dossier</translation> + </message> + <message> + <location line="+1"/> + <source>Rename Folder</source> + <translation>Renommer le dossier</translation> + </message> + <message> + <location line="+2"/> + <source>Show Bookmark</source> + <translation>Afficher le signet</translation> + </message> + <message> + <location line="+1"/> + <source>Show Bookmark in New Tab</source> + <translation>Afficher le signet dans un nouvel onglet</translation> + </message> + <message> + <location line="+2"/> + <source>Delete Bookmark</source> + <translation>Supprimer le signet</translation> + </message> + <message> + <location line="+1"/> + <source>Rename Bookmark</source> + <translation>Renommer le signet</translation> + </message> + <message> <source>New Folder</source> - <translation>Nouveau dossier</translation> + <translation type="obsolete">Nouveau dossier</translation> </message> </context> <context> - <name>BookmarkWidget</name> + <name>BookmarkManagerWidget</name> + <message> + <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.ui"/> + <source>Manage Bookmarks</source> + <translation>Gestion des signets</translation> + </message> <message> - <location line="-463"/> + <location/> + <source>Search:</source> + <translation>Recherche :</translation> + </message> + <message> + <location/> + <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp" line="+258"/> + <source>Remove</source> + <translation>Supprimer</translation> + </message> + <message> + <location/> + <source>Import and Backup</source> + <translation>Importation et sauvegarde</translation> + </message> + <message> + <location/> + <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp" line="-30"/> + <source>OK</source> + <translation>OK</translation> + </message> + <message> + <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp" line="-142"/> + <source>Import...</source> + <translation>Importer...</translation> + </message> + <message> + <location line="+1"/> + <source>Export...</source> + <translation>Exporter...</translation> + </message> + <message> + <location line="+112"/> + <source>Open File</source> + <translation>Ouvrir un fichier</translation> + </message> + <message> + <location line="+1"/> + <location line="+16"/> + <source>Files (*.xbel)</source> + <translation>Fichiers (*.xbel)</translation> + </message> + <message> + <location line="-1"/> + <source>Save File</source> + <translation>Enregistrer le fichier</translation> + </message> + <message> + <location line="+12"/> + <source>Qt Assistant</source> + <translation>Qt Assistant</translation> + </message> + <message> + <location line="+1"/> + <source>Unable to save bookmarks.</source> + <translation>Impossible de sauvegarder les signets.</translation> + </message> + <message> + <location line="+30"/> + <source>You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue?</source> + <translation>Vous êtes sur le point de supprimer un dossier, ceci supprimera<br> également son contenu. Voulez-vous continuer ?</translation> + </message> + <message> + <location line="+28"/> <source>Delete Folder</source> <translation>Supprimer le dossier</translation> </message> @@ -123,7 +301,7 @@ <translation>Afficher le signet dans un nouvel onglet</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> @@ -132,26 +310,76 @@ <source>Rename Bookmark</source> <translation>Renommer le signet</translation> </message> +</context> +<context> + <name>BookmarkModel</name> + <message> + <location filename="../tools/assistant/tools/assistant/bookmarkmodel.cpp" line="+88"/> + <source>Name</source> + <translation>Nom</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <location line="+2"/> + <source>Bookmarks Menu</source> + <translation>Menu signets</translation> + </message> +</context> +<context> + <name>BookmarkWidget</name> + <message> + <source>Delete Folder</source> + <translation type="obsolete">Supprimer le dossier</translation> + </message> + <message> + <source>Rename Folder</source> + <translation type="obsolete">Renommer le dossier</translation> + </message> + <message> + <source>Show Bookmark</source> + <translation type="obsolete">Afficher le signet</translation> + </message> + <message> + <source>Show Bookmark in New Tab</source> + <translation type="obsolete">Afficher le signet dans un nouvel onglet</translation> + </message> + <message> + <source>Delete Bookmark</source> + <translation type="obsolete">Supprimer le signet</translation> + </message> <message> - <location line="+38"/> + <source>Rename Bookmark</source> + <translation type="obsolete">Renommer le signet</translation> + </message> + <message> + <location filename="../tools/assistant/tools/assistant/bookmarkwidget.ui"/> <source>Filter:</source> <translation>Filtre :</translation> </message> <message> - <location line="+24"/> + <location/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location line="+9"/> + <location/> <source>Remove</source> <translation>Retirer</translation> </message> + <message> + <location/> + <source>Bookmarks</source> + <translation>Signets</translation> + </message> </context> <context> <name>CentralWidget</name> <message> - <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+239"/> + <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+121"/> <source>Add new page</source> <translation>Créer une nouvelle page</translation> </message> @@ -161,18 +389,18 @@ <translation>Fermer la page courante</translation> </message> <message> - <location line="+312"/> + <location line="+287"/> <source>Print Document</source> <translation>Imprimer le document</translation> </message> <message> - <location line="+130"/> + <location line="+126"/> <location line="+2"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location line="+93"/> + <location line="+101"/> <source>Add New Page</source> <translation>Créer une nouvelle page</translation> </message> @@ -192,15 +420,78 @@ <translation>Ajouter un signet pour cette page...</translation> </message> <message> - <location line="+235"/> + <location line="+264"/> <source>Search</source> <translation>Recherche</translation> </message> </context> <context> + <name>CmdLineParser</name> + <message> + <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+137"/> + <source>Unknown option: %1</source> + <translation>Option inconnue : %1</translation> + </message> + <message> + <location line="+33"/> + <source>The collection file '%1' does not exist.</source> + <translation>Le fichier de collection '%1' n'existe pas.</translation> + </message> + <message> + <location line="+3"/> + <source>Missing collection file.</source> + <translation>Fichier de collection manquant.</translation> + </message> + <message> + <location line="+13"/> + <source>Invalid URL '%1'.</source> + <translation>URL invalide '%1'.</translation> + </message> + <message> + <location line="+2"/> + <source>Missing URL.</source> + <translation>URL manquante.</translation> + </message> + <message> + <location line="+36"/> + <source>Unknown widget: %1</source> + <translation>Widget inconnu : %1</translation> + </message> + <message> + <location line="+2"/> + <source>Missing widget.</source> + <translation>Widget manquant.</translation> + </message> + <message> + <location line="+23"/> + <source>The Qt help file '%1' does not exist.</source> + <translation>Le fichier d'aide Qt '%1' n'existe pas.</translation> + </message> + <message> + <location line="+4"/> + <source>Missing help file.</source> + <translation>Fichier d'aide manquant.</translation> + </message> + <message> + <location line="+10"/> + <source>Missing filter argument.</source> + <translation>Argument de filtre manquant.</translation> + </message> + <message> + <location line="+20"/> + <source>Error</source> + <translation>Erreur</translation> + </message> + <message> + <location line="+2"/> + <source>Notice</source> + <translation>Avertissement</translation> + </message> +</context> +<context> <name>ContentWindow</name> <message> - <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="+158"/> + <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="+173"/> <source>Open Link</source> <translation>Ouvrir le lien</translation> </message> @@ -226,27 +517,26 @@ <context> <name>FindWidget</name> <message> - <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-918"/> + <location filename="../tools/assistant/tools/assistant/findwidget.cpp" line="+85"/> <source>Previous</source> <translation>Précédent</translation> </message> <message> - <location line="+4"/> + <location line="+6"/> <source>Next</source> <translation>Suivant</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Case Sensitive</source> <translation>Sensible à la casse</translation> </message> <message> - <location line="+3"/> <source>Whole words</source> - <translation>Mots complets</translation> + <translation type="obsolete">Mots complets</translation> </message> <message> - <location line="+12"/> + <location line="+9"/> <source><img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped</source> <translation><img src=":/trolltech/assistant/images/wrap.png">&nbsp;Recherche à partir du début</translation> </message> @@ -282,34 +572,37 @@ <context> <name>HelpViewer</name> <message> - <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+281"/> + <location filename="../tools/assistant/tools/assistant/helpviewer_qwv.cpp" line="+260"/> <source>Open Link in New Tab</source> <translation>Ouvrir le lien dans un nouvel onglet</translation> </message> <message> - <location line="+147"/> + <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+58"/> + <source><title>about:blank</title></source> + <translatorcomment>y'a t'il une autre traduction dans Firefox & cie ?</translatorcomment> + <translation><title>about:blank</title></translation> + </message> + <message> + <location line="+6"/> <source><title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div></source> <translation><title>Erreur 404...</title><div align="center"><br><br><h1>La page n'a pas pu être trouvée</h1><br><h3>'%1'</h3></div></translation> </message> <message> - <location line="+61"/> <source>Help</source> - <translation>Aide</translation> + <translation type="obsolete">Aide</translation> </message> <message> - <location line="+1"/> <source>Unable to launch external application. </source> - <translation>Impossible de lancer l'application externe. + <translation type="obsolete">Impossible de lancer l'application externe. </translation> </message> <message> - <location line="+0"/> <source>OK</source> - <translation>OK</translation> + <translation type="obsolete">OK</translation> </message> <message> - <location line="+63"/> + <location filename="../tools/assistant/tools/assistant/helpviewer_qtb.cpp" line="+230"/> <source>Copy &Link Location</source> <translation>Copier l'&adresse cible</translation> </message> @@ -323,12 +616,12 @@ <context> <name>IndexWindow</name> <message> - <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="+66"/> + <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="+68"/> <source>&Look for:</source> <translation>&Rechercher :</translation> </message> <message> - <location line="+68"/> + <location line="+74"/> <source>Open Link</source> <translation>Ouvrir le lien</translation> </message> @@ -342,7 +635,7 @@ <name>InstallDialog</name> <message> <location filename="../tools/assistant/tools/assistant/installdialog.ui"/> - <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+76"/> + <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+78"/> <source>Install Documentation</source> <translation>Installer la documentation</translation> </message> @@ -374,27 +667,27 @@ <message> <location/> <source>...</source> - <translation>…</translation> + <translation>...</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+30"/> + <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+33"/> <source>Downloading documentation info...</source> - <translation>Téléchargement des informations de la documentation…</translation> + <translation>Téléchargement des informations de la documentation...</translation> </message> <message> - <location line="+48"/> + <location line="+51"/> <source>Download canceled.</source> <translation>Téléchargement annulé.</translation> </message> <message> - <location line="+26"/> - <location line="+78"/> + <location line="+28"/> + <location line="+79"/> <location line="+27"/> <source>Done.</source> <translation>Terminé.</translation> </message> <message> - <location line="-90"/> + <location line="-91"/> <source>The file %1 already exists. Do you want to overwrite it?</source> <translation>Le fichier %1 existe déjà. Voulez-vous l'écraser ?</translation> </message> @@ -406,17 +699,17 @@ <message> <location line="+8"/> <source>Downloading %1...</source> - <translation>Téléchargement de %1 en cours…</translation> + <translation>Téléchargement de %1 en cours...</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <location line="+42"/> - <location line="+38"/> + <location line="+40"/> <source>Download failed: %1.</source> <translation>Échec du téléchargement : %1.</translation> </message> <message> - <location line="-70"/> + <location line="-72"/> <source>Documentation info file is corrupt!</source> <translation>Le fichier d'information de documentation est corrompu !</translation> </message> @@ -428,10 +721,10 @@ <message> <location line="+2"/> <source>Installing documentation %1...</source> - <translation>Installation de la documentation %1…</translation> + <translation>Installation de la documentation %1...</translation> </message> <message> - <location line="+22"/> + <location line="+23"/> <source>Error while installing documentation: %1</source> <translation>Erreur durant l'installation de la documentation : @@ -441,78 +734,81 @@ <context> <name>MainWindow</name> <message> - <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+110"/> - <location line="+383"/> + <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+123"/> + <location line="+369"/> <source>Index</source> <translation>Index</translation> </message> <message> - <location line="-377"/> - <location line="+375"/> + <location line="-363"/> + <location line="+361"/> <source>Contents</source> <translation>Sommaire</translation> </message> <message> - <location line="-370"/> - <location line="+374"/> + <location line="-354"/> + <location line="+358"/> <source>Bookmarks</source> <translation>Signets</translation> </message> <message> - <location line="-362"/> - <location line="+207"/> - <location line="+514"/> + <location line="-336"/> + <location line="+680"/> + <location line="+284"/> <source>Qt Assistant</source> <translation>Qt Assistant</translation> </message> <message> - <location line="-546"/> - <location line="+5"/> <source>Unfiltered</source> - <translation>Non-filtré</translation> + <translation type="obsolete">Non-filtré</translation> </message> <message> - <location line="+21"/> + <location line="-772"/> <source>Looking for Qt Documentation...</source> - <translation>Recherche la documentation de Qt…</translation> + <translation>Recherche la documentation de Qt...</translation> </message> <message> - <location line="+84"/> + <location line="+60"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location line="+2"/> + <location line="+7"/> <source>Page Set&up...</source> - <translation>&Mise en page…</translation> + <translation>&Mise en page...</translation> </message> <message> <location line="+2"/> <source>Print Preview...</source> - <translation>Aperçu avant impression…</translation> + <translation>Aperçu avant impression...</translation> </message> <message> <location line="+3"/> <source>&Print...</source> - <translation>&Imprimer…</translation> + <translation>&Imprimer...</translation> </message> <message> - <location line="+7"/> + <location line="-10"/> <source>New &Tab</source> <translation>Nouvel ongle&t</translation> </message> <message> - <location line="+3"/> + <location line="+17"/> <source>&Close Tab</source> <translation>&Fermer l'onglet</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>&Quit</source> <translation>&Quitter</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>CTRL+Q</source> + <translation>CTRL+Q</translation> + </message> + <message> + <location line="+5"/> <source>&Edit</source> <translation>&Édition</translation> </message> @@ -524,7 +820,7 @@ <message> <location line="+8"/> <source>&Find in Text...</source> - <translation>&Rechercher dans le texte…</translation> + <translation>&Rechercher dans le texte...</translation> </message> <message> <location line="+2"/> @@ -544,7 +840,7 @@ <message> <location line="+5"/> <source>Preferences...</source> - <translation>Préférences…</translation> + <translation>Préférences...</translation> </message> <message> <location line="+3"/> @@ -652,32 +948,35 @@ <translation>Ctrl+Alt+Left</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>&Bookmarks</source> <translation>Si&gnets</translation> </message> <message> - <location line="+1"/> + <location line="+592"/> + <source>Could not register file '%1': %2</source> + <translation>Impossible d'enregistrer le fichier '%1' : %2</translation> + </message> + <message> <source>Add Bookmark...</source> - <translation>Ajouter un signet…</translation> + <translation type="obsolete">Ajouter un signet...</translation> </message> <message> - <location line="+2"/> <source>CTRL+D</source> - <translation>CTRL+D</translation> + <translation type="obsolete">CTRL+D</translation> </message> <message> - <location line="+2"/> + <location line="-590"/> <source>&Help</source> <translation>Ai&de</translation> </message> <message> <location line="+1"/> <source>About...</source> - <translation>À propos…</translation> + <translation>À propos...</translation> </message> <message> - <location line="+16"/> + <location line="+21"/> <source>Navigation Toolbar</source> <translation>Barre d'outils de navigation</translation> </message> @@ -702,12 +1001,12 @@ <translation>Ctrl+M</translation> </message> <message> - <location line="+50"/> + <location line="+43"/> <source>Toolbars</source> <translation>Barres d'outils</translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>Filter Toolbar</source> <translation>Barre d'outils de filtrage</translation> </message> @@ -717,7 +1016,7 @@ <translation>Filtre :</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Address Toolbar</source> <translation>Barre d'outils d'adresse</translation> </message> @@ -727,18 +1026,18 @@ <translation>Adresse :</translation> </message> <message> - <location line="+114"/> + <location line="+112"/> <source>Could not find the associated content item.</source> <translatorcomment>what is item in this context? ← same question here</translatorcomment> <translation>Impossible de trouver l'élément de contenu associé.</translation> </message> <message> - <location line="+71"/> + <location line="+60"/> <source>About %1</source> <translation>À propos de %1</translation> </message> <message> - <location line="+114"/> + <location line="+175"/> <source>Updating search index</source> <translation>Mise à jour de l'index de recherche</translation> </message> @@ -746,18 +1045,18 @@ <context> <name>PreferencesDialog</name> <message> - <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+259"/> - <location line="+43"/> + <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+252"/> + <location line="+44"/> <source>Add Documentation</source> <translation>Ajouter de la documentation</translation> </message> <message> - <location line="-43"/> + <location line="-44"/> <source>Qt Compressed Help Files (*.qch)</source> <translation>Fichiers d'aide Qt compressés (*.qch)</translation> </message> <message> - <location line="+29"/> + <location line="+30"/> <source>The namespace %1 is already registered!</source> <translation>L'espace de nom %1 existe déjà !</translation> </message> @@ -767,7 +1066,7 @@ <translation>Le fichier spécifié n'est pas un fichier d'aide Qt valide !</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Remove Documentation</source> <translation>Supprimer la documentation</translation> </message> @@ -787,7 +1086,7 @@ <translation>OK</translation> </message> <message> - <location line="+88"/> + <location line="+83"/> <source>Use custom settings</source> <translation>Utiliser des paramètres personnalisés</translation> </message> @@ -863,7 +1162,7 @@ <message> <location/> <source>Add...</source> - <translation>Ajouter…</translation> + <translation>Ajouter...</translation> </message> <message> <location/> @@ -914,118 +1213,94 @@ <context> <name>QObject</name> <message> - <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+112"/> <source>The specified collection file does not exist!</source> - <translation>Le fichier de collection spécifié n'existe pas !</translation> + <translation type="obsolete">Le fichier de collection spécifié n'existe pas !</translation> </message> <message> - <location line="+4"/> <source>Missing collection file!</source> - <translation>Fichier de collection manquant !</translation> + <translation type="obsolete">Fichier de collection manquant !</translation> </message> <message> - <location line="+9"/> <source>Invalid URL!</source> - <translation>URL invalide !</translation> + <translation type="obsolete">URL invalide !</translation> </message> <message> - <location line="+4"/> <source>Missing URL!</source> - <translation>URL manquante !</translation> + <translation type="obsolete">URL manquante !</translation> </message> <message> - <location line="+17"/> - <location line="+19"/> - <location line="+19"/> <source>Unknown widget: %1</source> - <translation>Widget inconnu : %1</translation> + <translation type="obsolete">Widget inconnu : %1</translation> </message> <message> - <location line="-34"/> - <location line="+19"/> - <location line="+19"/> <source>Missing widget!</source> - <translation>Widget manquant !</translation> + <translation type="obsolete">Widget manquant !</translation> </message> <message> - <location line="+7"/> - <location line="+12"/> <source>The specified Qt help file does not exist!</source> - <translation>Le fichier d'aide Qt spécifié n'existe pas !</translation> + <translation type="obsolete">Le fichier d'aide Qt spécifié n'existe pas !</translation> </message> <message> - <location line="-7"/> - <location line="+12"/> <source>Missing help file!</source> - <translation>Fichier d'aide manquant !</translation> + <translation type="obsolete">Fichier d'aide manquant !</translation> </message> <message> - <location line="+7"/> <source>Missing filter argument!</source> - <translation>Argument de filtre manquant !</translation> + <translation type="obsolete">Argument de filtre manquant !</translation> </message> <message> - <location line="+12"/> <source>Unknown option: %1</source> - <translation>Option inconnue : %1</translation> + <translation type="obsolete">Option inconnue : %1</translation> </message> <message> - <location line="+30"/> - <location line="+2"/> <source>Qt Assistant</source> - <translation>Qt Assistant</translation> + <translation type="obsolete">Qt Assistant</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/main.cpp" line="+225"/> <source>Could not register documentation file %1 Reason: %2</source> - <translation>Impossible d'enregistrer le fichier de documentation + <translation type="obsolete">Impossible d'enregistrer le fichier de documentation %1 Raison : %2</translation> </message> <message> - <location line="+4"/> <source>Documentation successfully registered.</source> - <translation>Documentation enregistrée avec succès.</translation> + <translation type="obsolete">Documentation enregistrée avec succès.</translation> </message> <message> - <location line="+8"/> <source>Documentation successfully unregistered.</source> - <translation>Documentation retirée avec succès.</translation> + <translation type="obsolete">Documentation retirée avec succès.</translation> </message> <message> - <location line="+3"/> <source>Could not unregister documentation file %1 Reason: %2</source> - <translation>Impossible d'enregistrer le fichier de documentation + <translation type="obsolete">Impossible d'enregistrer le fichier de documentation %1 Raison : %2</translation> </message> <message> - <location line="+37"/> <source>Cannot load sqlite database driver!</source> - <translation>Impossible de charger le driver de la base de données sqlite !</translation> + <translation type="obsolete">Impossible de charger le driver de la base de données sqlite !</translation> </message> <message> - <location line="+9"/> <source>The specified collection file could not be read!</source> - <translation>Le fichier de collection spécifié ne peut pas être lu !</translation> + <translation type="obsolete">Le fichier de collection spécifié ne peut pas être lu !</translation> </message> </context> <context> <name>RemoteControl</name> <message> - <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="+163"/> + <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="+165"/> <source>Debugging Remote Control</source> <translation>Débogage du contrôle à distance</translation> </message> @@ -1038,7 +1313,7 @@ Raison : <context> <name>SearchWidget</name> <message> - <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+196"/> + <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+210"/> <source>&Copy</source> <translation>&Copier</translation> </message> @@ -1081,7 +1356,7 @@ Raison : <translation>&Fermer</translation> </message> <message> - <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="+54"/> + <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="+53"/> <source>Choose a topic for <b>%1</b>:</source> <translation>Choisir le domaine pour <b>%1</b> :</translation> </message> diff --git a/translations/designer_fr.ts b/translations/designer_fr.ts index bfdbb73..9bf3810 100644 --- a/translations/designer_fr.ts +++ b/translations/designer_fr.ts @@ -4,27 +4,27 @@ <context> <name>AbstractFindWidget</name> <message> - <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="127"/> + <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="+127"/> <source>&Previous</source> <translation>&Précédent</translation> </message> <message> - <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="135"/> + <location line="+8"/> <source>&Next</source> <translation>&Suivant</translation> </message> <message> - <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="159"/> + <location line="+24"/> <source>&Case sensitive</source> <translation>&Sensible à la casse</translation> </message> <message> - <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="167"/> + <location line="+8"/> <source>Whole &words</source> <translation>M&ots complets</translation> </message> <message> - <location filename="../tools/shared/findwidget/abstractfindwidget.cpp" line="179"/> + <location line="+12"/> <source><img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped</source> <translation><img src=":/trolltech/shared/images/wrap.png">&nbsp;Recherche à partir du début</translation> </message> @@ -32,17 +32,17 @@ <context> <name>AddLinkDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/addlinkdialog.ui" line="5"/> + <location filename="../tools/designer/src/lib/shared/addlinkdialog.ui"/> <source>Insert Link</source> <translation>Insérer lien</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/addlinkdialog.ui" line="19"/> + <location/> <source>Title:</source> <translation>Titre :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/addlinkdialog.ui" line="36"/> + <location/> <source>URL:</source> <translation>URL :</translation> </message> @@ -50,7 +50,7 @@ <context> <name>AppFontDialog</name> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="418"/> + <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="+418"/> <source>Additional Fonts</source> <translation>Polices additionnelles</translation> </message> @@ -58,38 +58,38 @@ <context> <name>AppFontManager</name> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="151"/> + <location line="-267"/> <source>'%1' is not a file.</source> <translation>'%1' n'est pas un fichier.</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="155"/> + <location line="+4"/> <source>The font file '%1' does not have read permissions.</source> <translation>Le fichier de la police '%1' n'a pas les permissions de lecture.</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="163"/> + <location line="+8"/> <source>The font file '%1' is already loaded.</source> <translation>Le fichier de la police '%1' est déjà chargé.</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="170"/> + <location line="+7"/> <source>The font file '%1' could not be loaded.</source> <translatorcomment>passé composé plutôt</translatorcomment> <translation>Le fichier de la police '%1' n'a pas pu chargé.</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="187"/> + <location line="+17"/> <source>'%1' is not a valid font id.</source> <translation>'%1' n'est pas un identifiant de police valide.</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="198"/> + <location line="+11"/> <source>There is no loaded font matching the id '%1'.</source> <translation>Il n'y a pas de police chargée correspondant à l'identifiant '%1'.</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="213"/> + <location line="+15"/> <source>The font '%1' (%2) could not be unloaded.</source> <translation>La police '%1' (%2) ne peut pas être déchargée.</translation> </message> @@ -97,53 +97,53 @@ <context> <name>AppFontWidget</name> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="239"/> + <location line="+26"/> <source>Fonts</source> <translation>Polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="297"/> + <location line="+58"/> <source>Add font files</source> <translation>Ajouter des fichiers de polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="302"/> + <location line="+5"/> <source>Remove current font file</source> <translation>Retirer le fichier de police courant</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="306"/> + <location line="+4"/> <source>Remove all font files</source> <translation>Retirer tous les fichiers de polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="325"/> + <location line="+19"/> <source>Add Font Files</source> <translation>Ajouter des fichiers de polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="326"/> + <location line="+1"/> <source>Font files (*.ttf)</source> <translation>Fichier de polices (*.ttf)</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="339"/> + <location line="+13"/> <source>Error Adding Fonts</source> <translation>Erreur dans l'ajout de polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="363"/> + <location line="+24"/> <source>Error Removing Fonts</source> <translatorcomment>s/de/des/ pour être cohérent avec le suivant...</translatorcomment> <translation>Erreur lors de la suppression des polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="385"/> + <location line="+22"/> <source>Remove Fonts</source> <translation>Retirer les polices</translation> </message> <message> - <location filename="../tools/designer/src/designer/appfontdialog.cpp" line="385"/> + <location line="+0"/> <source>Would you like to remove all fonts?</source> <translation>Voulez-vous supprimer toutes les polices ?</translation> </message> @@ -151,12 +151,12 @@ <context> <name>AppearanceOptionsWidget</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.ui" line="14"/> + <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.ui"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.ui" line="20"/> + <location/> <source>User Interface Mode</source> <translation>Mode de l'interface utilisateur</translation> </message> @@ -164,17 +164,17 @@ <context> <name>AssistantClient</name> <message> - <location filename="../tools/designer/src/designer/assistantclient.cpp" line="100"/> + <location filename="../tools/designer/src/designer/assistantclient.cpp" line="+100"/> <source>Unable to send request: Assistant is not responding.</source> <translation>Impossible d'envoyer la requête : Assistant ne répond pas.</translation> </message> <message> - <location filename="../tools/designer/src/designer/assistantclient.cpp" line="139"/> + <location line="+39"/> <source>The binary '%1' does not exist.</source> <translation>Le binaire '%1' n'existe pas.</translation> </message> <message> - <location filename="../tools/designer/src/designer/assistantclient.cpp" line="148"/> + <location line="+9"/> <source>Unable to launch assistant (%1).</source> <translation>Impossible de démarrer Assistant (%1).</translation> </message> @@ -182,93 +182,93 @@ <context> <name>BrushPropertyManager</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="52"/> + <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="+52"/> <source>No brush</source> <translation>Pas de pinceau</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="53"/> + <location line="+1"/> <source>Solid</source> <translatorcomment>c'est plutôt continu ou "trait continu" pour moi</translatorcomment> <translation>Trait continu</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="54"/> + <location line="+1"/> <source>Dense 1</source> <translation>Dense 1</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="55"/> + <location line="+1"/> <source>Dense 2</source> <translation>Dense 2</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="56"/> + <location line="+1"/> <source>Dense 3</source> <translation>Dense 3</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="57"/> + <location line="+1"/> <source>Dense 4</source> <translation>Dense 4</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="58"/> + <location line="+1"/> <source>Dense 5</source> <translation>Dense 5</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="59"/> + <location line="+1"/> <source>Dense 6</source> <translation>Dense 6</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="60"/> + <location line="+1"/> <source>Dense 7</source> <translation>Dense 7</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="61"/> + <location line="+1"/> <source>Horizontal</source> <translation>Horizontal</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="62"/> + <location line="+1"/> <source>Vertical</source> <translation>Vertical</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="63"/> + <location line="+1"/> <source>Cross</source> <translation>Croix</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="64"/> + <location line="+1"/> <source>Backward diagonal</source> <translation>Diagonale arrière</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="65"/> + <location line="+1"/> <source>Forward diagonal</source> <translation>Diagonale avant</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="66"/> + <location line="+1"/> <source>Crossing diagonal</source> <translation>Diagonale croisée</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="149"/> + <location line="+93"/> <source>Style</source> <translation>Style</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="160"/> + <location line="+11"/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/brushpropertymanager.cpp" line="265"/> + <location line="+105"/> <source>[%1, %2]</source> <translation>[%1, %2]</translation> </message> @@ -276,353 +276,357 @@ <context> <name>Command</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="208"/> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="466"/> + <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="+208"/> + <location line="+258"/> <source>Change signal</source> <translation>Modifier le signal</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="210"/> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="478"/> + <location line="-256"/> + <location line="+268"/> <source>Change slot</source> <translation>Modifier le slot</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="258"/> + <location line="-220"/> <source>Change signal-slot connection</source> <translation>Modfier la connection signal-slot</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="492"/> + <location line="+234"/> <source>Change sender</source> <translatorcomment>expéditeur/source</translatorcomment> <translation>Modifier l'envoyeur</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="510"/> + <location line="+18"/> <source>Change receiver</source> <translatorcomment>destinataire++/cible?</translatorcomment> <translation>Modifier le destinataire</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="221"/> + <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+221"/> <source>Create button group</source> <translation>Créer un groupe de boutons</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="248"/> + <location line="+27"/> <source>Break button group</source> <translation>Dissocier le groupe de bouton</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="257"/> + <location line="+9"/> <source>Break button group '%1'</source> <translation>Dissossier le groupe de bouton '%1'</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="274"/> + <location line="+17"/> <source>Add buttons to group</source> <translation>Ajouter les boutons au groupe</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="282"/> - <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="458"/> + <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="+458"/> + <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+8"/> <source>Add '%1' to '%2'</source> <extracomment>Command description for adding buttons to a QButtonGroup</extracomment> <translation>Ajouter '%1' à '%2'</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="296"/> + <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+14"/> <source>Remove buttons from group</source> <translation>Retirer les boutons du groupe</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="311"/> + <location line="+15"/> <source>Remove '%1' from '%2'</source> <extracomment>Command description for removing buttons from a QButtonGroup</extracomment> <translation>Retirer '%1' de '%2'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="143"/> + <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+143"/> <source>Add connection</source> <translation>Ajouter une connexion</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="197"/> + <location line="+54"/> <source>Adjust connection</source> <translation>Réajuster les connexions</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="216"/> + <location line="+19"/> <source>Delete connections</source> <translation>Supprimer les connexions</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="274"/> + <location line="+58"/> <source>Change source</source> <translation>Modifier la source</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="276"/> + <location line="+2"/> <source>Change target</source> <translation>Modifier la cible</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="349"/> + <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="+349"/> <source>Morph %1/'%2' into %3</source> <extracomment>MorphWidgetCommand description</extracomment> <translation>Transformer %1/'%2' en %3</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="149"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="+149"/> <source>Insert '%1'</source> <translation>Insérer '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="282"/> + <location line="+133"/> <source>Change Z-order of '%1'</source> <translatorcomment>l'ordre de '%1' sur l'axe z? profondeur ?</translatorcomment> <translation>Modifier la profondeur de '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="316"/> + <location line="+34"/> <source>Raise '%1'</source> <translation>Élever '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="349"/> + <location line="+33"/> <source>Lower '%1'</source> <translation>Abaisser '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="462"/> + <location line="+113"/> <source>Delete '%1'</source> <translation>Supprimer '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="581"/> + <location line="+119"/> <source>Reparent '%1'</source> <translation>Reparenter '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="634"/> + <location line="+53"/> <source>Promote to custom widget</source> <translation>Promouvoir en widget personnalisé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="676"/> + <location line="+42"/> <source>Demote from custom widget</source> <translation>Annuler la promotion en widget personnalisé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="755"/> + <location line="+79"/> <source>Lay out using grid</source> <translation>Mettre en page à l'aide d'une grille</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="758"/> + <location line="+3"/> <source>Lay out vertically</source> <translation>Mettre en page verticalement</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="761"/> <source>Lay out horizontaly</source> + <translation type="obsolete">Mettre en page horizontalement</translation> + </message> + <message> + <location line="+3"/> + <source>Lay out horizontally</source> <translation>Mettre en page horizontalement</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="802"/> + <location line="+41"/> <source>Break layout</source> <translation>Casser la mise en page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="907"/> + <location line="+105"/> <source>Simplify Grid Layout</source> <translation>Simplifier la mise en page en grille</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1042"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1277"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1355"/> + <location line="+135"/> + <location line="+235"/> + <location line="+78"/> <source>Move Page</source> <translation>Déplacer la page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1076"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1199"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1387"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2053"/> + <location line="-279"/> + <location line="+123"/> + <location line="+188"/> + <location line="+666"/> <source>Delete Page</source> <translation>Supprimer la page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1114"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1237"/> + <location line="-939"/> + <location line="+123"/> <source>Page</source> <translation>Page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1119"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1242"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1428"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2095"/> + <location line="-118"/> + <location line="+123"/> + <location line="+186"/> + <location line="+667"/> <source>Insert Page</source> <translation>Insérer une page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1448"/> + <location line="-647"/> <source>Change Tab order</source> <translation>Modifier l'ordre des tabulations</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1476"/> + <location line="+28"/> <source>Create Menu Bar</source> <translation>Créer une barre de menu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1520"/> + <location line="+44"/> <source>Delete Menu Bar</source> <translation>Supprimer la barre de menu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1567"/> + <location line="+47"/> <source>Create Status Bar</source> <translation>Créer une barre d'état</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1609"/> + <location line="+42"/> <source>Delete Status Bar</source> <translation>Supprimer la barre d'état</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1654"/> + <location line="+45"/> <source>Add Tool Bar</source> <translation>Ajouter une barre d'outil</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1713"/> + <location line="+59"/> <source>Add Dock Window</source> <translation>Ajouter une fenêtre ancrable</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1766"/> + <location line="+53"/> <source>Adjust Size of '%1'</source> <translation>Ajuster les dimensions de '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1823"/> + <location line="+57"/> <source>Change Form Layout Item Geometry</source> <translation>Modifier la géométrie de l'élément de formulaire</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="1918"/> + <location line="+95"/> <source>Change Layout Item Geometry</source> <translation>Modifier la géométrie de l'élément de mise en page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2056"/> + <location line="+138"/> <source>Delete Subwindow</source> <translation>Supprimer la sous-fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2097"/> + <location line="+41"/> <source>page</source> <translation>page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2100"/> + <location line="+3"/> <source>Insert Subwindow</source> <translation>Insérer une sous-fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2102"/> + <location line="+2"/> <source>subwindow</source> <translation>sous-fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2103"/> + <location line="+1"/> <source>Subwindow</source> <translation>Sous fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2494"/> + <location line="+391"/> <source>Change Table Contents</source> <translation>Modifier le contenu de la table</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2601"/> + <location line="+107"/> <source>Change Tree Contents</source> <translation>Modifier le contenu de l'arbre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2675"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2821"/> + <location line="+74"/> + <location line="+146"/> <source>Add action</source> <translation>Ajouter une action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2701"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2827"/> + <location line="-120"/> + <location line="+126"/> <source>Remove action</source> <translation>Supprimer l'action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2880"/> + <location line="+53"/> <source>Add menu</source> <translation>Ajouter un menu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2886"/> + <location line="+6"/> <source>Remove menu</source> <translation>Supprimer le menu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2892"/> + <location line="+6"/> <source>Create submenu</source> <translation>Créer une sous-fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command.cpp" line="2923"/> + <location line="+31"/> <source>Delete Tool Bar</source> <translation>Supprimer la barre d'outils</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_command2.cpp" line="154"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_command2.cpp" line="+154"/> <source>Change layout of '%1' from %2 to %3</source> <translation>Modifier la mise en page de '%1' de %2 à %3</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="1195"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="+1196"/> <source>Set action text</source> <translation>Définir le texte de l'action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="1198"/> + <location line="+3"/> <source>Insert action</source> <translation>Insérer action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="1287"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="907"/> + <location line="+89"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+915"/> <source>Move action</source> <translation>Déplacer action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="483"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-432"/> <source>Change Title</source> <translation>Modifier le titre</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="485"/> + <location line="+2"/> <source>Insert Menu</source> <translation>Insérer menu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1213"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="+1225"/> <source>Changed '%1' of '%2'</source> <translation>Modifier '%1' de '%2'</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1216"/> + <location line="+3"/> <source>Changed '%1' of %n objects</source> <translation> <numerusform>Modifier '%1' de %n objet</numerusform> @@ -630,12 +634,12 @@ </translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1292"/> + <location line="+84"/> <source>Reset '%1' of '%2'</source> <translation>Réinitialiser '%1' de '%2'</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1295"/> + <location line="+3"/> <source>Reset '%1' of %n objects</source> <translation> <numerusform>Réinitialiser '%1' de %n objet</numerusform> @@ -643,12 +647,12 @@ </translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1384"/> + <location line="+89"/> <source>Add dynamic property '%1' to '%2'</source> <translation>Ajouter la propriété dynamique '%1' à '%2'</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1387"/> + <location line="+3"/> <source>Add dynamic property '%1' to %n objects</source> <translation> <numerusform>Ajouter la propriété dynamique '%1' à %n objet</numerusform> @@ -656,12 +660,12 @@ </translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1473"/> + <location line="+86"/> <source>Remove dynamic property '%1' from '%2'</source> <translation>Supprimer la propriété dynamique '%1' de '%2'</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertycommand.cpp" line="1476"/> + <location line="+3"/> <source>Remove dynamic property '%1' from %n objects</source> <translation> <numerusform>Supprimer la propriété dynamique '%1' de %n objet</numerusform> @@ -669,12 +673,12 @@ </translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/scriptcommand.cpp" line="55"/> + <location filename="../tools/designer/src/lib/shared/scriptcommand.cpp" line="+55"/> <source>Change script</source> <translation>Modifier le script</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="202"/> + <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="+202"/> <source>Change signals/slots</source> <translation>Modifier signaux/slots</translation> </message> @@ -682,24 +686,22 @@ <context> <name>ConnectDialog</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui" line="13"/> + <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui"/> <source>Configure Connection</source> <translation>Configurer connexion</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui" line="19"/> - <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui" line="59"/> + <location/> <source>GroupBox</source> <translation>GroupBox</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui" line="34"/> - <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui" line="74"/> + <location/> <source>Edit...</source> <translation>Éditer...</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/connectdialog.ui" line="99"/> + <location/> <source>Show signals and slots inherited from QWidget</source> <translation>Afficher les signaux et slots hérités de QWidget</translation> </message> @@ -707,17 +709,17 @@ <context> <name>ConnectionDelegate</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="643"/> + <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="+645"/> <source><object></source> <translation><objet></translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="661"/> + <location line="+18"/> <source><signal></source> <translation><signal></translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="661"/> + <location line="+0"/> <source><slot></source> <translation><slot></translation> </message> @@ -725,19 +727,19 @@ <context> <name>DPI_Chooser</name> <message> - <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="69"/> + <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="+69"/> <source>Standard (96 x 96)</source> <extracomment>Embedded device standard screen resolution</extracomment> <translation>Standard (96 x 96)</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="71"/> + <location line="+2"/> <source>Greenphone (179 x 185)</source> <extracomment>Embedded device screen resolution</extracomment> <translation>Greenphone (179 x 185)</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="73"/> + <location line="+2"/> <source>High (192 x 192)</source> <extracomment>Embedded device high definition screen resolution</extracomment> <translatorcomment>"haute resolution" would be missleading</translatorcomment> @@ -747,89 +749,89 @@ <context> <name>Designer</name> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="449"/> + <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+446"/> <source>Qt Designer</source> <translation>Qt Designer</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="459"/> + <location line="+10"/> <source>This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form.</source> <translation>Ce fichier contient des ressorts de premier niveau. <br>Ils ne sont <b>PAS</b> sauvegardé dans le formulaire.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="461"/> + <location line="+2"/> <source>Perhaps you forgot to create a layout?</source> <translation>Peut-être avez-vous oublié de créer un layout ?</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="634"/> + <location line="+173"/> <source>Invalid UI file: The root element <ui> is missing.</source> <translation>Fichier UI invalide. L'élément racine <ui> est manquant.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="640"/> + <location line="+6"/> <source>An error has occurred while reading the UI file at line %1, column %2: %3</source> - <translation>Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2: %3</translation> + <translation>Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="666"/> + <location line="+26"/> <source>This file cannot be read because it was created using %1.</source> <translation>Ce fichier ne peut pas être lu car il a été créé à l'aide de %1.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="680"/> + <location line="+14"/> <source>This file was created using Designer from Qt-%1 and cannot be read.</source> <translation>Ce fichier a été créé à l'aide du Designer de Qt-%1 et ne peut être lu.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="710"/> + <location line="+30"/> <source>The converted file could not be read.</source> <translation>Le fichier converti ne peut pas être lu.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="714"/> + <location line="+4"/> <source>This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer.</source> <translation>Ce fichier a été créé par le Designer de Qt-%1 et sera converti au nouveau format par Qt Designer.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="717"/> + <location line="+3"/> <source>The old form has not been touched, but you will have to save the form under a new name.</source> <translation>L'ancienne interface n'a pas été modifiée, vous devez sauvergarder l'interface sous un nouveau nom.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="728"/> + <location line="+11"/> <source>This file was created using Designer from Qt-%1 and could not be read: %2</source> <translation>Le fichier a été créé à l'aide de Designer de Qt-%1 et ne peut pas être lu : %2</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="731"/> + <location line="+3"/> <source>Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format.</source> <translation>Veuillez le faire passer par <b>uic3&nbsp;-convert</b> pour le convertir au format de fichier de Qt 4.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="762"/> + <location line="+31"/> <source>This file cannot be read because the extra info extension failed to load.</source> <translation>Ce fichier ne peut pas être lu car les informations d'extension n'ont pu être chargées.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="682"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="+682"/> <source>Unable to launch %1.</source> <translation>Impossible de lancer %1.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="686"/> + <location line="+4"/> <source>%1 timed out.</source> <translation>%1 est arrivé à échéance.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qsimpleresource.cpp" line="339"/> + <location filename="../tools/designer/src/lib/shared/qsimpleresource.cpp" line="+339"/> <source>Custom Widgets</source> <translation>Widgets personnalisés</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qsimpleresource.cpp" line="351"/> + <location line="+12"/> <source>Promoted Widgets</source> <translation>Widgets promus</translation> </message> @@ -837,12 +839,12 @@ <context> <name>DesignerMetaEnum</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="173"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="-513"/> <source>%1 is not a valid enumeration value of '%2'.</source> <translation>%1 n'est pas une valeur d'énumeration valide de '%2'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="178"/> + <location line="+5"/> <source>'%1' could not be converted to an enumeration value of type '%2'.</source> <translation>'%1' ne peut pas être converti en une valeur d'énumération de type '%2'.</translation> </message> @@ -850,7 +852,7 @@ <context> <name>DesignerMetaFlags</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_utils.cpp" line="256"/> + <location line="+78"/> <source>'%1' could not be converted to a flag value of type '%2'.</source> <translation>'%1' ne peut pas être converti en un drapeau de type '%2'.</translation> </message> @@ -858,13 +860,13 @@ <context> <name>DeviceProfile</name> <message> - <location filename="../tools/designer/src/lib/shared/deviceprofile.cpp" line="397"/> + <location filename="../tools/designer/src/lib/shared/deviceprofile.cpp" line="+397"/> <source>'%1' is not a number.</source> <extracomment>Reading a number for an embedded device profile</extracomment> <translation>'%1' n'est pas un nombre.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/deviceprofile.cpp" line="420"/> + <location line="+23"/> <source>An invalid tag <%1> was encountered.</source> <translation>La balise invalide <%1> a été rencontré.</translation> </message> @@ -872,27 +874,27 @@ <context> <name>DeviceProfileDialog</name> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui" line="20"/> + <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui"/> <source>&Family</source> <translation>&Famille</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui" line="33"/> + <location/> <source>&Point Size</source> <translation>&Taille en points</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui" line="46"/> + <location/> <source>Style</source> <translation>Style</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui" line="59"/> + <location/> <source>Device DPI</source> <translation>PPP/DPI de l'appareil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.ui" line="69"/> + <location/> <source>Name</source> <translation>Nom</translation> </message> @@ -900,57 +902,57 @@ <context> <name>DeviceSkin</name> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="79"/> + <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="+79"/> <source>The image file '%1' could not be loaded.</source> <translation>Le fichier image '%1' n'a pas pu être chargé.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="143"/> + <location line="+64"/> <source>The skin directory '%1' does not contain a configuration file.</source> <translation>Le repertoire de revêtement '%1' ne contient pas un fichier de configuration.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="148"/> + <location line="+5"/> <source>The skin configuration file '%1' could not be opened.</source> <translation>Le fichier de configuration de revêtement '%1' ne peut pas être ouvert.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="154"/> + <location line="+6"/> <source>The skin configuration file '%1' could not be read: %2</source> - <translation>Le fichier de configuration de revêtement '%1' ne peut pas être lu: %2</translation> + <translation>Le fichier de configuration de revêtement '%1' ne peut pas être lu : %2</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="224"/> + <location line="+70"/> <source>Syntax error: %1</source> <translation>Erreur de syntaxe : %1</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="245"/> + <location line="+21"/> <source>The skin "up" image file '%1' does not exist.</source> <translation>Le fichier image "up" de revêtement '%1' n'existe pas.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="255"/> + <location line="+10"/> <source>The skin "down" image file '%1' does not exist.</source> <translation>Le fichier image "down" de revêtement '%1' n'existe pas.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="266"/> + <location line="+11"/> <source>The skin "closed" image file '%1' does not exist.</source> <translation>Le fichier image "closed" de revêtement '%1' n'existe pas.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="278"/> + <location line="+12"/> <source>The skin cursor image file '%1' does not exist.</source> <translation>Le fichier image de revêtement '%1' n'existe pas.</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="303"/> + <location line="+25"/> <source>Syntax error in area definition: %1</source> <translation>Erreur de syntaxe dans la zone de définition : %1</translation> </message> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="341"/> + <location line="+38"/> <source>Mismatch in number of areas, expected %1, got %2.</source> <translation>Incohérence dans le nombre de zones, %1 attendu, %2 reçu.</translation> </message> @@ -958,7 +960,7 @@ <context> <name>EmbeddedOptionsControl</name> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="307"/> + <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="+307"/> <source><html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html></source> <extracomment>Format embedded device profile description</extracomment> <translation><html><table><tr><td><b>Police</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Résolution</b></td><td>%4 x %5</td></tr></table></html></translation> @@ -967,13 +969,13 @@ <context> <name>EmbeddedOptionsPage</name> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="410"/> + <location line="+103"/> <source>Embedded Design</source> <extracomment>Tab in preferences dialog</extracomment> <translation>Design pour appareil mobile</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="420"/> + <location line="+10"/> <source>Device Profiles</source> <extracomment>EmbeddedOptionsControl group box"</extracomment> <translation>Profils des appareils</translation> @@ -982,27 +984,27 @@ <context> <name>FontPanel</name> <message> - <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="63"/> + <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/> <source>Font</source> <translation>Police</translation> </message> <message> - <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="74"/> + <location line="+11"/> <source>&Writing system</source> <translation>&Système d'écriture</translation> </message> <message> - <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="77"/> + <location line="+3"/> <source>&Family</source> <translation>&Famille</translation> </message> <message> - <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="81"/> + <location line="+4"/> <source>&Style</source> <translation>&Style</translation> </message> <message> - <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="85"/> + <location line="+4"/> <source>&Point size</source> <translation>&Taille en points</translation> </message> @@ -1010,22 +1012,22 @@ <context> <name>FontPropertyManager</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="62"/> + <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="+62"/> <source>PreferDefault</source> <translation>PreferDefault</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="63"/> + <location line="+1"/> <source>NoAntialias</source> <translation>NoAntialias</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="64"/> + <location line="+1"/> <source>PreferAntialias</source> <translation>PreferAntialias</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/fontpropertymanager.cpp" line="125"/> + <location line="+61"/> <source>Antialiasing</source> <translation>Antialiasing</translation> </message> @@ -1033,43 +1035,51 @@ <context> <name>FormBuilder</name> <message> - <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="359"/> + <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+375"/> <source>Invalid stretch value for '%1': '%2'</source> - <extracomment>Parsing layout stretch values</extracomment> + <extracomment>Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values</extracomment> <translation>Valeur d'extension invalide pour '%1' : '%2'</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="421"/> + <location line="+62"/> <source>Invalid minimum size for '%1': '%2'</source> - <extracomment>Parsing grid layout minimum size values</extracomment> + <extracomment>Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values</extracomment> <translation>Taille minimum invalide pour '%1' : '%2'</translation> </message> </context> <context> <name>FormEditorOptionsPage</name> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="91"/> + <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="+91"/> <source>%1 %</source> <translation>%1 %</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="95"/> + <location line="+4"/> <source>Preview Zoom</source> <translation>Zoom de visualisation</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="97"/> + <location line="+2"/> <source>Default Zoom</source> <translation>Zoom par défaut</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="126"/> + <location line="+29"/> <source>Forms</source> <extracomment>Tab in preferences dialog</extracomment> <translation>Formulaires</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor_optionspage.cpp" line="139"/> + <location line="+13"/> <source>Default Grid</source> <translation>Grille par défaut</translation> </message> @@ -1077,38 +1087,38 @@ <context> <name>FormLayoutRowDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="6"/> + <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui"/> <source>Add Form Layout Row</source> <translation>Ajouter une ligne de mise en page au formulaire</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="17"/> + <location/> <source>&Label text:</source> <translation>&Texte du label :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="40"/> + <location/> <source>Field &type:</source> <translation>&Type du champ :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="60"/> + <location/> <source>&Field name:</source> <translation>&Nom du champ :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="70"/> + <location/> <source>&Buddy:</source> <translatorcomment>copain c'est un peu beaucoup ptet</translatorcomment> <translation>&Copain :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="87"/> + <location/> <source>&Row:</source> <translation>&Ligne :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutrowdialog.ui" line="103"/> + <location/> <source>Label &name:</source> <translation>&Nom du label :</translation> </message> @@ -1116,12 +1126,12 @@ <context> <name>FormWindow</name> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1701"/> + <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="+1754"/> <source>Unexpected element <%1></source> <translation>Element inattendu : <%1></translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1708"/> + <location line="+7"/> <source>Error while pasting clipboard contents at line %1, column %2: %3</source> <translation>Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3</translation> </message> @@ -1129,62 +1139,62 @@ <context> <name>FormWindowSettings</name> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="54"/> + <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui"/> <source>Form Settings</source> <translation>Configuration du formulaire</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="68"/> + <location/> <source>Layout &Default</source> <translation>Mise en page par &défaut</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="83"/> + <location/> <source>&Spacing:</source> <translation>&Espacements :</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="93"/> + <location/> <source>&Margin:</source> <translation>&Marge :</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="112"/> + <location/> <source>&Layout Function</source> <translation>&Fonction de mise en page</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="133"/> + <location/> <source>Ma&rgin:</source> <translation>Ma&rge :</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="143"/> + <location/> <source>Spa&cing:</source> <translation>Espa&cement :</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="166"/> + <location/> <source>&Pixmap Function</source> <translation>Fonction de &pixmap</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="219"/> + <location/> <source>&Include Hints</source> <translation>Indication d'&include</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="237"/> + <location/> <source>Grid</source> <translation>Grille</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="244"/> + <location/> <source>Embedded Design</source> <translation>Design pour appareil mobile</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="260"/> + <location/> <source>&Author</source> <translation>&Auteur</translation> </message> @@ -1192,7 +1202,7 @@ <context> <name>IconSelector</name> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="352"/> + <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="+352"/> <source>All Pixmaps (</source> <translation>Tous les pixmaps (</translation> </message> @@ -1200,7 +1210,7 @@ <context> <name>ItemPropertyBrowser</name> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="66"/> + <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="+66"/> <source>XX Icon Selected off</source> <extracomment>Sample string to determinate the width for the first column of the list item property browser</extracomment> <translation>XX Icon Selected off</translation> @@ -1209,33 +1219,33 @@ <context> <name>MainWindowBase</name> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="119"/> + <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+121"/> <source>Main</source> <extracomment>Not currently used (main tool bar)</extracomment> <translation>Principal</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="125"/> + <location line="+6"/> <source>File</source> <translation>Fichier</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="126"/> + <location line="+1"/> <source>Edit</source> <translation>Édition</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="127"/> + <location line="+1"/> <source>Tools</source> <translation>Outils</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="128"/> + <location line="+1"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="135"/> + <location line="+7"/> <source>Qt Designer</source> <translation>Qt Designer</translation> </message> @@ -1243,52 +1253,52 @@ <context> <name>NewForm</name> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="78"/> + <location filename="../tools/designer/src/designer/newform.cpp" line="+78"/> <source>Show this Dialog on Startup</source> <translation>Afficher cette boîte de dialogue au démarrage</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="79"/> + <location line="+1"/> <source>C&reate</source> <translation>C&réer</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="80"/> + <location line="+1"/> <source>Recent</source> <translation>Récent</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="83"/> + <location line="+3"/> <source>New Form</source> <translation>Nouveau formulaire</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="112"/> + <location line="+29"/> <source>&Close</source> <translation>&Fermer</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="115"/> + <location line="+3"/> <source>&Open...</source> <translation>&Ouvrir...</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="119"/> + <location line="+4"/> <source>&Recent Forms</source> <translation>&Formulaires récents</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="183"/> + <location line="+64"/> <source>Read error</source> <translation>Erreur de lecture</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="206"/> + <location line="+23"/> <source>A temporary form file could not be created in %1.</source> <translation>Un fichier temporaire de formulaire n'a pas pu être créé dans %1.</translation> </message> <message> - <location filename="../tools/designer/src/designer/newform.cpp" line="212"/> + <location line="+6"/> <source>The temporary form file %1 could not be written.</source> <translation>Le fichier temporaire de formulaire %1 n'a pas pu être écrit.</translation> </message> @@ -1296,22 +1306,22 @@ <context> <name>ObjectInspectorModel</name> <message> - <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="360"/> + <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="+360"/> <source>Object</source> <translation>Objet</translation> </message> <message> - <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="361"/> + <location line="+1"/> <source>Class</source> <translation>Classe</translation> </message> <message> - <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="396"/> + <location line="+35"/> <source>separator</source> <translation>séparateur</translation> </message> <message> - <location filename="../tools/designer/src/components/objectinspector/objectinspectormodel.cpp" line="494"/> + <location line="+98"/> <source><noname></source> <translation><sans nom></translation> </message> @@ -1319,12 +1329,12 @@ <context> <name>ObjectNameDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="158"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+158"/> <source>Change Object Name</source> <translation>Modifier le nom de l'objet</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="162"/> + <location line="+4"/> <source>Object Name</source> <translation>Nom de l'objet</translation> </message> @@ -1332,12 +1342,12 @@ <context> <name>PluginDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.ui" line="54"/> + <location filename="../tools/designer/src/lib/shared/plugindialog.ui"/> <source>Plugin Information</source> <translation>Information du plugin</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.ui" line="80"/> + <location/> <source>1</source> <translation>1</translation> </message> @@ -1345,7 +1355,7 @@ <context> <name>PreferencesDialog</name> <message> - <location filename="../tools/designer/src/designer/preferencesdialog.ui" line="20"/> + <location filename="../tools/designer/src/designer/preferencesdialog.ui"/> <source>Preferences</source> <translation>Préférences</translation> </message> @@ -1353,34 +1363,32 @@ <context> <name>PreviewConfigurationWidget</name> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="5"/> + <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="8"/> + <location/> <source>Print/Preview Configuration</source> <translation>Configuration d'impression/prévisualisation</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="17"/> + <location/> <source>Style</source> <translation>Style</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="27"/> + <location/> <source>Style sheet</source> <translation>Feuille de style</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="46"/> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="53"/> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="74"/> + <location/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.ui" line="62"/> + <location/> <source>Device skin</source> <translation>Revêtement de l'appareil</translation> </message> @@ -1388,7 +1396,7 @@ <context> <name>PromotionModel</name> <message> - <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="112"/> + <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="+112"/> <source>Not used</source> <extracomment>Usage of promoted widgets</extracomment> <translation>Non utilisé</translation> @@ -1397,8 +1405,8 @@ <context> <name>Q3WizardContainer</name> <message> - <location filename="../tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp" line="172"/> - <location filename="../tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp" line="177"/> + <location filename="../tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp" line="+172"/> + <location line="+5"/> <source>Page</source> <translation>Page</translation> </message> @@ -1406,59 +1414,59 @@ <context> <name>QAbstractFormBuilder</name> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="206"/> + <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="+206"/> <source>Unexpected element <%1></source> <translation>Élément imprévu <%1></translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="211"/> + <location line="+5"/> <source>An error has occurred while reading the UI file at line %1, column %2: %3</source> <translation>Une erreur s'est produite lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="217"/> + <location line="+6"/> <source>Invalid UI file: The root element <ui> is missing.</source> <translation>Fichier UI invalide : l'élément racine <ui> est manquant.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="336"/> + <location line="+104"/> <source>The creation of a widget of the class '%1' failed.</source> <translation>La création d'un widget de la classe '%1' a échoué.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="632"/> + <location line="+296"/> <source>Attempt to add child that is not of class QWizardPage to QWizard.</source> <translation>Tentative d'ajout d'enfant qui n'est pas de la classe QWizardPage à QWizard.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="718"/> + <location line="+86"/> <source>Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file.</source> <translation>Tentative d'ajout d'un layout au widget '%1' (%2) qui a déjà un layout dont le type n'est pas boîte %3. Ceci indique une incohérence dans le fichier ui.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="862"/> + <location line="+144"/> <source>Empty widget item in %1 '%2'.</source> <translation>Widget vide dans %1 '%2'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="1542"/> + <location line="+680"/> <source>Flags property are not supported yet.</source> <translation>Les propriétés de type drapeau ne sont pas supportées.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="1623"/> + <location line="+81"/> <source>While applying tab stops: The widget '%1' could not be found.</source> <translation>Lors de l'application des arrêts de tabulation : le widget '%1' ne peut pas être trouvé.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="2531"/> + <location line="+923"/> <source>Invalid QButtonGroup reference '%1' referenced by '%2'.</source> <translation>Référence invalide '%1' à QButtonGroup, référencé par '%2'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/abstractformbuilder.cpp" line="3042"/> + <location line="+511"/> <source>This version of the uitools library is linked without script support.</source> <translation>Cette version de la bibliothèque uitools n'a pas le support des scripts.</translation> </message> @@ -1466,12 +1474,12 @@ Ceci indique une incohérence dans le fichier ui.</translation> <context> <name>QAxWidgetPlugin</name> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp" line="75"/> + <location filename="../tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp" line="+75"/> <source>ActiveX control</source> <translation>Control ActiveX</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp" line="80"/> + <location line="+5"/> <source>ActiveX control widget</source> <translation>Widget control ActiveX</translation> </message> @@ -1479,22 +1487,22 @@ Ceci indique une incohérence dans le fichier ui.</translation> <context> <name>QAxWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="119"/> + <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="+119"/> <source>Set Control</source> <translation>Définir le contrôle</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="120"/> + <location line="+1"/> <source>Reset Control</source> <translation>Réinitialiser le contrôle</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="161"/> + <location line="+41"/> <source>Licensed Control</source> <translation>Contrôle licencié</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="162"/> + <location line="+1"/> <source>The control requires a design-time license</source> <translation>Le contrôle requiert une license par interface</translation> </message> @@ -1502,67 +1510,67 @@ Ceci indique une incohérence dans le fichier ui.</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="83"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="+83"/> <source>%1 is not a promoted class.</source> <translation>%1 n'est pas une classe promue.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="148"/> + <location line="+65"/> <source>The base class %1 is invalid.</source> <translation>La classe de base %1 est invalide.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="155"/> + <location line="+7"/> <source>The class %1 already exists.</source> <translation>La classe %1 existe déjà.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="164"/> + <location line="+9"/> <source>Promoted Widgets</source> <translation>Widgets promus</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="290"/> + <location line="+126"/> <source>The class %1 cannot be removed</source> <translation>La classe %1 ne peut pas être retirée</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="299"/> + <location line="+9"/> <source>The class %1 cannot be removed because it is still referenced.</source> <translation>La classe %1 ne peut pas être retirée car elle est toujours référencée.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="309"/> + <location line="+10"/> <source>The class %1 cannot be renamed</source> <translation>La classe %1 ne peut pas être renommée</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="316"/> + <location line="+7"/> <source>The class %1 cannot be renamed to an empty name.</source> <translation>La classe %1 ne peut pas être renommé avec un nom vide.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="321"/> + <location line="+5"/> <source>There is already a class named %1.</source> <translation>Une classe existe déjà avec le nom %1.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotion.cpp" line="350"/> + <location line="+29"/> <source>Cannot set an empty include file.</source> <translation>Impossible de créer un fichier include vide.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="88"/> + <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="+88"/> <source>Exception at line %1: %2</source> <translation>Exception à la ligne %1 : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="124"/> + <location line="+36"/> <source>Unknown error</source> <translation>Erreur inconnue</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formscriptrunner.cpp" line="174"/> + <location line="+50"/> <source>An error occurred while running the script for %1: %2 Script: %3</source> <translation>Une erreur s'est produite lors de l'exécution du script de %1 : %2 @@ -1572,17 +1580,17 @@ Script : %3</translation> <context> <name>QDesigner</name> <message> - <location filename="../tools/designer/src/designer/qdesigner.cpp" line="141"/> + <location filename="../tools/designer/src/designer/qdesigner.cpp" line="+141"/> <source>%1 - warning</source> <translation>Avertissement - %1</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner.cpp" line="237"/> + <location line="+96"/> <source>Qt Designer</source> <translation>Qt Designer</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner.cpp" line="238"/> + <location line="+1"/> <source>This application cannot be used for the Console edition of Qt</source> <translation>Cette application ne peut pas être utilisée avec l'édition console de Qt</translation> </message> @@ -1590,228 +1598,228 @@ Script : %3</translation> <context> <name>QDesignerActions</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="128"/> + <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="+130"/> <source>Saved %1.</source> <translation>%1 sauvé.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="154"/> + <location line="+26"/> <source>%1 already exists. Do you want to replace it?</source> <translation>%1 existe déjà. Voulez-vous le remplacer ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="178"/> + <location line="+24"/> <source>Edit Widgets</source> <translation>Éditer les widgets</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="179"/> + <location line="+1"/> <source>&New...</source> <translation>&Nouveau...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="180"/> + <location line="+1"/> <source>&Open...</source> <translation>&Ouvrir...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="181"/> + <location line="+1"/> <source>&Save</source> <translation>&Enregistrer</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="182"/> + <location line="+1"/> <source>Save &As...</source> <translation>Enregistrer &sous...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="183"/> + <location line="+1"/> <source>Save A&ll</source> <translation>Enregistrer &tout</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="184"/> + <location line="+1"/> <source>Save As &Template...</source> <translation>Sauver comme &modèle...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="185"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1086"/> + <location line="+1"/> + <location line="+925"/> <source>&Close</source> <translation>&Fermer</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="186"/> + <location line="-924"/> <source>Save &Image...</source> <translation>Enregistrer &image...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="187"/> + <location line="+1"/> <source>&Print...</source> <translation>Im&primer...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="188"/> + <location line="+1"/> <source>&Quit</source> <translation>&Quitter</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="190"/> + <location line="+2"/> <source>View &Code...</source> <translation>&Visualizer le code...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="191"/> + <location line="+1"/> <source>&Minimize</source> <translation>&Minimiser</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="193"/> + <location line="+2"/> <source>Bring All to Front</source> <translation>Amener tout au premier plan</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="195"/> + <location line="+2"/> <source>Preferences...</source> <translation>Préférences...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="196"/> + <location line="+1"/> <source>Additional Fonts...</source> <translation>Polices additionnelles...</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="258"/> + <location line="+72"/> <source>ALT+CTRL+S</source> <translation>ALT+CTRL+S</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="260"/> + <location line="+2"/> <source>CTRL+SHIFT+S</source> <translation>CTRL+SHIFT+S</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="373"/> + <location line="+127"/> <source>CTRL+R</source> <translation>CTRL+R</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="391"/> + <location line="+18"/> <source>CTRL+M</source> <translation>CTRL+M</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="422"/> + <location line="+31"/> <source>Qt Designer &Help</source> <translation>&Aide de Qt Designer</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="429"/> + <location line="+7"/> <source>Current Widget Help</source> <translation>Aide du widget courant</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="436"/> + <location line="+7"/> <source>What's New in Qt Designer?</source> <translation>Quoi de neuf dans Qt Designer ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="443"/> + <location line="+7"/> <source>About Plugins</source> <translation>À propos des plugins</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="449"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1050"/> + <location line="+6"/> + <location line="+601"/> <source>About Qt Designer</source> <translation>À propos de Qt Designer</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="455"/> + <location line="-595"/> <source>About Qt</source> <translation>À propos de Qt</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="493"/> + <location line="+38"/> <source>Clear &Menu</source> <translation>Réinitialiser le &menu</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="499"/> + <location line="+6"/> <source>&Recent Forms</source> <translation>Formulaires &récents</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="576"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="773"/> + <location line="+77"/> + <location line="+197"/> <source>Open Form</source> <translation>Ouvrir le formulaire</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="577"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="614"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="774"/> + <location line="-196"/> + <location line="+37"/> + <location line="+160"/> <source>Designer UI files (*.%1);;All Files (*)</source> <translation>Fichier UI de Qt Designer (*.%1);;Tous les fichiers(*)</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="614"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="862"/> + <location line="-160"/> + <location line="+248"/> <source>Save Form As</source> <translation>Enregistrer le formulaire sous</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="701"/> + <location line="-161"/> <source>Designer</source> <translation>Designer</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="701"/> + <location line="+0"/> <source>Feature not implemented yet!</source> <translation>Cette fonctionnalité n'est pas encore implémentée !</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="716"/> + <location line="+15"/> <source>Code generation failed</source> <translation>La génération du code à échoué</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="760"/> + <location line="+44"/> <source>Read error</source> <translation>Erreur de lecture</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="761"/> + <location line="+1"/> <source>%1 Do you want to update the file location or generate a new form?</source> <translation>%1 Voulez vous mettre à jour l'emplacement du fichier ou générer un nouveau formulaire ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="764"/> + <location line="+3"/> <source>&Update</source> <translation>&Mettre à jour</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="765"/> + <location line="+1"/> <source>&New Form</source> <translation>&Nouveau formulaire</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="842"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="882"/> + <location line="+77"/> + <location line="+40"/> <source>Save Form?</source> <translation>Sauver le formulaire ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="843"/> + <location line="-39"/> <source>Could not open file</source> <translation>Impossible d'ouvrir le fichier</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="847"/> + <location line="+4"/> <source>The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file?</source> @@ -1820,17 +1828,17 @@ Raison : %2 Voulez-vous réessayer ou sélectionner un fichier différent ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="853"/> + <location line="+6"/> <source>Select New File</source> <translation>Sélectionner un nouveau fichier</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="883"/> + <location line="+30"/> <source>Could not write file</source> <translation>Impossible d'écrire le fichier</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="886"/> + <location line="+3"/> <source>It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry?</source> @@ -1839,65 +1847,65 @@ Raison : %2 Voulez-vous réessayer ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1044"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1078"/> + <location line="+158"/> + <location line="+34"/> <source>Assistant</source> <translation>Assistant</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1084"/> + <location line="+6"/> <source>&Close Preview</source> <translation>&Fermer la prévisualisation</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1125"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1148"/> + <location line="+41"/> + <location line="+23"/> <source>The backup file %1 could not be written.</source> <translation>Le fichier de backup %1 n'a pas pu être écrit.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1255"/> + <location line="+107"/> <source>The backup directory %1 could not be created.</source> <translation>Le dossier de backup %1 n'a pas pu être créé.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1261"/> + <location line="+6"/> <source>The temporary backup directory %1 could not be created.</source> <translation>Le dossier temporaire de backup %1 n'a pas pu être créé.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1291"/> + <location line="+30"/> <source>Preview failed</source> <translation>La prévisualisation a échoué</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1315"/> + <location line="+24"/> <source>Image files (*.%1)</source> <translation>Fichiers image (*.%1)</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1324"/> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1341"/> + <location line="+9"/> + <location line="+17"/> <source>Save Image</source> <translation>Sauver image</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1337"/> + <location line="-4"/> <source>Saved image %1.</source> <translation>Image %1 sauvée.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1342"/> + <location line="+5"/> <source>The file %1 could not be written.</source> <translation>Le fichier %1 n'a pas pu être écrit.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1355"/> + <location line="+13"/> <source>Please close all forms to enable the loading of additional fonts.</source> <translation>Veuillez fermer tous les formulaires pour activer le chargement de polices additionnelles.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_actions.cpp" line="1407"/> + <location line="+52"/> <source>Printed %1.</source> <translation>Impression de %1 terminée.</translation> </message> @@ -1905,7 +1913,7 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerAppearanceOptionsPage</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.cpp" line="138"/> + <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.cpp" line="+138"/> <source>Appearance</source> <extracomment>Tab in preferences dialog</extracomment> <translation>Apparence</translation> @@ -1914,17 +1922,17 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerAppearanceOptionsWidget</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.cpp" line="85"/> + <location line="-53"/> <source>Docked Window</source> <translation>Fenêtre ancrable</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.cpp" line="86"/> + <location line="+1"/> <source>Multiple Top-Level Windows</source> <translation>Fenêtres multiples</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_appearanceoptions.cpp" line="91"/> + <location line="+5"/> <source>Toolwindow Font</source> <translation>Police des fenêtre d'outils</translation> </message> @@ -1932,22 +1940,22 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerAxWidget</name> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="91"/> + <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="-71"/> <source>Reset control</source> <translation>Réinitialiser les contrôles</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp" line="93"/> + <location line="+2"/> <source>Set control</source> <translation>Définir les contrôles</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp" line="179"/> + <location filename="../tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp" line="+179"/> <source>Control loaded</source> <translation>Contrôle chargé</translation> </message> <message> - <location filename="../tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp" line="219"/> + <location line="+40"/> <source>A COM exception occurred when executing a meta call of type %1, index %2 of "%3".</source> <translation>Une exception COM a été levée lors de l'execution du meta-appel de type %1, indice %2 de "%3".</translation> </message> @@ -1955,17 +1963,17 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerFormBuilder</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="89"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="+89"/> <source>Script errors occurred:</source> <translation>Erreurs du script :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="396"/> + <location line="+307"/> <source>The preview failed to build.</source> <translation>La construction de la prévisualisation a échoué.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_formbuilder.cpp" line="461"/> + <location line="+65"/> <source>Designer</source> <translation>Designer</translation> </message> @@ -1973,22 +1981,22 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerFormWindow</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_formwindow.cpp" line="217"/> + <location filename="../tools/designer/src/designer/qdesigner_formwindow.cpp" line="+217"/> <source>%1 - %2[*]</source> <translation>%1 - %2[*]</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_formwindow.cpp" line="227"/> + <location line="+10"/> <source>Save Form?</source> <translation>Enregistrer le formulaire ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_formwindow.cpp" line="228"/> + <location line="+1"/> <source>Do you want to save the changes to this document before closing?</source> <translation>Voulez-vous enregistrer les changements de ce document avant de le fermer ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_formwindow.cpp" line="230"/> + <location line="+2"/> <source>If you don't save, your changes will be lost.</source> <translation>Si vous ne sauvegardez pas, les changements seront perdus.</translation> </message> @@ -1996,38 +2004,38 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerMenu</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="106"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="-1180"/> <source>Type Here</source> <translation>Taper ici</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="109"/> + <location line="+3"/> <source>Add Separator</source> <translation>Ajouter séparateur</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="480"/> + <location line="+371"/> <source>Insert separator</source> <translation>Insérer séparateur</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="485"/> + <location line="+5"/> <source>Remove separator</source> <translation>Retirer séparateur</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="487"/> + <location line="+2"/> <source>Remove action '%1'</source> <translation>Supprimer l'action '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="512"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="1162"/> + <location line="+25"/> + <location line="+649"/> <source>Add separator</source> <translation>Ajouter séparateur</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menu.cpp" line="814"/> + <location line="-349"/> <source>Insert action</source> <translation>Insérer action</translation> </message> @@ -2035,22 +2043,22 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerMenuBar</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="110"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-375"/> <source>Type Here</source> <translation>Taper ici</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="408"/> + <location line="+298"/> <source>Remove Menu '%1'</source> <translation>Supprimer menu '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="420"/> + <location line="+12"/> <source>Remove Menu Bar</source> <translation>Supprimer barre de menu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="490"/> + <location line="+70"/> <source>Menu</source> <translation>Menu</translation> </message> @@ -2058,37 +2066,37 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerPluginManager</name> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="271"/> + <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="+271"/> <source>An XML error was encountered when parsing the XML of the custom widget %1: %2</source> <translation>Une erreur XML a été rencontrée lors de l'analyse grammaticale du XML provenant du widget personnalisé %1 : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="276"/> + <location line="+5"/> <source>A required attribute ('%1') is missing.</source> <translation>Un attribut obligatoire ('%1') est manquant.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="314"/> + <location line="+38"/> <source>An invalid property specification ('%1') was encountered. Supported types: %2</source> <translation>Une spécification invalide de propriété ('%1') a été rencontrée. Types supportés : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="334"/> + <location line="+20"/> <source>'%1' is not a valid string property specification.</source> <translation>'%1' n'est pas une spécification valide de propriété chaîne de caractères.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="374"/> + <location line="+40"/> <source>The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>.</source> <translation>Le XML du widget personnalisé %1 ne contient aucun des éléments <widget> ou <ui>.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="386"/> + <location line="+12"/> <source>The class attribute for the class %1 is missing.</source> <translation>L'attribut de classe est manquant pour la classe %1.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/pluginmanager.cpp" line="390"/> + <location line="+4"/> <source>The class attribute for the class %1 does not match the class name %2.</source> <translation>L'attribut de classe pour la classe %1 ne correspond pas au nom de la classe %2.</translation> </message> @@ -2096,7 +2104,7 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerPropertySheet</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_propertysheet.cpp" line="754"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_propertysheet.cpp" line="+762"/> <source>Dynamic Properties</source> <translation>Propriétés dynamiques</translation> </message> @@ -2104,31 +2112,31 @@ Voulez-vous réessayer ?</translation> <context> <name>QDesignerResource</name> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="1223"/> + <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+461"/> <source>The layout type '%1' is not supported, defaulting to grid.</source> <translation>Le type de layout '%1' n'est pas supporté, replacement par une grille.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="1466"/> + <location line="+239"/> <source>The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget.</source> <translation>L'extension du widget '%1' (%2) a retourné un widget non géré par Designer '%3' (%4) lors de la requête pour la page #%5. Les pages du conteneur ne devraient être ajoutées que par spécification dans le XML retourné par la méthode domXml() du widget personnalisé.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2065"/> + <location line="+545"/> <source>Unexpected element <%1></source> <extracomment>Parsing clipboard contents</extracomment> <translation>Élément inattendu <%1></translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2071"/> + <location line="+6"/> <source>Error while pasting clipboard contents at line %1, column %2: %3</source> <extracomment>Parsing clipboard contents</extracomment> <translation>Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2077"/> + <location line="+6"/> <source>Error while pasting clipboard contents: The root element <ui> is missing.</source> <extracomment>Parsing clipboard contents</extracomment> <translation>Erreur lors du collage du contenu du presse-papier. L'élément racine <ui> est manquant.</translation> @@ -2137,12 +2145,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QDesignerSharedSettings</name> <message> - <location filename="../tools/designer/src/lib/shared/shared_settings.cpp" line="83"/> + <location filename="../tools/designer/src/lib/shared/shared_settings.cpp" line="+83"/> <source>The template path %1 could not be created.</source> <translation>Le chemin du modèle %1 n'a pas pu être créé.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/shared_settings.cpp" line="267"/> + <location line="+184"/> <source>An error has been encountered while parsing device profile XML: %1</source> <translation>Une erreur a été rencontrée lors de l'analyse grammaticale du XML du profil de l'appareil : %1</translation> </message> @@ -2150,33 +2158,33 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QDesignerToolWindow</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="190"/> + <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="+190"/> <source>Property Editor</source> <translation>Éditeur de propriétés</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="244"/> + <location line="+54"/> <source>Action Editor</source> <translation>Éditeur d'actions</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="286"/> + <location line="+42"/> <source>Object Inspector</source> <translation>Inspecteur d'objet</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="321"/> + <location line="+35"/> <source>Resource Browser</source> <translatorcomment>plural</translatorcomment> <translation>Explorateur de ressources</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="355"/> + <location line="+34"/> <source>Signal/Slot Editor</source> <translation>Éditeur de signaux et slots</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_toolwindow.cpp" line="396"/> + <location line="+41"/> <source>Widget Box</source> <translation>Boîte de widget</translation> </message> @@ -2184,62 +2192,62 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QDesignerWorkbench</name> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="199"/> + <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="+199"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="201"/> + <location line="+2"/> <source>Edit</source> <translation>Édition</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="205"/> + <location line="+4"/> <source>F&orm</source> <translation>F&ormulaire</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="206"/> + <location line="+1"/> <source>Preview in</source> <translation>Prévisualisation avec</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="210"/> + <location line="+4"/> <source>&View</source> <translation>Afficha&ge</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="212"/> + <location line="+2"/> <source>&Settings</source> <translation>&Configuration</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="214"/> + <location line="+2"/> <source>&Window</source> <translation>Fe&nêtre</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="216"/> + <location line="+2"/> <source>&Help</source> <translation>&Aide</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="239"/> + <location line="+23"/> <source>Toolbars</source> <translation>Barre d'outils</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="416"/> + <location line="+177"/> <source>Widget Box</source> <translation>Boîte de widget</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="704"/> + <location line="+289"/> <source>Save Forms?</source> <translation>Enregistrer les formulaires ?</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="705"/> + <location line="+1"/> <source>There are %n forms with unsaved changes. Do you want to review these changes before quitting?</source> <translation> <numerusform>Il y a %n formulaire avec des changements non-enregistrés. Voulez-vous vérifier les changements avant de quitter?</numerusform> @@ -2247,37 +2255,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans </translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="708"/> + <location line="+3"/> <source>If you do not review your documents, all your changes will be lost.</source> <translation>Si vous ne vérifiez pas vos documents, tous les changements seront perdus.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="709"/> + <location line="+1"/> <source>Discard Changes</source> <translation>Abandonner les changements</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="711"/> + <location line="+2"/> <source>Review Changes</source> <translation>Vérifier les changements</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="806"/> + <location line="+95"/> <source>Backup Information</source> <translation>Informations de sauvegarde</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="807"/> + <location line="+1"/> <source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source> <translation>La dernière session de Designer n'a pas été fermée correctement. Des fichiers de sauvegarde existent. Voulez-vous les charger ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="918"/> + <location line="+111"/> <source>The file <b>%1</b> could not be opened.</source> <translation>Le fichier <b>%1</b> n'a pas pu être ouvert.</translation> </message> <message> - <location filename="../tools/designer/src/designer/qdesigner_workbench.cpp" line="964"/> + <location line="+46"/> <source>The file <b>%1</b> is not a valid Designer UI file.</source> <translation>Le fichier <b>%1</b> n'est pas un fichier valide d'UI de Designer.</translation> </message> @@ -2285,92 +2293,106 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QFormBuilder</name> <message> - <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="163"/> + <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+168"/> <source>An empty class name was passed on to %1 (object name: '%2').</source> - <extracomment>Empty class name passed to widget factory method</extracomment> + <extracomment>Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method</extracomment> <translation>Un nom de classe vide a été passé à %1 (nom d'objet '%2').</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="219"/> + <location line="+56"/> <source>QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'.</source> <translation>QFormBuilder n'a pas pu créer le widget personnalisé de classe '%1'; passage à la classe de base '%2'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="225"/> + <location line="+6"/> <source>QFormBuilder was unable to create a widget of the class '%1'.</source> <translation>QFormBuilder n'a pas pu créer un widget de classe '%1'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="286"/> + <location line="+61"/> <source>The layout type `%1' is not supported.</source> <translation>Le type de layout '%1' n'est pas supporté.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/properties.cpp" line="106"/> + <location filename="../tools/designer/src/lib/uilib/properties.cpp" line="+106"/> <source>The set-type property %1 could not be read.</source> <translation>Le type du setteur de propriété %1 n'a pas pu être lu.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/properties.cpp" line="129"/> + <location line="+23"/> <source>The enumeration-type property %1 could not be read.</source> <translation>Le type d'énumeration de propriété %1 n'a pas pu être lu.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/properties.cpp" line="319"/> + <location line="+190"/> <source>Reading properties of the type %1 is not supported yet.</source> <translation>La lecture des propriétés de type %1 n'est pas supporté.</translation> </message> <message> - <location filename="../tools/designer/src/lib/uilib/properties.cpp" line="585"/> + <location line="+266"/> <source>The property %1 could not be written. The type %2 is not supported yet.</source> <translation>La propriété %1 ne peut pas être écrite. Le type %2 n'est pas encore supporté.</translation> </message> + <message> + <location filename="../tools/designer/src/lib/uilib/properties_p.h" line="+132"/> + <source>The enumeration-value '%1' is invalid. The default value '%2' will be used instead.</source> + <translation>la valeur d'énumération '%1' est invalide. La valeur par défaut '%2' sera utilisée à la place.</translation> + </message> + <message> + <location line="+14"/> + <source>The flag-value '%1' is invalid. Zero will be used instead.</source> + <translation>Le drapeau '%1' est invalide. Zero sera utilisé à la place.</translation> + </message> </context> <context> <name>QStackedWidgetEventFilter</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="194"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="+194"/> <source>Previous Page</source> <translation>Page précédente</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="195"/> + <location line="+1"/> <source>Next Page</source> <translation>Page suivante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="196"/> + <location line="+1"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="197"/> + <location line="+1"/> <source>Before Current Page</source> <translation>Avant la page courante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="198"/> + <location line="+1"/> <source>After Current Page</source> <translation>Après la page courante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="199"/> + <location line="+1"/> <source>Change Page Order...</source> <translation>Modifier l'ordre des pages...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="271"/> + <location line="+72"/> <source>Change Page Order</source> <translation>Modifier l'ordre des pages</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="320"/> + <location line="+49"/> <source>Page %1 of %2</source> <translation>Page %1 de %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="330"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="334"/> + <location line="+10"/> + <location line="+4"/> <source>Insert Page</source> <translation>Insérer page</translation> </message> @@ -2378,12 +2400,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QStackedWidgetPreviewEventFilter</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="181"/> + <location line="-153"/> <source>Go to previous page of %1 '%2' (%3/%4).</source> <translation>Aller à la page précédente de %1 '%2' (%3/%4).</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_stackedbox.cpp" line="185"/> + <location line="+4"/> <source>Go to next page of %1 '%2' (%3/%4).</source> <translation>Aller à la page suivante de %1 '%2' (%3/%4).</translation> </message> @@ -2391,28 +2413,28 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QTabWidgetEventFilter</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="89"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="+89"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="90"/> + <location line="+1"/> <source>Before Current Page</source> <translation>Avant la page courante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="91"/> + <location line="+1"/> <source>After Current Page</source> <translation>Après la page courante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="374"/> + <location line="+283"/> <source>Page %1 of %2</source> <translation>Page %1 de %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="384"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_tabwidget.cpp" line="388"/> + <location line="+10"/> + <location line="+4"/> <source>Insert Page</source> <translation>Insérer page</translation> </message> @@ -2420,37 +2442,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QToolBoxHelper</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="64"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="+64"/> <source>Delete Page</source> <translation>Supprimer page</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="65"/> + <location line="+1"/> <source>Before Current Page</source> <translation>Avant la page courante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="66"/> + <location line="+1"/> <source>After Current Page</source> <translation>Après la page courante</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="67"/> + <location line="+1"/> <source>Change Page Order...</source> <translation>Modifier l'ordre des pages...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="183"/> + <location line="+116"/> <source>Change Page Order</source> <translation>Modifier l'ordre de pages</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="227"/> + <location line="+44"/> <source>Page %1 of %2</source> <translation>Page %1 de %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbox.cpp" line="239"/> + <location line="+12"/> <source>Insert Page</source> <translation>Insérer page</translation> </message> @@ -2458,15 +2480,15 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtBoolEdit</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="226"/> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="236"/> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="261"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+255"/> + <location line="+10"/> + <location line="+25"/> <source>True</source> <translation>Vrai</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="236"/> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="261"/> + <location line="-25"/> + <location line="+25"/> <source>False</source> <translation>Faux</translation> </message> @@ -2474,12 +2496,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtBoolPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="1469"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+1507"/> <source>True</source> <translation>Vrai</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="1470"/> + <location line="+1"/> <source>False</source> <translation>Faux</translation> </message> @@ -2487,7 +2509,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtCharEdit</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="1581"/> + <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1584"/> <source>Clear Char</source> <translation>Effacer caractère</translation> </message> @@ -2495,7 +2517,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtColorEditWidget</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="2186"/> + <location line="+605"/> <source>...</source> <translation>...</translation> </message> @@ -2503,22 +2525,22 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtColorPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="6213"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4718"/> <source>Red</source> <translation>Rouge</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="6221"/> + <location line="+8"/> <source>Green</source> <translation>Vert</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="6229"/> + <location line="+8"/> <source>Blue</source> <translation>Bleu</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="6237"/> + <location line="+8"/> <source>Alpha</source> <translation>Alpha</translation> </message> @@ -2526,97 +2548,97 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtCursorDatabase</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="55"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-234"/> <source>Arrow</source> <translation>Flèche</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="57"/> + <location line="+2"/> <source>Up Arrow</source> <translation>Flèche vers le haut</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="59"/> + <location line="+2"/> <source>Cross</source> <translation>Croix</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="61"/> + <location line="+2"/> <source>Wait</source> <translation>Attendre</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="63"/> + <location line="+2"/> <source>IBeam</source> <translation>IBeam</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="65"/> + <location line="+2"/> <source>Size Vertical</source> <translation>Redimensionner verticalement</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="67"/> + <location line="+2"/> <source>Size Horizontal</source> <translation>Redimensionner horizontalement</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="69"/> + <location line="+2"/> <source>Size Backslash</source> <translation>Redimensionner diagonale droite</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="71"/> + <location line="+2"/> <source>Size Slash</source> <translation>Redimensionner diagonale gauche</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="73"/> + <location line="+2"/> <source>Size All</source> <translation>Redimensionner</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="75"/> + <location line="+2"/> <source>Blank</source> <translation>Vide</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="77"/> + <location line="+2"/> <source>Split Vertical</source> <translation>Scinder verticalement</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="79"/> + <location line="+2"/> <source>Split Horizontal</source> <translation>Scinder horizontalement</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="81"/> + <location line="+2"/> <source>Pointing Hand</source> <translation>Pointeur index</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="83"/> + <location line="+2"/> <source>Forbidden</source> <translation>Interdit</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="85"/> + <location line="+2"/> <source>Open Hand</source> <translation>Main ouverte</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="87"/> + <location line="+2"/> <source>Closed Hand</source> <translation>Main fermée</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="89"/> + <location line="+2"/> <source>What's This</source> <translation>Qu'est-ce que c'est ?</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="91"/> + <location line="+2"/> <source>Busy</source> <translation>Occupé</translation> </message> @@ -2624,12 +2646,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtFontEditWidget</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="2384"/> + <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+198"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="2404"/> + <location line="+20"/> <source>Select Font</source> <translation>Selectionner police</translation> </message> @@ -2637,37 +2659,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtFontPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5886"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-351"/> <source>Family</source> <translation>Famille</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5899"/> + <location line="+13"/> <source>Point Size</source> <translation>Taille en points</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5907"/> + <location line="+8"/> <source>Bold</source> <translation>Gras</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5914"/> + <location line="+7"/> <source>Italic</source> <translation>Italique</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5921"/> + <location line="+7"/> <source>Underline</source> <translation>Souligné</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5928"/> + <location line="+7"/> <source>Strikeout</source> <translation>Barré</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5935"/> + <location line="+7"/> <source>Kerning</source> <translation>Crénage</translation> </message> @@ -2675,7 +2697,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtGradientDialog</name> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientdialog.ui" line="53"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientdialog.ui"/> <source>Edit Gradient</source> <translation>Modifier le gradient</translation> </message> @@ -2683,316 +2705,304 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtGradientEditor</name> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="53"/> + <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="101"/> + <location/> <source>Gradient Editor</source> <translation>Éditeur de gradient</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="104"/> + <location/> <source>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.</source> <translation>Cette zone montre une prévisualisation du gradient édité. Elle permet aussi d'éditer les paramètres spécifiques au type de gradient tel que les points de départ et d'arrivée, le rayon, etc. par glisser-déposer.</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="120"/> + <location/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="155"/> + <location/> <source>2</source> <translation>2</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="190"/> + <location/> <source>3</source> <translation>3</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="225"/> + <location/> <source>4</source> <translation>4</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="260"/> + <location/> <source>5</source> <translation>5</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="295"/> + <location/> <source>Gradient Stops Editor</source> <translation>Éditeur de point d'arrêt du gradient</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="298"/> + <location/> <source>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</source> <translation>Cette zone vous permet d'éditer les points d'arrêt du gardient. Double-cliquez sur un point d'arrêt existant pour le dupliquer. Double-cliquez à l'exterieur d'un point d'arrêt pour en créer un nouveau. Glissez-déposez un point pour le repositionner. Utilisez le bouton droit de la souris pour afficher le menu contextuel avec des actions supplémentaires.</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="311"/> + <location/> <source>Zoom</source> <translation>Zoom</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="330"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="333"/> + <location/> <source>Reset Zoom</source> <translation>Réinitialiser le zoom</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="346"/> + <location/> <source>Position</source> <translation>Position</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="365"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="414"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="436"/> + <location/> <source>Hue</source> <translation>Teinte</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="368"/> + <location/> <source>H</source> <translation>T</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="455"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="504"/> + <location/> <source>Saturation</source> <translation>Saturation</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="458"/> + <location/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="526"/> + <location/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="545"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="594"/> + <location/> <source>Value</source> <translation>Valeur</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="548"/> + <location/> <source>V</source> <translation>V</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="616"/> + <location/> <source>Val</source> <translation>Val</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="635"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="684"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="706"/> + <location/> <source>Alpha</source> <translation>Alpha</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="638"/> + <location/> <source>A</source> <translation>A</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="719"/> + <location/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="732"/> + <location/> <source>Spread</source> <translation>Étendue</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="751"/> + <location/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="764"/> + <location/> <source>Current stop's color</source> <translation>Couleur du point d'arrêt courant</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="786"/> + <location/> <source>Show HSV specification</source> <translation>Montrer les spécifications TSV/HSV</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="789"/> + <location/> <source>HSV</source> <translation>TSV/HSV</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="811"/> + <location/> <source>Show RGB specification</source> <translation>Affichier les spécifications RGB</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="814"/> + <location/> <source>RGB</source> <translation>RGB</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="842"/> + <location/> <source>Current stop's position</source> <translation>Position du point d'arrêt courant</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1030"/> + <location/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1141"/> + <location/> <source>Zoom In</source> <translation>Zoomer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1148"/> + <location/> <source>Zoom Out</source> <translation>Dézoomer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1183"/> + <location/> <source>Toggle details extension</source> <translation>Inverser les détails d'exention</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1186"/> + <location/> <source>></source> <translation>></translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1205"/> + <location/> <source>Linear Type</source> <translation>Type linéaire</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1208"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1230"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1252"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1274"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1296"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1318"/> + <location/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1227"/> + <location/> <source>Radial Type</source> <translation>Type radial</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1249"/> + <location/> <source>Conical Type</source> <translation>Type conique</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1271"/> + <location/> <source>Pad Spread</source> <translation>Étendue par remplissage</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1293"/> + <location/> <source>Repeat Spread</source> <translation>Étendue par répétition</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.ui" line="1315"/> + <location/> <source>Reflect Spread</source> <translation>Étendue par réflexion</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="431"/> + <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="+431"/> <source>Start X</source> <translation>X de départ</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="435"/> + <location line="+4"/> <source>Start Y</source> <translation>Y de départ</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="439"/> + <location line="+4"/> <source>Final X</source> <translation>X de fin</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="443"/> + <location line="+4"/> <source>Final Y</source> <translation>Y de fin</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="450"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="474"/> + <location line="+7"/> + <location line="+24"/> <source>Central X</source> <translation>X central</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="454"/> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="478"/> + <location line="-20"/> + <location line="+24"/> <source>Central Y</source> <translation>Y central</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="458"/> + <location line="-20"/> <source>Focal X</source> <translation>X focal</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="462"/> + <location line="+4"/> <source>Focal Y</source> <translation>Y focal</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="466"/> + <location line="+4"/> <source>Radius</source> <translation>Rayon</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="482"/> + <location line="+16"/> <source>Angle</source> <translation>Angle</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="770"/> + <location line="+288"/> <source>Linear</source> <translation>Linéaire</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="771"/> + <location line="+1"/> <source>Radial</source> <translation>Radial</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="772"/> + <location line="+1"/> <source>Conical</source> <translation>Conique</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="792"/> + <location line="+20"/> <source>Pad</source> <translation>Remplissage</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="793"/> + <location line="+1"/> <source>Repeat</source> <translation>Répéter</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradienteditor.cpp" line="794"/> + <location line="+1"/> <source>Reflect</source> <translation>Réflexion</translation> </message> @@ -3000,37 +3010,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtGradientStopsWidget</name> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="947"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="+947"/> <source>New Stop</source> <translation>Nouveau point d'arrêt</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="948"/> + <location line="+1"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="949"/> + <location line="+1"/> <source>Flip All</source> <translation>Tout renverser</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="950"/> + <location line="+1"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="951"/> + <location line="+1"/> <source>Zoom In</source> <translation>Zoomer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="952"/> + <location line="+1"/> <source>Zoom Out</source> <translation>Dézoomer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopswidget.cpp" line="953"/> + <location line="+1"/> <source>Reset Zoom</source> <translation>Réinitialiser le zoom</translation> </message> @@ -3038,46 +3048,46 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtGradientView</name> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui" line="13"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui"/> <source>Gradient View</source> <translation>Vue du gradient</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui" line="39"/> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="208"/> + <location/> + <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+208"/> <source>New...</source> <translation>Nouveau...</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui" line="58"/> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="209"/> + <location/> + <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/> <source>Edit...</source> <translation>Éditer...</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui" line="77"/> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="210"/> + <location/> + <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.ui" line="96"/> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="211"/> + <location/> + <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="+1"/> <source>Remove</source> <translation>Retirer</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="107"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="-104"/> <source>Grad</source> <translation>Gradient</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="133"/> + <location line="+26"/> <source>Remove Gradient</source> <translation>Retirer gradient</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientview.cpp" line="134"/> + <location line="+1"/> <source>Are you sure you want to remove the selected gradient?</source> <translation>Êtes-vous sûr de vouloir supprimer le gradient sélectionné ?</translation> </message> @@ -3085,7 +3095,8 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtGradientViewDialog</name> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.ui" line="53"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.ui"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.h" line="+62"/> <source>Select Gradient</source> <translation>Sélectionner gradient</translation> </message> @@ -3093,7 +3104,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtKeySequenceEdit</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="312"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+249"/> <source>Clear Shortcut</source> <translation>Effacer les racourcis</translation> </message> @@ -3101,17 +3112,17 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtLocalePropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2394"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-3541"/> <source>%1, %2</source> <translation>%1, %2</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2447"/> + <location line="+53"/> <source>Language</source> <translation>Langue</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2455"/> + <location line="+8"/> <source>Country</source> <translation>Pays</translation> </message> @@ -3119,17 +3130,17 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtPointFPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2866"/> + <location line="+411"/> <source>(%1, %2)</source> <translation>(%1, %2)</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2937"/> + <location line="+71"/> <source>X</source> <translation>X</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2945"/> + <location line="+8"/> <source>Y</source> <translation>Y</translation> </message> @@ -3137,17 +3148,17 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtPointPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2625"/> + <location line="-320"/> <source>(%1, %2)</source> <translation>(%1, %2)</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2662"/> + <location line="+37"/> <source>X</source> <translation>X</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="2669"/> + <location line="+7"/> <source>Y</source> <translation>Y</translation> </message> @@ -3155,12 +3166,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtPropertyBrowserUtils</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="176"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-156"/> <source>[%1, %2, %3] (%4)</source> <translation>[%1, %2, %3] (%4)</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="206"/> + <location line="+30"/> <source>[%1, %2]</source> <translation>[%1, %2]</translation> </message> @@ -3168,27 +3179,27 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtRectFPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4375"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+1706"/> <source>[(%1, %2), %3 x %4]</source> <translation>[(%1, %2), %3 x %4]</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4531"/> + <location line="+156"/> <source>X</source> <translation>X</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4539"/> + <location line="+8"/> <source>Y</source> <translation>Y</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4547"/> + <location line="+8"/> <source>Width</source> <translation>Largeur</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4556"/> + <location line="+9"/> <source>Height</source> <translation>Hauteur</translation> </message> @@ -3196,27 +3207,27 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtRectPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3944"/> + <location line="-612"/> <source>[(%1, %2), %3 x %4]</source> <translation>[(%1, %2), %3 x %4]</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4064"/> + <location line="+120"/> <source>X</source> <translation>X</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4071"/> + <location line="+7"/> <source>Y</source> <translation>Y</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4078"/> + <location line="+7"/> <source>Width</source> <translation>Largeur</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="4086"/> + <location line="+8"/> <source>Height</source> <translation>Hauteur</translation> </message> @@ -3224,175 +3235,173 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans <context> <name>QtResourceEditorDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="13"/> + <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui"/> <source>Dialog</source> <translation>Dialogue</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="39"/> + <location/> <source>New File</source> <translation>Nouveau fichier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="42"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="92"/> + <location/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="49"/> + <location/> <source>Remove File</source> <translation>Supprimer fichier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="52"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="109"/> + <location/> <source>R</source> <translation>S</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="75"/> + <location/> <source>I</source> <translation></translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="89"/> + <location/> <source>New Resource</source> <translation>Nouvelle ressource</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="99"/> + <location/> <source>A</source> <translation>A</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.ui" line="106"/> + <location/> <source>Remove Resource or File</source> <translation>Supprimer ressource ou fichier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="76"/> + <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="+76"/> <source>%1 already exists. Do you want to replace it?</source> <translation>%1 existe déjà. Voulez-vous le remplacer ?</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="81"/> + <location line="+5"/> <source>The file does not appear to be a resource file; element '%1' was found where '%2' was expected.</source> <translation>Le fichier n'est pas un fichier ressource; l'élément '%1' a été trouvé à la place de %2.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="983"/> + <location line="+902"/> <source>%1 [read-only]</source> <translation>%1 [lecture seule]</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="985"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1183"/> + <location line="+2"/> + <location line="+198"/> <source>%1 [missing]</source> <translation>%1 [manquant]</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1111"/> + <location line="-72"/> <source><no prefix></source> <translation><pas de préfixe></translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1431"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1997"/> + <location line="+320"/> + <location line="+566"/> <source>New Resource File</source> <translation>Nouveau fichier de ressource</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1433"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1458"/> + <location line="-564"/> + <location line="+25"/> <source>Resource files (*.qrc)</source> <translation>Fichier de ressource (*.qrc)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1456"/> + <location line="-2"/> <source>Import Resource File</source> <translation>Importer fichier de ressource</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1568"/> + <location line="+112"/> <source>newPrefix</source> <translation>newPrefix</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1584"/> + <location line="+16"/> <source><p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p></source> <translation><p><b>Avertissement :</b> le fichier</p><p>%1</p><p>est en dehors du répertoire parent du fichier de ressource courant.</p></translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1592"/> + <location line="+8"/> <source><p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table></source> <translation><p>Pour résoudre le problème, appuyez sur :</p><table><tr><th align="left">Copier</th><td>Pour copier le fichier dans le répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Copier sous...</th><td>Pour copier le fichier ressource dans un sous-répertoire du répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Conserver</th><td>pour conserver l'emplacement courant.</td></tr></table></translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1617"/> + <location line="+25"/> <source>Add Files</source> <translation>Ajouter fichiers</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1638"/> + <location line="+21"/> <source>Incorrect Path</source> <translation>Chemin incorrect</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1641"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1660"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1872"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1879"/> + <location line="+3"/> + <location line="+19"/> + <location line="+212"/> + <location line="+7"/> <source>Copy</source> <translation>Copier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1643"/> + <location line="-236"/> <source>Copy As...</source> <translation>Copier sous...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1645"/> + <location line="+2"/> <source>Keep</source> <translation>Conserver</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1647"/> + <location line="+2"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1734"/> + <location line="+87"/> <source>Clone Prefix</source> <translation>Cloner le préfixe</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1735"/> + <location line="+1"/> <source>Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de".</source> <translation>Entrez le suffixe que vous voulez ajouter aux noms des fichiers clonés. Ceci peut être une extension de langue par exemple, comme "_fr'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1848"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1852"/> + <location line="+113"/> + <location line="+4"/> <source>Copy As</source> <translation>Copier sous</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1853"/> + <location line="+1"/> <source><p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p></source> <translation><p>Le fichier sélectionné</p><p>%1</p><p>est en dehors du répertoire du fichier de ressource courant :</p><p>%2</p><p>Veuillez sélectionner un chemin dans le répertoire courant.</p></translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1873"/> + <location line="+20"/> <source>Could not overwrite %1.</source> <translation>Impossible d'écraser %1.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1880"/> + <location line="+7"/> <source>Could not copy %1 to @@ -3403,108 +3412,108 @@ vers %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1915"/> + <location line="+35"/> <source>A parse error occurred at line %1, column %2 of %3: %4</source> <translation>Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 de %3 : %4</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1927"/> + <location line="+12"/> <source>Save Resource File</source> <translation>Enregistrer le fichier de ressource</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1928"/> + <location line="+1"/> <source>Could not write %1: %2</source> <translation>Impossible d'écrire %1 : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1961"/> + <location line="+33"/> <source>Edit Resources</source> <translation>Éditer les ressources</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1996"/> + <location line="+35"/> <source>New...</source> <translation>Nouveau...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1998"/> + <location line="+2"/> <source>Open...</source> <translation>Ouvrir...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="1999"/> + <location line="+1"/> <source>Open Resource File</source> <translation>Ouvrir fichier de ressource</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2000"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2011"/> + <location line="+1"/> + <location line="+11"/> <source>Remove</source> <translation>Retirer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2001"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2012"/> + <location line="-10"/> + <location line="+11"/> <source>Move Up</source> <translation>Vers le Haut</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2002"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2013"/> + <location line="-10"/> + <location line="+11"/> <source>Move Down</source> <translation>Vers le Bas</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2004"/> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2005"/> + <location line="-9"/> + <location line="+1"/> <source>Add Prefix</source> <translation>Ajouter préfixe</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2006"/> + <location line="+1"/> <source>Add Files...</source> <translation>Ajouter fichiers...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2007"/> + <location line="+1"/> <source>Change Prefix</source> <translation>Modifier le préfixe</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2008"/> + <location line="+1"/> <source>Change Language</source> <translation>Modifier la langue</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2009"/> + <location line="+1"/> <source>Change Alias</source> <translation>Modifier l'alias</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2010"/> + <location line="+1"/> <source>Clone Prefix...</source> <translation>Cloner le préfixe...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2047"/> + <location line="+37"/> <source>Prefix / Path</source> <translation>Préfixe / chemin</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2048"/> + <location line="+1"/> <source>Language / Alias</source> <translation>Langue / Alias</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2165"/> + <location line="+117"/> <source><html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html></source> <translation><html><p><b>Avertissement:</b> Des problèmes sont apparus lors du rafraichissement des données des ressources :</p><pre>%1</pre></html></translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceeditordialog.cpp" line="2167"/> + <location line="+2"/> <source>Resource Warning</source> <translation>Avertissement relatif aux ressources</translation> </message> @@ -3512,24 +3521,24 @@ vers <context> <name>QtResourceView</name> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="566"/> + <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="+567"/> <source>Size: %1 x %2 %3</source> <translation>Taille : %1 x %2 %3</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="586"/> + <location line="+20"/> <source>Edit Resources...</source> <translation>Éditer ressources...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="592"/> + <location line="+6"/> <source>Reload</source> <translation>Recharger</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="599"/> + <location line="+7"/> <source>Copy Path</source> <translation>Copier le chemin</translation> </message> @@ -3537,7 +3546,7 @@ vers <context> <name>QtResourceViewDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/qtresourceview.cpp" line="849"/> + <location line="+252"/> <source>Select Resource</source> <translation>Séléctionner ressource</translation> </message> @@ -3545,17 +3554,17 @@ vers <context> <name>QtSizeFPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3551"/> + <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="-535"/> <source>%1 x %2</source> <translation>%1 x %2</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3681"/> + <location line="+130"/> <source>Width</source> <translation>Largeur</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3690"/> + <location line="+9"/> <source>Height</source> <translation>Hauteur</translation> </message> @@ -3563,33 +3572,33 @@ vers <context> <name>QtSizePolicyPropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5399"/> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5400"/> + <location line="+1709"/> + <location line="+1"/> <source><Invalid></source> <translation><Invalide></translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5401"/> + <location line="+1"/> <source>[%1, %2, %3, %4]</source> <translation>[%1, %2, %3, %4]</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5446"/> + <location line="+45"/> <source>Horizontal Policy</source> <translation>Politique horizontale</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5455"/> + <location line="+9"/> <source>Vertical Policy</source> <translation>Politique verticale</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5464"/> + <location line="+9"/> <source>Horizontal Stretch</source> <translation>Étirement horizontal</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="5472"/> + <location line="+8"/> <source>Vertical Stretch</source> <translation>Étirement vertical</translation> </message> @@ -3597,17 +3606,17 @@ vers <context> <name>QtSizePropertyManager</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3186"/> + <location line="-2286"/> <source>%1 x %2</source> <translation>%1 x %2</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3282"/> + <location line="+96"/> <source>Width</source> <translation>Largeur</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="3290"/> + <location line="+8"/> <source>Height</source> <translation>Hauteur</translation> </message> @@ -3615,107 +3624,107 @@ vers <context> <name>QtToolBarDialog</name> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="13"/> + <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui"/> <source>Customize Toolbars</source> <translation>Personnaliser les barres d'outils</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="26"/> + <location/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="34"/> + <location/> <source>Actions</source> <translation>Actions</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="49"/> + <location/> <source>Toolbars</source> <translation>Barres d'outils</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="56"/> + <location/> <source>Add new toolbar</source> <translation>Ajouter une nouvelle barre d'outils</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="59"/> + <location/> <source>New</source> <translation>Nouveau</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="66"/> + <location/> <source>Remove selected toolbar</source> <translation>Supprimer la barre d'outils sélectionnée</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="69"/> + <location/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="76"/> + <location/> <source>Rename toolbar</source> <translation>Renommer la barre d'outils</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="79"/> + <location/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="102"/> + <location/> <source>Move action up</source> <translation>Déplacer l'action vers le haut</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="105"/> + <location/> <source>Up</source> <translation>Monter</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="118"/> + <location/> <source>Remove action from toolbar</source> <translation>Retirer l'action de la barre d'outils</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="121"/> + <location/> <source><-</source> <translation><-</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="134"/> + <location/> <source>Add action to toolbar</source> <translation>Ajouter l'action à la barre d'outil</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="137"/> + <location/> <source>-></source> <translation>-></translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="150"/> + <location/> <source>Move action down</source> <translation>Déplacer l'action vers le bas</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="153"/> + <location/> <source>Down</source> <translation>Descendre</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.ui" line="178"/> + <location/> <source>Current Toolbar Actions</source> <translation>Actions de la barre d'outils courante</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="1240"/> + <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="+1240"/> <source>Custom Toolbar</source> <translation>Barre d'outils personnalisée</translation> </message> <message> - <location filename="../tools/shared/qttoolbardialog/qttoolbardialog.cpp" line="1784"/> + <location line="+544"/> <source>< S E P A R A T O R ></source> <translation>< S É P A R A T E U R ></translation> </message> @@ -3723,12 +3732,12 @@ vers <context> <name>QtTreePropertyBrowser</name> <message> - <location filename="../tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp" line="442"/> + <location filename="../tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp" line="+442"/> <source>Property</source> <translation>Propriété</translation> </message> <message> - <location filename="../tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp" line="443"/> + <location line="+1"/> <source>Value</source> <translation>Valeur</translation> </message> @@ -3736,64 +3745,64 @@ vers <context> <name>SaveFormAsTemplate</name> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.ui" line="45"/> + <location filename="../tools/designer/src/designer/saveformastemplate.ui"/> <source>Save Form As Template</source> <translation>Enregistrer le formulaire comme un modèle</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.ui" line="59"/> + <location/> <source>&Name:</source> <translation>&Nom :</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.ui" line="94"/> + <location/> <source>&Category:</source> <translation>&Catégorie :</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="72"/> + <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="+72"/> <source>Add path...</source> <translation>Ajouter chemin...</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="95"/> + <location line="+23"/> <source>Template Exists</source> <translation>Le modèle existe</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="96"/> + <location line="+1"/> <source>A template with the name %1 already exists. Do you want overwrite the template?</source> <translation>Un modèle existe déjà avec le nom %1. Voulez-vous le remplacer ?</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="99"/> + <location line="+3"/> <source>Overwrite Template</source> <translation>Remplacer modèle</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="106"/> + <location line="+7"/> <source>Open Error</source> <translation>Erreur d'ouverture</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="107"/> + <location line="+1"/> <source>There was an error opening template %1 for writing. Reason: %2</source> <translation>Une erreur s'est produite à l'ouverture du modèle %1 en écriture. Raison : %2</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="120"/> + <location line="+13"/> <source>Write Error</source> <translation>Erreur d'écriture</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="121"/> + <location line="+1"/> <source>There was an error writing the template %1 to disk. Reason: %2</source> <translation>Une erreur s'est produite lors de l'écriture du modèle %1 sur le disque. Raison : %2</translation> </message> <message> - <location filename="../tools/designer/src/designer/saveformastemplate.cpp" line="148"/> + <location line="+27"/> <source>Pick a directory to save templates in</source> <translation>Sélectionner le dossier dans lequel le modèle sera enregistré</translation> </message> @@ -3801,7 +3810,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>ScriptErrorDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="59"/> + <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="+59"/> <source>An error occurred while running the scripts for "%1": </source> <translation>Une erreur est apparue lors de l'execution des scripts de "%1" : @@ -3811,22 +3820,22 @@ Voulez-vous le remplacer ?</translation> <context> <name>SelectSignalDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui" line="14"/> + <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui"/> <source>Go to slot</source> <translation>Aller au slot</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui" line="20"/> + <location/> <source>Select signal</source> <translation>Sélectionner signal</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui" line="33"/> + <location/> <source>signal</source> <translation>signal</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/selectsignaldialog.ui" line="38"/> + <location/> <source>class</source> <translation>classe</translation> </message> @@ -3834,7 +3843,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>SignalSlotConnection</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="152"/> + <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor.cpp" line="-358"/> <source>SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4)</source> <translation>ENVOYER(%1), SIGNAL(%2), RECEVEUR(%3), SLOT(%4)</translation> </message> @@ -3842,37 +3851,32 @@ Voulez-vous le remplacer ?</translation> <context> <name>SignalSlotDialogClass</name> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="13"/> + <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui"/> <source>Signals and slots</source> <translation>Signaux et slots</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="19"/> + <location/> <source>Slots</source> <translation>Slots</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="30"/> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="79"/> + <location/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="33"/> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="43"/> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="82"/> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="92"/> + <location/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="40"/> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="89"/> + <location/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.ui" line="68"/> + <location/> <source>Signals</source> <translation>Signaux</translation> </message> @@ -3880,12 +3884,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>Spacer</name> <message> - <location filename="../tools/designer/src/lib/shared/spacer_widget.cpp" line="275"/> + <location filename="../tools/designer/src/lib/shared/spacer_widget.cpp" line="+275"/> <source>Horizontal Spacer '%1', %2 x %3</source> <translation>Ressort horizontal '%1', %2 x %3</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/spacer_widget.cpp" line="275"/> + <location line="+0"/> <source>Vertical Spacer '%1', %2 x %3</source> <translation>Ressort vertical '%1', %2 x %3</translation> </message> @@ -3893,7 +3897,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>TemplateOptionsPage</name> <message> - <location filename="../tools/designer/src/components/formeditor/templateoptionspage.cpp" line="156"/> + <location filename="../tools/designer/src/components/formeditor/templateoptionspage.cpp" line="+156"/> <source>Template Paths</source> <extracomment>Tab in preferences dialog</extracomment> <translation>Chemins des modèles</translation> @@ -3902,32 +3906,52 @@ Voulez-vous le remplacer ?</translation> <context> <name>ToolBarManager</name> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="224"/> + <location filename="../tools/designer/src/designer/mainwindow.cpp" line="+89"/> <source>Configure Toolbars...</source> <translation>Configurer les barres d'outils...</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="239"/> + <location line="+15"/> <source>Window</source> <translation>Fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="240"/> + <location line="+1"/> <source>Help</source> <translation>Aide</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="247"/> + <location line="+7"/> <source>Style</source> <translation>Style</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="249"/> + <location line="+2"/> <source>Dock views</source> <translation>Ancrer les vues</translation> </message> <message> - <location filename="../tools/designer/src/designer/mainwindow.cpp" line="255"/> + <location line="+6"/> + <source>File</source> + <translation>Fichier</translation> + </message> + <message> + <location line="+4"/> + <source>Edit</source> + <translation>Édition</translation> + </message> + <message> + <location line="+4"/> + <source>Tools</source> + <translation>Outils</translation> + </message> + <message> + <location line="+4"/> + <source>Form</source> + <translation>Formulaire</translation> + </message> + <message> + <location line="+4"/> <source>Toolbars</source> <translation>Barres d'outils</translation> </message> @@ -3935,30 +3959,78 @@ Voulez-vous le remplacer ?</translation> <context> <name>VersionDialog</name> <message> - <location filename="../tools/designer/src/designer/versiondialog.cpp" line="171"/> + <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+170"/> <source><h3>%1</h3><br/><br/>Version %2</source> <translation><h3>%1</h3><br/><br/>Version %2</translation> </message> <message> - <location filename="../tools/designer/src/designer/versiondialog.cpp" line="172"/> + <location line="+1"/> <source>Qt Designer</source> <translation>Qt Designer</translation> </message> <message> - <location filename="../tools/designer/src/designer/versiondialog.cpp" line="173"/> + <location line="+1"/> <source><br/>Qt Designer is a graphical user interface designer for Qt applications.<br/></source> <translation><br/>Qt Designer est une interface de création d'interface graphique pour les applications Qt.<br/></translation> </message> <message> - <location filename="../tools/designer/src/designer/versiondialog.cpp" line="175"/> + <location line="+2"/> <source>%1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source> <translation>%1<br/>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</translation> </message> </context> <context> + <name>VideoPlayerTaskMenu</name> + <message> + <location filename="../tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp" line="+79"/> + <source>Available Mime Types</source> + <translation>Types MIME disponibles</translation> + </message> + <message> + <location line="+24"/> + <source>Display supported mime types...</source> + <translation>Afficher les types MIME supportés...</translation> + </message> + <message> + <location line="+1"/> + <source>Load...</source> + <translation>Ouvrir...</translation> + </message> + <message> + <location line="+1"/> + <source>Play</source> + <translation>Lecture</translation> + </message> + <message> + <location line="+1"/> + <source>Pause</source> + <translation>Pause</translation> + </message> + <message> + <location line="+1"/> + <source>Stop</source> + <translation>Arrêter</translation> + </message> + <message> + <location line="+32"/> + <source>Choose Video Player Media Source</source> + <translation>Choisir une source de média pour le lecteur video</translation> + </message> + <message> + <location line="+10"/> + <source>An error has occurred in '%1': %2</source> + <translation>Une erreur s'est produite dans '%1' : %2</translation> + </message> + <message> + <location line="+1"/> + <source>Video Player Error</source> + <translation>Erreur du lecteur video</translation> + </message> +</context> +<context> <name>WidgetDataBase</name> <message> - <location filename="../tools/designer/src/lib/shared/widgetdatabase.cpp" line="814"/> + <location filename="../tools/designer/src/lib/shared/widgetdatabase.cpp" line="+814"/> <source>The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged.</source> <translation>Le fichier contient un widget personnalisé '%1' dont la classe de base (%2) est différente de l'entrée dans la base de données de widget (%3). La base de données de widget n'a pas été modifiée.</translation> </message> @@ -3966,87 +4038,87 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ActionEditor</name> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="123"/> + <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="+123"/> <source>New...</source> <translation>Nouveau...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="124"/> + <location line="+1"/> <source>Edit...</source> <translation>Éditer...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="125"/> + <location line="+1"/> <source>Go to slot...</source> <translation>Aller au slot...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="126"/> + <location line="+1"/> <source>Copy</source> <translation>Copier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="127"/> + <location line="+1"/> <source>Cut</source> <translation>Couper</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="128"/> + <location line="+1"/> <source>Paste</source> <translation>Coller</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="129"/> + <location line="+1"/> <source>Select all</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="130"/> + <location line="+1"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="139"/> + <location line="+9"/> <source>Actions</source> <translation>Actions</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="188"/> + <location line="+49"/> <source>Configure Action Editor</source> <translation>Configurer l'éditeur d'action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="191"/> + <location line="+3"/> <source>Icon View</source> <translation>Vue en icônes</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="197"/> + <location line="+6"/> <source>Detailed View</source> <translation>Vue détaillée</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="443"/> + <location line="+246"/> <source>New action</source> <translation>Nouvelle action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="541"/> + <location line="+98"/> <source>Edit action</source> <translation>Editer action</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="610"/> + <location line="+69"/> <source>Remove action '%1'</source> <translation>Supprimer action '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="610"/> + <location line="+0"/> <source>Remove actions</source> <translation>Supprimer les actions</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actioneditor.cpp" line="796"/> + <location line="+186"/> <source>Used In</source> <translation>Utilisé dans</translation> </message> @@ -4054,32 +4126,32 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ActionModel</name> <message> - <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="95"/> + <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="+89"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="96"/> + <location line="+1"/> <source>Used</source> <translation>Utilisé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="97"/> + <location line="+1"/> <source>Text</source> <translation>Texte</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="98"/> + <location line="+1"/> <source>Shortcut</source> <translation>Raccourci</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="99"/> + <location line="+1"/> <source>Checkable</source> <translation>Vérifiable</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/actionrepository.cpp" line="100"/> + <location line="+1"/> <source>ToolTip</source> <translation>Info-bulle</translation> </message> @@ -4087,27 +4159,27 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::BrushManagerProxy</name> <message> - <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="219"/> + <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="+219"/> <source>The element '%1' is missing the required attribute '%2'.</source> <translation>L'attribut requis '%2' est manquant pour l'élément '%1'.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="230"/> + <location line="+11"/> <source>Empty brush name encountered.</source> <translation>Un nom vide de pinceau a été rencontré.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="240"/> + <location line="+10"/> <source>An unexpected element '%1' was encountered.</source> <translation>L'élément inattendu '%1' a été rencontré.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="247"/> + <location line="+7"/> <source>An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4</source> - <translation>Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3: %4</translation> + <translation>Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3 : %4</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/brushmanagerproxy.cpp" line="290"/> + <location line="+43"/> <source>An error occurred when reading the resource file '%1' at line %2, column %3: %4</source> <translation>Une erreur est survenue lors de la lecture du fichier de ressource '%1' à la ligne %2, colonne %3 : %4</translation> </message> @@ -4115,17 +4187,17 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::BuddyEditor</name> <message> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="261"/> + <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="+261"/> <source>Add buddy</source> <translation>Ajouter un copain</translation> </message> <message> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="313"/> + <location line="+52"/> <source>Remove buddies</source> <translation>Supprimer les copains</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="337"/> + <location line="+24"/> <source>Remove %n buddies</source> <translation> <numerusform>Supprimer %n copain</numerusform> @@ -4133,7 +4205,7 @@ Voulez-vous le remplacer ?</translation> </translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="388"/> + <location line="+51"/> <source>Add %n buddies</source> <translation> <numerusform>Ajouter %n copain</numerusform> @@ -4141,7 +4213,7 @@ Voulez-vous le remplacer ?</translation> </translation> </message> <message> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor.cpp" line="435"/> + <location line="+48"/> <source>Set automatically</source> <translation>Définir automatiquement</translation> </message> @@ -4149,7 +4221,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::BuddyEditorPlugin</name> <message> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp" line="73"/> + <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp" line="+73"/> <source>Edit Buddies</source> <translation>Éditer les copains</translation> </message> @@ -4157,7 +4229,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::BuddyEditorTool</name> <message> - <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp" line="56"/> + <location filename="../tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp" line="+56"/> <source>Edit Buddies</source> <translation>Éditer les copains</translation> </message> @@ -4165,12 +4237,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ButtonGroupMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="318"/> + <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+7"/> <source>Select members</source> <translation>Sélectionner les membres</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="319"/> + <location line="+1"/> <source>Break</source> <translation>Casser</translation> </message> @@ -4178,32 +4250,32 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ButtonTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="440"/> + <location line="+121"/> <source>Assign to button group</source> <translation>Assigner au groupe de boutons</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="442"/> + <location line="+2"/> <source>Button group</source> <translation>Groupe de boutons</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="443"/> + <location line="+1"/> <source>New button group</source> <translation>Nouveau groupe de boutons</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="444"/> + <location line="+1"/> <source>Change text...</source> <translation>Modifier le texte...</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="445"/> + <location line="+1"/> <source>None</source> <translation>Aucun</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="546"/> + <location line="+101"/> <source>Button group '%1'</source> <translation>Groupe de boutons '%1'</translation> </message> @@ -4211,57 +4283,57 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::CodeDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="95"/> + <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="+95"/> <source>Save...</source> <translation>Enregistrer...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="99"/> + <location line="+4"/> <source>Copy All</source> <translation>Tout copier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="104"/> + <location line="+5"/> <source>&Find in Text...</source> <translation>&Rechercher dans le texte...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="179"/> + <location line="+75"/> <source>A temporary form file could not be created in %1.</source> <translation>Un fichier temporaire de formulaire n'a pas pu être créé dans %1.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="185"/> + <location line="+6"/> <source>The temporary form file %1 could not be written.</source> <translation>Le fichier temporaire de formulaire %1 n'a pas pu être écrit.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="206"/> + <location line="+21"/> <source>%1 - [Code]</source> <translation>%1 - [Code]</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="229"/> + <location line="+23"/> <source>Save Code</source> <translation>Enregistrer le code</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="229"/> + <location line="+0"/> <source>Header Files (*.%1)</source> <translation>Fichiers headers (*.%1)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="235"/> + <location line="+6"/> <source>The file %1 could not be opened: %2</source> <translation>Le fichier %1 ne peut pas être ouvert : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="240"/> + <location line="+5"/> <source>The file %1 could not be written: %2</source> <translation>Le fichier %1 ne peut pas être écrit : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/codedialog.cpp" line="251"/> + <location line="+11"/> <source>%1 - Error</source> <translation>%1 - Erreur</translation> </message> @@ -4269,7 +4341,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ColorAction</name> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="246"/> + <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+246"/> <source>Text Color</source> <translation>Couleur du texte</translation> </message> @@ -4277,12 +4349,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ComboBoxTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/combobox_taskmenu.cpp" line="68"/> + <location filename="../tools/designer/src/components/taskmenu/combobox_taskmenu.cpp" line="+68"/> <source>Edit Items...</source> <translation>Éditer les éléments...</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/combobox_taskmenu.cpp" line="106"/> + <location line="+38"/> <source>Change Combobox Contents</source> <translation>Modifier le contenu du Combobox</translation> </message> @@ -4290,7 +4362,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::CommandLinkButtonTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="702"/> + <location filename="../tools/designer/src/components/taskmenu/button_taskmenu.cpp" line="+156"/> <source>Change description...</source> <translation>Modifier la description...</translation> </message> @@ -4298,17 +4370,17 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ConnectionEdit</name> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="1589"/> + <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="+1313"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="1592"/> + <location line="+3"/> <source>Deselect All</source> <translation>Désélectionner tout</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/connectionedit.cpp" line="1597"/> + <location line="+5"/> <source>Delete</source> <translation>Supprimer</translation> </message> @@ -4316,52 +4388,52 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ConnectionModel</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="196"/> + <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="-465"/> <source>Sender</source> <translation>Émetteur</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="197"/> + <location line="+1"/> <source>Signal</source> <translation>Signal</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="198"/> + <location line="+1"/> <source>Receiver</source> <translation>Receveur</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="199"/> + <location line="+1"/> <source>Slot</source> <translation>Slot</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="289"/> + <location line="+90"/> <source><sender></source> <translation><émetteur></translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="290"/> + <location line="+1"/> <source><signal></source> <translation><signal></translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="291"/> + <location line="+1"/> <source><receiver></source> <translation><receveur></translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="292"/> + <location line="+1"/> <source><slot></source> <translation><slot></translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="400"/> + <location line="+108"/> <source>The connection already exists!<br>%1</source> <translation>La connexion existe déjà !<br>%1</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp" line="402"/> + <location line="+2"/> <source>Signal and Slot Editor</source> <translation>Éditeur de signaux et slots</translation> </message> @@ -4369,42 +4441,42 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ContainerWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="79"/> + <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="+79"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="104"/> + <location line="+25"/> <source>Insert</source> <translation>Insérer</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="107"/> + <location line="+3"/> <source>Insert Page Before Current Page</source> <translation>Insérer la page avant la page courante</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="111"/> + <location line="+4"/> <source>Insert Page After Current Page</source> <translation>Insérer la page après la page courante</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="119"/> + <location line="+8"/> <source>Add Subwindow</source> <translation>Ajouter sous-fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="157"/> + <location line="+38"/> <source>Subwindow</source> <translation>Sous fenêtre</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="159"/> + <location line="+2"/> <source>Page</source> <translation>Page</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="160"/> + <location line="+1"/> <source>Page %1 of %2</source> <translation>Page %1 de %2</translation> </message> @@ -4412,18 +4484,18 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::DPI_Chooser</name> <message> - <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="100"/> + <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="+27"/> <source>System (%1 x %2)</source> <extracomment>System resolution</extracomment> <translation>Système (%1 x %2)</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="107"/> + <location line="+7"/> <source>User defined</source> <translation>Défini par l'utilisateur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/dpi_chooser.cpp" line="125"/> + <location line="+18"/> <source> x </source> <extracomment>DPI X/Y separator</extracomment> <translation> x </translation> @@ -4432,49 +4504,49 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::DesignerPropertyManager</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="647"/> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="653"/> + <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="+647"/> + <location line="+6"/> <source>AlignLeft</source> <translation>AlignementGauche</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="648"/> + <location line="-5"/> <source>AlignHCenter</source> <translation>AlignementCentreH</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="649"/> + <location line="+1"/> <source>AlignRight</source> <translation>AlignementDroite</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="650"/> + <location line="+1"/> <source>AlignJustify</source> <translation>AlignementJustifié</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="659"/> + <location line="+9"/> <source>AlignTop</source> <translation>AlignementSommet</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="660"/> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="664"/> + <location line="+1"/> + <location line="+4"/> <source>AlignVCenter</source> <translation>AlignementCentreV</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="661"/> + <location line="-3"/> <source>AlignBottom</source> <translation>AlignementDessous</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1226"/> + <location line="+565"/> <source>%1, %2</source> <translation>%1, %2</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1232"/> + <location line="+6"/> <source>Customized (%n roles)</source> <translation> <numerusform>Personnalisé (%n rôle)</numerusform> @@ -4482,76 +4554,76 @@ Voulez-vous le remplacer ?</translation> </translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1233"/> + <location line="+1"/> <source>Inherited</source> <translatorcomment>pour la palette</translatorcomment> <translation>Héritée</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1799"/> + <location line="+566"/> <source>Horizontal</source> <translation>Horizontal</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1808"/> + <location line="+9"/> <source>Vertical</source> <translation>Vertical</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1823"/> + <location line="+15"/> <source>Normal Off</source> <translation>Arrêt normal</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1824"/> + <location line="+1"/> <source>Normal On</source> <translation>Marche normal</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1825"/> + <location line="+1"/> <source>Disabled Off</source> <translation>Arrêt désactivé</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1826"/> + <location line="+1"/> <source>Disabled On</source> <translation>Marche désactivé</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1827"/> + <location line="+1"/> <source>Active Off</source> <translation>Arrêt activé</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1828"/> + <location line="+1"/> <source>Active On</source> <translation>Marche activé</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1829"/> + <location line="+1"/> <source>Selected Off</source> <translation>Arrêt sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1830"/> + <location line="+1"/> <source>Selected On</source> <translation>Marche sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1837"/> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1858"/> + <location line="+7"/> + <location line="+21"/> <source>translatable</source> <translation>Traduisible</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1843"/> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1864"/> + <location line="-15"/> + <location line="+21"/> <source>disambiguation</source> <translation>désambiguation</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1849"/> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="1870"/> + <location line="-15"/> + <location line="+21"/> <source>comment</source> <translation>commentaire</translation> </message> @@ -4559,48 +4631,48 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::DeviceProfileDialog</name> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="63"/> + <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="+63"/> <source>Device Profiles (*.%1)</source> <translation>Profils d'appareil (*.%1)</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="94"/> + <location line="+31"/> <source>Default</source> <translation>Par défaut</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="161"/> + <location line="+67"/> <source>Save Profile</source> <translation>Enregistrer le profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="171"/> + <location line="+10"/> <source>Save Profile - Error</source> <translation>Enregistrer le profile - Erreur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="171"/> + <location line="+0"/> <source>Unable to open the file '%1' for writing: %2</source> <translation>Impossible d'ouvrir le fichier '%1' en écriture : %2</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="179"/> + <location line="+8"/> <source>Open profile</source> <translation>Ouvrir profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="185"/> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="191"/> + <location line="+6"/> + <location line="+6"/> <source>Open Profile - Error</source> <translation>Ouvrir profil - Erreur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="185"/> + <location line="-6"/> <source>Unable to open the file '%1' for reading: %2</source> <translation>Impossible d'ouvrir le fichier '%1' en lecture : %2</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/deviceprofiledialog.cpp" line="191"/> + <location line="+6"/> <source>'%1' is not a valid profile: %2</source> <translation>'%1' n'est pas un profil valide : %2</translation> </message> @@ -4608,57 +4680,57 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::Dialog</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="53"/> + <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui"/> <source>Dialog</source> <translation>Boîte de dialogue</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="65"/> + <location/> <source>StringList</source> <translation>Liste de chaîne de caractères</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="93"/> + <location/> <source>New String</source> <translation>Nouvelle chaîne de caractères</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="96"/> + <location/> <source>&New</source> <translation>&Nouveau</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="106"/> + <location/> <source>Delete String</source> <translation>Supprimer la chaîne de caractères</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="109"/> + <location/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="142"/> + <location/> <source>&Value:</source> <translation>&Valeur : </translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="180"/> + <location/> <source>Move String Up</source> <translation>Déplacer la chaîne de caractères vers le haut</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="183"/> + <location/> <source>Up</source> <translation>Vers le haut</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="190"/> + <location/> <source>Move String Down</source> <translation>Déplacer la chaîne de caractères vers le bas</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditor.ui" line="193"/> + <location/> <source>Down</source> <translation>Vers le bas</translation> </message> @@ -4666,52 +4738,52 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::EmbeddedOptionsControl</name> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="160"/> + <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="-260"/> <source>None</source> <translation>Aucun</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="164"/> + <location line="+4"/> <source>Add a profile</source> <translation>Ajouter un profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="170"/> + <location line="+6"/> <source>Edit the selected profile</source> <translation>Éditer le profile sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="174"/> + <location line="+4"/> <source>Delete the selected profile</source> <translation>Supprimer le profil sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="196"/> + <location line="+22"/> <source>Add Profile</source> <translation>Ajouter profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="203"/> + <location line="+7"/> <source>New profile</source> <translation>Nouveau profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="238"/> + <location line="+35"/> <source>Edit Profile</source> <translation>Éditer profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="264"/> + <location line="+26"/> <source>Delete Profile</source> <translation>Supprimer profil</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="265"/> + <location line="+1"/> <source>Would you like to delete the profile '%1'?</source> <translation>Voulez-vous supprimer le profil '%1' ?</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/embeddedoptionspage.cpp" line="320"/> + <location line="+55"/> <source>Default</source> <translation>Par défaut</translation> </message> @@ -4719,20 +4791,29 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::FilterWidget</name> <message> - <location filename="../tools/designer/src/lib/shared/filterwidget.cpp" line="185"/> <source><Filter></source> - <translation><Filtre></translation> + <translation type="obsolete"><Filtre></translation> + </message> + <message> + <location filename="../tools/designer/src/lib/shared/filterwidget.cpp" line="+163"/> + <source>Filter</source> + <translation>Filtre</translation> + </message> + <message> + <location line="+36"/> + <source>Clear text</source> + <translation>Effacer le texte</translation> </message> </context> <context> <name>qdesigner_internal::FormEditor</name> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor.cpp" line="190"/> + <location filename="../tools/designer/src/components/formeditor/formeditor.cpp" line="+190"/> <source>Resource File Changed</source> <translation>Fichier de ressource modifié</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formeditor.cpp" line="191"/> + <location line="+1"/> <source>The file "%1" has changed outside Designer. Do you want to reload it?</source> <translation>Le fichier "%1" a été modifié en dehors de Designer. Voulez-vous le recharger ?</translation> </message> @@ -4740,7 +4821,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::FormLayoutMenu</name> <message> - <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="482"/> + <location filename="../tools/designer/src/lib/shared/formlayoutmenu.cpp" line="+24"/> <source>Add form layout row...</source> <translation>Ajouter une ligne au layout du formulaire...</translation> </message> @@ -4748,33 +4829,37 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::FormWindow</name> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="441"/> + <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="-1322"/> <source>Edit contents</source> <translation>Éditer le contenu</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="442"/> + <location line="+1"/> <source>F2</source> <translation>F2</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1216"/> + <location line="+775"/> <source>Insert widget '%1'</source> <translation>Insérer le widget '%1'</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1283"/> + <location line="+65"/> <source>Resize</source> <translation>Redimensionner</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1501"/> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1516"/> + <location line="+248"/> <source>Key Move</source> <translation>Déplacement au clavier</translation> </message> + <message> + <location line="+0"/> + <source>Key Resize</source> + <translation>Redimensionnement au clavier</translation> + </message> <message numerus="yes"> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1727"/> + <location line="+252"/> <source>Paste %n action(s)</source> <translation> <numerusform>Coller %n action</numerusform> @@ -4782,7 +4867,7 @@ Voulez-vous le remplacer ?</translation> </translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1729"/> + <location line="+2"/> <source>Paste %n widget(s)</source> <translation> <numerusform>Coller %n widget</numerusform> @@ -4790,53 +4875,53 @@ Voulez-vous le remplacer ?</translation> </translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1730"/> + <location line="+1"/> <source>Paste (%1 widgets, %2 actions)</source> <translation>Coller (%1 widgets, %2 actions)</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1786"/> + <location line="+56"/> <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source> <translation>Impossible de coller les widgets. Designer n'a pas trouvé de conteneur sans layout pour coller.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1788"/> + <location line="+2"/> <source>Break the layout of the container you want to paste into, select this container and then paste again.</source> <translation>Retirez le layout du conteneur dans lequel vous voulez coller, sélectionnez ce conteneur et collez à nouveau.</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1792"/> + <location line="+4"/> <source>Paste error</source> <translation>Erreur de collage</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1975"/> + <location line="+181"/> <source>Raise widgets</source> <translation>Élever widgets</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="1992"/> + <location line="+17"/> <source>Lower widgets</source> <translation>Descendre widgets</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="2196"/> + <location line="+204"/> <source>Select Ancestor</source> <translation>Sélectionner les ancêtres</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="2237"/> + <location line="+46"/> <source>Lay out</source> <translation>Mettre en page</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="2730"/> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="2785"/> + <location line="+485"/> + <location line="+55"/> <source>Drop widget</source> <translation>Supprimer widget</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindow.cpp" line="2772"/> + <location line="-13"/> <source>A QMainWindow-based form does not contain a central widget.</source> <translation>Un formulaire basé sur QMainWindow ne contenant pas de widget central.</translation> </message> @@ -4844,12 +4929,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::FormWindowBase</name> <message> - <location filename="../tools/designer/src/lib/shared/formwindowbase.cpp" line="393"/> + <location filename="../tools/designer/src/lib/shared/formwindowbase.cpp" line="+404"/> <source>Delete '%1'</source> <translation>Supprimer '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/formwindowbase.cpp" line="393"/> + <location line="+0"/> <source>Delete</source> <translation>Supprimer</translation> </message> @@ -4857,200 +4942,208 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::FormWindowManager</name> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="364"/> + <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+365"/> <source>Cu&t</source> <translation>Co&uper</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="367"/> + <location line="+3"/> <source>Cuts the selected widgets and puts them on the clipboard</source> <translation>Coupe les widgets sélectionnés et les place dans le presse-papiers</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="372"/> + <location line="+5"/> <source>&Copy</source> <translation>Cop&ier</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="375"/> + <location line="+3"/> <source>Copies the selected widgets to the clipboard</source> <translation>Copie les widgets sélectionnés dans le presse-papiers</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="380"/> + <location line="+5"/> <source>&Paste</source> <translation>C&oller</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="383"/> + <location line="+3"/> <source>Pastes the clipboard's contents</source> <translation>Colle le contenu du presse-papiers</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="388"/> + <location line="+5"/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="390"/> + <location line="+2"/> <source>Deletes the selected widgets</source> <translation>Supprime les widgets sélectionnés</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="395"/> + <location line="+5"/> <source>Select &All</source> <translation>Tout &sélectionner</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="398"/> + <location line="+3"/> <source>Selects all widgets</source> <translation>Sélectionne tous les widgets</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="403"/> + <location line="+5"/> <source>Bring to &Front</source> <translation>Amener au premier &plan</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="406"/> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="407"/> + <location line="+3"/> + <location line="+1"/> <source>Raises the selected widgets</source> <translation>Élève les widgets sélectionnés</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="411"/> + <location line="+4"/> <source>Send to &Back</source> <translation>Placer en &arrière plan</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="414"/> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="415"/> + <location line="+3"/> + <location line="+1"/> <source>Lowers the selected widgets</source> <translation>Descend les widgets sélectionnés</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="419"/> + <location line="+4"/> <source>Adjust &Size</source> <translation>Ajuster les &dimensions</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="422"/> + <location line="+3"/> <source>Adjusts the size of the selected widget</source> <translation>Ajuster les dimensions du widget sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="428"/> + <location line="+6"/> <source>Lay Out &Horizontally</source> <translation>Mettre en page &horizontalement</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="431"/> - <source>Lays out the selected widgets horizontaly</source> + <location line="+3"/> + <source>Lays out the selected widgets horizontally</source> <translation>Mettre en page horizontalement les widgets sélectionnés</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="437"/> + <location line="+39"/> + <source>Lays out the selected widgets horizontally in a splitter</source> + <translation>Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur</translation> + </message> + <message> + <source>Lays out the selected widgets horizontaly</source> + <translation type="obsolete">Mettre en page horizontalement les widgets sélectionnés</translation> + </message> + <message> + <location line="-33"/> <source>Lay Out &Vertically</source> <translation>Mettre en page &verticalement</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="440"/> + <location line="+3"/> <source>Lays out the selected widgets vertically</source> <translation>Mettre en page verticalement les widgets sélectionnés</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="447"/> + <location line="+7"/> <source>Lay Out in a &Form Layout</source> <translation>Mettre en page dans un layout de &formulaire</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="450"/> + <location line="+3"/> <source>Lays out the selected widgets in a form layout</source> <translation>Mettre en page les widgets sélectionnés dans un layout de formulaire</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="457"/> + <location line="+7"/> <source>Lay Out in a &Grid</source> <translation>Mettre en page dans une &grille</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="460"/> + <location line="+3"/> <source>Lays out the selected widgets in a grid</source> <translation>Mettre en page les widgets sélectionnés dans une grille</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="467"/> + <location line="+7"/> <source>Lay Out Horizontally in S&plitter</source> <translation>Mettre en page horizontalement avec un sé&parateur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="470"/> <source>Lays out the selected widgets horizontaly in a splitter</source> - <translation>Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur</translation> + <translation type="obsolete">Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="477"/> + <location line="+10"/> <source>Lay Out Vertically in Sp&litter</source> <translation>Mettre en page verticalement avec un sépa&rateur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="480"/> + <location line="+3"/> <source>Lays out the selected widgets vertically in a splitter</source> <translation>Met en page les widgets sélectionnés verticalement à l'aide d'un séparateur</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="487"/> + <location line="+7"/> <source>&Break Layout</source> <translation>&Casser la mise en page</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="490"/> + <location line="+3"/> <source>Breaks the selected layout</source> <translation>Retire le layout sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="495"/> + <location line="+5"/> <source>Si&mplify Grid Layout</source> <translation>Si&mplifier le layout de grille</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="497"/> + <location line="+2"/> <source>Removes empty columns and rows</source> <translation>Supprime les lignes et colonnes vides</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="503"/> + <location line="+6"/> <source>&Preview...</source> <translation>&Prévisualisation...</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="505"/> + <location line="+2"/> <source>Preview current form</source> <translation>Prévisualise le formulaire courant</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="520"/> + <location line="+15"/> <source>Form &Settings...</source> <translation>Paramètres du &formulaire...</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="612"/> + <location line="+94"/> <source>Break Layout</source> <translation>Casser la mise en page</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="638"/> + <location line="+26"/> <source>Adjust Size</source> <translation>Ajuster les dimensions</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="681"/> + <location line="+43"/> <source>Could not create form preview</source> <comment>Title of warning message box</comment> <translation>Impossible de créer la prévisualisation du formulaire</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="1022"/> + <location line="+341"/> <source>Form Settings - %1</source> <translation>Paramètres du formulaire - %1</translation> </message> @@ -5058,12 +5151,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::FormWindowSettings</name> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.cpp" line="193"/> + <location filename="../tools/designer/src/components/formeditor/formwindowsettings.cpp" line="+193"/> <source>None</source> <translation>Aucun</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/formwindowsettings.cpp" line="194"/> + <location line="+1"/> <source>Device Profile: %1</source> <translation>Profil de périphérique : %1</translation> </message> @@ -5071,38 +5164,37 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::GridPanel</name> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="13"/> + <location filename="../tools/designer/src/lib/shared/gridpanel.ui"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="31"/> + <location/> <source>Grid</source> <translation>Grille</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="43"/> + <location/> <source>Visible</source> <translation>Visible</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="50"/> + <location/> <source>Grid &X</source> <translation>Grille &X</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="76"/> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="133"/> + <location/> <source>Snap</source> <translation>Grille aimantée</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="85"/> + <location/> <source>Reset</source> <translation>Réinitialisé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/gridpanel.ui" line="107"/> + <location/> <source>Grid &Y</source> <translation>Grille &Y</translation> </message> @@ -5110,7 +5202,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::GroupBoxTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp" line="82"/> + <location filename="../tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp" line="+82"/> <source>Change title...</source> <translation>Modifier le titre...</translation> </message> @@ -5118,7 +5210,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::HtmlTextEdit</name> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="188"/> + <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="-58"/> <source>Insert HTML entity</source> <translation>Insérer une entité HTML</translation> </message> @@ -5126,92 +5218,92 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::IconSelector</name> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="328"/> + <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="-24"/> <source>The pixmap file '%1' cannot be read.</source> <translation>Le fichier pixmap '%1' ne peut pas être lu.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="334"/> + <location line="+6"/> <source>The file '%1' does not appear to be a valid pixmap file: %2</source> <translation>Le fichier '%1' n'est pas un fichier de pixmap valide : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="343"/> + <location line="+9"/> <source>The file '%1' could not be read: %2</source> <translation>Le fichier '%1' ne peut pas être lu : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="376"/> + <location line="+33"/> <source>Choose a Pixmap</source> <translation>Choisissez un pixmap</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="383"/> + <location line="+7"/> <source>Pixmap Read Error</source> <translation>Erreur de lecture de pixmap</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="437"/> + <location line="+54"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="443"/> + <location line="+6"/> <source>Normal Off</source> <translation>Arrêt normal</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="444"/> + <location line="+1"/> <source>Normal On</source> <translation>Marche normal</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="445"/> + <location line="+1"/> <source>Disabled Off</source> <translation>Arrêt désactivé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="446"/> + <location line="+1"/> <source>Disabled On</source> <translation>Marche désactivé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="447"/> + <location line="+1"/> <source>Active Off</source> <translation>Arrêt activé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="448"/> + <location line="+1"/> <source>Active On</source> <translation>Marche activé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="449"/> + <location line="+1"/> <source>Selected Off</source> <translation>Arrêt sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="450"/> + <location line="+1"/> <source>Selected On</source> <translation>Marche sélectionné</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="458"/> + <location line="+8"/> <source>Choose Resource...</source> <translation>Choisir ressource...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="459"/> + <location line="+1"/> <source>Choose File...</source> <translation>Choisir un fichier...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="460"/> + <location line="+1"/> <source>Reset</source> <translation>Réinitialiser</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="461"/> + <location line="+1"/> <source>Reset All</source> <translation>Réinitialisé tout</translation> </message> @@ -5219,58 +5311,58 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ItemListEditor</name> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="68"/> + <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui"/> <source>Items List</source> <translation>Liste d'éléments</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="77"/> + <location/> <source>New Item</source> <translation>Nouvel élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="80"/> + <location/> <source>&New</source> <translation>&Nouveau</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="87"/> + <location/> <source>Delete Item</source> <translation>Supprimer élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="90"/> + <location/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="110"/> + <location/> <source>Move Item Up</source> <translation>Déplacer l'élément vers le haut</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="113"/> + <location/> <source>U</source> <translation>Monter</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="120"/> + <location/> <source>Move Item Down</source> <translation>Déplacer l'élément vers le bas</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="123"/> + <location/> <source>D</source> <translation>Descendre</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.ui" line="143"/> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="426"/> + <location/> + <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="+360"/> <source>Properties &>></source> <translation>Propriétés &>></translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="424"/> + <location filename="../tools/designer/src/components/taskmenu/itemlisteditor.cpp" line="-2"/> <source>Properties &<<</source> <translation>Propriétés &<<</translation> </message> @@ -5278,12 +5370,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::LabelTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/label_taskmenu.cpp" line="85"/> + <location filename="../tools/designer/src/components/taskmenu/label_taskmenu.cpp" line="+85"/> <source>Change rich text...</source> <translation>Modifier texte riche...</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/label_taskmenu.cpp" line="86"/> + <location line="+1"/> <source>Change plain text...</source> <translation>Modifier texte simple...</translation> </message> @@ -5291,7 +5383,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::LanguageResourceDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="118"/> + <location filename="../tools/designer/src/lib/shared/iconselector.cpp" line="-343"/> <source>Choose Resource</source> <translation>Choisir ressource</translation> </message> @@ -5299,7 +5391,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::LineEditTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp" line="80"/> + <location filename="../tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp" line="+80"/> <source>Change text...</source> <translation>Modifier texte...</translation> </message> @@ -5307,17 +5399,17 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ListWidgetEditor</name> <message> - <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="69"/> + <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="+69"/> <source>New Item</source> <translation>Nouvel élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="101"/> + <location line="+32"/> <source>Edit List Widget</source> <translation>Éditer le widget de liste</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/listwidgeteditor.cpp" line="120"/> + <location line="+19"/> <source>Edit Combobox</source> <translation>Éditer le Combobox</translation> </message> @@ -5325,12 +5417,12 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::ListWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp" line="67"/> + <location filename="../tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp" line="+67"/> <source>Edit Items...</source> <translation>Éditer les éléments...</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp" line="105"/> + <location line="+38"/> <source>Change List Contents</source> <translation>Modifier le contenu de la liste</translation> </message> @@ -5338,22 +5430,22 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::MdiContainerWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="278"/> + <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="+118"/> <source>Next Subwindow</source> <translation>Sous-fenêtre suivante</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="279"/> + <location line="+1"/> <source>Previous Subwindow</source> <translation>Sous-fenêtre précédente</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="280"/> + <location line="+1"/> <source>Tile</source> <translation>Côte à côte</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="281"/> + <location line="+1"/> <source>Cascade</source> <translation>Cascade</translation> </message> @@ -5361,7 +5453,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::MenuTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/menutaskmenu.cpp" line="56"/> + <location filename="../tools/designer/src/components/taskmenu/menutaskmenu.cpp" line="+56"/> <source>Remove</source> <translation>Supprimer</translation> </message> @@ -5369,7 +5461,7 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::MorphMenu</name> <message> - <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="613"/> + <location filename="../tools/designer/src/lib/shared/morphmenu.cpp" line="+264"/> <source>Morph into</source> <translation>Transformer en</translation> </message> @@ -5377,43 +5469,42 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::NewActionDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="46"/> + <location filename="../tools/designer/src/lib/shared/newactiondialog.ui"/> <source>New Action...</source> <translation>Nouvelle action...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="54"/> + <location/> <source>&Text:</source> <translation>&Texte :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="74"/> + <location/> <source>Object &name:</source> <translation>&Nom de l'objet :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="87"/> + <location/> <source>&Icon:</source> <translation>&Icône :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="117"/> + <location/> <source>Shortcut:</source> <translation>Raccourci :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="131"/> + <location/> <source>Checkable:</source> <translation>Peut être cochée :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="138"/> + <location/> <source>ToolTip:</source> <translation>Info-bulle :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="157"/> - <location filename="../tools/designer/src/lib/shared/newactiondialog.ui" line="178"/> + <location/> <source>...</source> <translation>...</translation> </message> @@ -5421,39 +5512,39 @@ Voulez-vous le remplacer ?</translation> <context> <name>qdesigner_internal::NewDynamicPropertyDialog</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui" line="13"/> + <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui"/> <source>Create Dynamic Property</source> <translation>Créer une propriété dynamique</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui" line="37"/> + <location/> <source>Property Name</source> <translation>Nom de la propriété</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui" line="49"/> + <location/> <source>horizontalSpacer</source> <translation>Espaceur horizontal</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.ui" line="73"/> + <location/> <source>Property Type</source> <translation>Type de la propriété</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="134"/> + <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="+134"/> <source>Set Property Name</source> <translation>Définir le nom de la propriété</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="145"/> + <location line="+11"/> <source>The current object already has a property named '%1'. Please select another, unique one.</source> <translation>L'objet courant possède déjà une propriété nommée '%1'. Veuillez-sélectionner un autre nom.</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp" line="149"/> + <location line="+4"/> <source>The '_q_' prefix is reserved for the Qt library. Please select another name.</source> <translation>Le préfixe «_q_» est réservé pour la bibliothèque Qt. @@ -5463,83 +5554,83 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::NewFormWidget</name> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.ui" line="82"/> + <location filename="../tools/designer/src/lib/shared/newformwidget.ui"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.ui" line="101"/> + <location/> <source>Choose a template for a preview</source> <translation>Choisir un modèle pour la prévisualisation</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.ui" line="145"/> + <location/> <source>Embedded Design</source> <translation>Design pour appareil mobile</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.ui" line="157"/> + <location/> <source>Device:</source> <translation>Appareil :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.ui" line="164"/> + <location/> <source>Screen Size:</source> <translation>Dimensions de l'écran :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="104"/> + <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="+104"/> <source>Default size</source> <translation>Dimensions par défaut</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="105"/> + <location line="+1"/> <source>QVGA portrait (240x320)</source> <translation>QVGA portrait (240x320)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="106"/> + <location line="+1"/> <source>QVGA landscape (320x240)</source> <translation>QVGA paysage (320x240)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="107"/> + <location line="+1"/> <source>VGA portrait (480x640)</source> <translation>VGA portrait (480x640)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="108"/> + <location line="+1"/> <source>VGA landscape (640x480)</source> <translation>VGA paysage (640x480)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="174"/> + <location line="+66"/> <source>Widgets</source> <extracomment>New Form Dialog Categories</extracomment> <translation>Widgets</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="175"/> + <location line="+1"/> <source>Custom Widgets</source> <translation>Widgets personnalisé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="193"/> + <location line="+18"/> <source>None</source> <translation>Aucun</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="250"/> + <location line="+57"/> <source>Error loading form</source> <translation>Erreur de chargement du formulaire</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="494"/> + <location line="+244"/> <source>Unable to open the form template file '%1': %2</source> <translation>Impossible d'ouvrir le fichier de modèle de formulaire '%1' : %2</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/newformwidget.cpp" line="561"/> + <location line="+67"/> <source>Internal error: No template selected.</source> <translation>Erreur interne : aucun modèle sélectionné.</translation> </message> @@ -5547,37 +5638,37 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::NewPromotedClassPanel</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="92"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="+92"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="94"/> + <location line="+2"/> <source>New Promoted Class</source> <translation>Nouvelle classe promue</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="109"/> + <location line="+15"/> <source>Base class name:</source> <translation>Nom de la classe de base :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="110"/> + <location line="+1"/> <source>Promoted class name:</source> <translation>Nom de la classe promue :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="111"/> + <location line="+1"/> <source>Header file:</source> <translation>Fichier d'en-tête :</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="112"/> + <location line="+1"/> <source>Global include</source> <translation>En-tête global</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="123"/> + <location line="+11"/> <source>Reset</source> <translation>Réinitialiser</translation> </message> @@ -5585,7 +5676,12 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::ObjectInspector</name> <message> - <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="754"/> + <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="+316"/> + <source>Change Current Page</source> + <translation>Modifier la page courante</translation> + </message> + <message> + <location line="+438"/> <source>&Find in Text...</source> <translation>&Rechercher dans le texte...</translation> </message> @@ -5593,40 +5689,39 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::ObjectInspector::ObjectInspectorPrivate</name> <message> - <location filename="../tools/designer/src/components/objectinspector/objectinspector.cpp" line="316"/> <source>Change Current Page</source> - <translation>Modifier la page courante</translation> + <translation type="obsolete">Modifier la page courante</translation> </message> </context> <context> <name>qdesigner_internal::OrderDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/orderdialog.ui" line="53"/> + <location filename="../tools/designer/src/lib/shared/orderdialog.ui"/> <source>Change Page Order</source> <translation>Modifier l'ordre des pages</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/orderdialog.ui" line="59"/> + <location/> <source>Page Order</source> <translation>Ordre des pages</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/orderdialog.ui" line="116"/> + <location/> <source>Move page up</source> <translation>Déplacer la page vers le haut</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/orderdialog.ui" line="123"/> + <location/> <source>Move page down</source> <translation>Déplacer la page vers le bas</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="109"/> + <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="+109"/> <source>Index %1 (%2)</source> <translation>Indice %1 (%2)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/orderdialog.cpp" line="112"/> + <location line="+3"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -5634,47 +5729,47 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PaletteEditor</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="61"/> + <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui"/> <source>Edit Palette</source> <translation>Éditer la palette</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="85"/> + <location/> <source>Tune Palette</source> <translation>Ajuster la palette</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="122"/> + <location/> <source>Show Details</source> <translation>Afficher les détails</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="129"/> + <location/> <source>Compute Details</source> <translation>Calculer les détails</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="139"/> + <location/> <source>Quick</source> <translation>Rapide</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="157"/> + <location/> <source>Preview</source> <translation>Prévisualisation</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="169"/> + <location/> <source>Disabled</source> <translation>Désactivé</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="176"/> + <location/> <source>Inactive</source> <translation>Inactif</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.ui" line="183"/> + <location/> <source>Active</source> <translation>Actif</translation> </message> @@ -5682,7 +5777,7 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PaletteEditorButton</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp" line="57"/> + <location filename="../tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp" line="+57"/> <source>Change Palette</source> <translation>Modifier la palette</translation> </message> @@ -5690,22 +5785,22 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PaletteModel</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="374"/> + <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="+374"/> <source>Color Role</source> <translation>Rôle de la couleur</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="376"/> + <location line="+2"/> <source>Active</source> <translation>Actif</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="378"/> + <location line="+2"/> <source>Inactive</source> <translation>Inactif</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/paletteeditor.cpp" line="380"/> + <location line="+2"/> <source>Disabled</source> <translation>Désactivé</translation> </message> @@ -5713,28 +5808,28 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PixmapEditor</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="329"/> + <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-1541"/> <source>Choose Resource...</source> <translation>Choisir ressource...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="330"/> + <location line="+1"/> <source>Choose File...</source> <translation>Choisir fichier...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="331"/> + <location line="+1"/> <source>Copy Path</source> <translation>Chemin de copie</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="332"/> + <location line="+1"/> <source>Paste Path</source> <translation>Chemin de collage</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="338"/> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="354"/> + <location line="+6"/> + <location line="+16"/> <source>...</source> <translation>...</translation> </message> @@ -5742,7 +5837,7 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PlainTextEditorDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/plaintexteditor.cpp" line="65"/> + <location filename="../tools/designer/src/lib/shared/plaintexteditor.cpp" line="+65"/> <source>Edit text</source> <translation>Éditer le texte</translation> </message> @@ -5750,37 +5845,37 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PluginDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="72"/> + <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="+72"/> <source>Components</source> <translation>Composants</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="85"/> + <location line="+13"/> <source>Plugin Information</source> <translation>Information sur les plugins</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="89"/> + <location line="+4"/> <source>Refresh</source> <translation>Rafraîchir</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="90"/> + <location line="+1"/> <source>Scan for newly installed custom widget plugins.</source> <translation>Recherche des plugins personnalisés récemment installés.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="138"/> + <location line="+48"/> <source>Qt Designer couldn't find any plugins</source> <translation>Qt Designer n'a trouvé aucun plugin</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="141"/> + <location line="+3"/> <source>Qt Designer found the following plugins</source> <translation>Qt Designer a trouvé les plugins suivants</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/plugindialog.cpp" line="196"/> + <location line="+55"/> <source>New custom widget plugins have been found.</source> <translation>De nouveaux plugins de widgets ont été trouvés.</translation> </message> @@ -5788,7 +5883,7 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PreviewActionGroup</name> <message> - <location filename="../tools/designer/src/components/formeditor/previewactiongroup.cpp" line="95"/> + <location filename="../tools/designer/src/components/formeditor/previewactiongroup.cpp" line="+95"/> <source>%1 Style</source> <translation>Style %1</translation> </message> @@ -5796,50 +5891,47 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PreviewConfigurationWidget</name> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="139"/> + <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="+139"/> <source>Default</source> <translation>Par défaut</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="161"/> + <location line="+22"/> <source>None</source> <translation>Aucun</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="167"/> + <location line="+6"/> <source>Browse...</source> <translation>Parcourir...</translation> </message> -</context> -<context> - <name>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate</name> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="285"/> + <location line="+118"/> <source>Load Custom Device Skin</source> <translation>Charger le revêtement d'appareil personnalisé</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="287"/> + <location line="+2"/> <source>All QVFB Skins (*.%1)</source> <translation>Tous les revêtements QVFB (*.%1)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="303"/> + <location line="+16"/> <source>%1 - Duplicate Skin</source> <translation>%1 - Revêtement doublon</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="304"/> + <location line="+1"/> <source>The skin '%1' already exists.</source> <translation>Le revêtement '%1' existe déjà.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="318"/> + <location line="+14"/> <source>%1 - Error</source> - <translation>%1 - -Erreur</translation> + <translation>%1 - Erreur</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewconfigurationwidget.cpp" line="319"/> + <location line="+1"/> <source>%1 is not a valid skin directory: %2</source> <translation>%1 n'est pas un répertoire de revêtements valide : @@ -5847,26 +5939,55 @@ Veuillez sélectionner un autre nom.</translation> </message> </context> <context> + <name>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate</name> + <message> + <source>Load Custom Device Skin</source> + <translation type="obsolete">Charger le revêtement d'appareil personnalisé</translation> + </message> + <message> + <source>All QVFB Skins (*.%1)</source> + <translation type="obsolete">Tous les revêtements QVFB (*.%1)</translation> + </message> + <message> + <source>%1 - Duplicate Skin</source> + <translation type="obsolete">%1 - Revêtement doublon</translation> + </message> + <message> + <source>The skin '%1' already exists.</source> + <translation type="obsolete">Le revêtement '%1' existe déjà.</translation> + </message> + <message> + <source>%1 - Error</source> + <translation type="obsolete">%1 - -Erreur</translation> + </message> + <message> + <source>%1 is not a valid skin directory: +%2</source> + <translation type="obsolete">%1 n'est pas un répertoire de revêtements valide : +%2</translation> + </message> +</context> +<context> <name>qdesigner_internal::PreviewDeviceSkin</name> <message> - <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="259"/> + <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="+259"/> <source>&Portrait</source> <translation>&Portrait</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="261"/> + <location line="+2"/> <source>Landscape (&CCW)</source> <extracomment>Rotate form preview counter-clockwise</extracomment> <translation>Paysage (&dans le sens horaire)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="263"/> + <location line="+2"/> <source>&Landscape (CW)</source> <extracomment>Rotate form preview clockwise</extracomment> <translation>Paysage (&dans le sens anti-horaire)</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="264"/> + <location line="+1"/> <source>&Close</source> <translation>&Fermer</translation> </message> @@ -5874,7 +5995,7 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PreviewManager</name> <message> - <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="690"/> + <location line="+426"/> <source>%1 - [Preview]</source> <translation>%1 - [prévisualisation]</translation> </message> @@ -5882,7 +6003,7 @@ Veuillez sélectionner un autre nom.</translation> <context> <name>qdesigner_internal::PreviewMdiArea</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewframe.cpp" line="72"/> + <location filename="../tools/designer/src/components/propertyeditor/previewframe.cpp" line="+72"/> <source>The moose in the noose ate the goose who was loose.</source> <extracomment>Palette editor background</extracomment> @@ -5893,57 +6014,57 @@ je préfère les mines de Pompéi.</translation> <context> <name>qdesigner_internal::PreviewWidget</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="61"/> + <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui"/> <source>Preview Window</source> <translation>Fenêtre de prévisualisation</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="81"/> + <location/> <source>LineEdit</source> <translation>LineEdit</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="89"/> + <location/> <source>ComboBox</source> <translation>ComboBox</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="108"/> + <location/> <source>PushButton</source> <translation>PushButton</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="166"/> + <location/> <source>ButtonGroup2</source> <translation>ButtonGroup2</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="178"/> + <location/> <source>CheckBox1</source> <translation>CheckBox1</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="188"/> + <location/> <source>CheckBox2</source> <translation>CheckBox2</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="198"/> + <location/> <source>ButtonGroup</source> <translation>ButtonGroup</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="210"/> + <location/> <source>RadioButton1</source> <translation>RadioButton1</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="220"/> + <location/> <source>RadioButton2</source> <translation>RadioButton2</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/previewwidget.ui" line="227"/> + <location/> <source>RadioButton3</source> <translation>BoutonRadio1</translation> </message> @@ -5951,22 +6072,22 @@ je préfère les mines de Pompéi.</translation> <context> <name>qdesigner_internal::PromotionModel</name> <message> - <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="129"/> + <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="+17"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="130"/> + <location line="+1"/> <source>Header file</source> <translation>Fichier d'en-tête</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="131"/> + <location line="+1"/> <source>Global include</source> <translation>En-tête global</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotionmodel.cpp" line="132"/> + <location line="+1"/> <source>Usage</source> <translation>Usage</translation> </message> @@ -5974,27 +6095,27 @@ je préfère les mines de Pompéi.</translation> <context> <name>qdesigner_internal::PromotionTaskMenu</name> <message> - <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="85"/> + <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="+85"/> <source>Promoted widgets...</source> <translation>Widgets promus...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="86"/> + <location line="+1"/> <source>Promote to ...</source> <translation>Promouvoir en...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="87"/> + <location line="+1"/> <source>Change signals/slots...</source> <translation>Modifier signaux/slots...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="88"/> + <location line="+1"/> <source>Promote to</source> <translation>Promouvoir en</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/promotiontaskmenu.cpp" line="89"/> + <location line="+1"/> <source>Demote to %1</source> <translation>Rétrograder en %1</translation> </message> @@ -6002,57 +6123,57 @@ je préfère les mines de Pompéi.</translation> <context> <name>qdesigner_internal::PropertyEditor</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="183"/> + <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="+231"/> <source>Add Dynamic Property...</source> <translation>Ajouter une propriété dynamique...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="184"/> + <location line="+1"/> <source>Remove Dynamic Property</source> <translation>Supprimer la propriété dynamique</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="185"/> + <location line="+1"/> <source>Sorting</source> <translation>Tri</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="186"/> + <location line="+1"/> <source>Color Groups</source> <translation>Groupes de couleur</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="187"/> + <location line="+1"/> <source>Tree View</source> <translation>Vue arborescente</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="188"/> + <location line="+1"/> <source>Drop Down Button View</source> - <translation type="unfinished">Liste déroulante</translation> + <translation>Liste déroulante</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="238"/> + <location line="+45"/> <source>String...</source> <translation>Chaîne de caractères...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="241"/> + <location line="+3"/> <source>Bool...</source> <translation>Booléen...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="245"/> + <location line="+4"/> <source>Other...</source> <translation>Autre...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="252"/> + <location line="+7"/> <source>Configure Property Editor</source> <translation>Configurer l'éditeur de propriétés</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/propertyeditor.cpp" line="785"/> + <location line="+539"/> <source>Object: %1 Class: %2</source> <translation>Objet : %1 @@ -6062,7 +6183,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::PropertyLineEdit</name> <message> - <location filename="../tools/designer/src/lib/shared/propertylineedit.cpp" line="88"/> + <location filename="../tools/designer/src/lib/shared/propertylineedit.cpp" line="+88"/> <source>Insert line break</source> <translation>Insérer saut de ligne</translation> </message> @@ -6070,27 +6191,27 @@ Classe : %2</translation> <context> <name>qdesigner_internal::QDesignerPromotionDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="208"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="+85"/> <source>Promoted Widgets</source> <translation>Widgets promus</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="215"/> + <location line="+7"/> <source>Promoted Classes</source> <translation>Classes promues</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="275"/> + <location line="+60"/> <source>Promote</source> <translation>Promouvoir</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="427"/> + <location line="+152"/> <source>Change signals/slots...</source> <translation>Modifier signaux/slots...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp" line="444"/> + <location line="+17"/> <source>%1 - Error</source> <translation>%1 - Erreur</translation> </message> @@ -6098,22 +6219,22 @@ Classe : %2</translation> <context> <name>qdesigner_internal::QDesignerResource</name> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2354"/> + <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="+277"/> <source>Loading qrc file</source> <translation>Chargement du fichier qrc</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2355"/> + <location line="+1"/> <source>The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p></source> - <translation>Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier?</p></translation> + <translation>Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier ?</p></translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2361"/> + <location line="+6"/> <source>New location for %1</source> <translation>Nouvel emplacement pour %1</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/qdesigner_resource.cpp" line="2362"/> + <location line="+1"/> <source>Resource files (*.qrc)</source> <translation>Fichier de ressource (*.qrc)</translation> </message> @@ -6121,112 +6242,112 @@ Classe : %2</translation> <context> <name>qdesigner_internal::QDesignerTaskMenu</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="230"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="+68"/> <source>Change objectName...</source> <translation>Modifier objectName...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="231"/> + <location line="+1"/> <source>Change toolTip...</source> <translation>Modifier toolTip...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="232"/> + <location line="+1"/> <source>Change whatsThis...</source> <translation>Modifier whatsThis...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="233"/> + <location line="+1"/> <source>Change styleSheet...</source> <translation>Modifier la feuille de style...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="236"/> + <location line="+3"/> <source>Create Menu Bar</source> <translation>Créer une barre de menus</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="237"/> + <location line="+1"/> <source>Add Tool Bar</source> <translation>Ajouter une barre d'outils</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="238"/> + <location line="+1"/> <source>Create Status Bar</source> <translation>Créer une barre de status</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="239"/> + <location line="+1"/> <source>Remove Status Bar</source> <translation>Supprimer la barre de status</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="240"/> + <location line="+1"/> <source>Change script...</source> <translation>Modifier le script...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="241"/> + <location line="+1"/> <source>Change signals/slots...</source> <translation>Modifier signaux/slots...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="242"/> + <location line="+1"/> <source>Go to slot...</source> <translation>Aller au slot...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="245"/> + <location line="+3"/> <source>Size Constraints</source> <translation>Contrainte de taille</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="249"/> + <location line="+4"/> <source>Set Minimum Width</source> <translation>Définir la largeur minimum</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="253"/> + <location line="+4"/> <source>Set Minimum Height</source> <translation>Définir la hauteur minimum</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="257"/> + <location line="+4"/> <source>Set Minimum Size</source> <translation>Définir la taille minimum</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="263"/> + <location line="+6"/> <source>Set Maximum Width</source> <translation>Définir la largeur maximum</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="267"/> + <location line="+4"/> <source>Set Maximum Height</source> <translation>Définir la hauteur maximum</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="271"/> + <location line="+4"/> <source>Set Maximum Size</source> <translation>Définir la taille maximum</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="506"/> + <location line="+235"/> <source>Edit ToolTip</source> <translation>Éditer l'info-bulle</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="511"/> + <location line="+5"/> <source>Edit WhatsThis</source> <translation>Éditer «Qu'est-ce»</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="655"/> + <location line="+144"/> <source>no signals available</source> <translation>Aucun signal disponible</translation> </message> <message numerus="yes"> - <location filename="../tools/designer/src/lib/shared/qdesigner_taskmenu.cpp" line="722"/> + <location line="+67"/> <source>Set size constraint on %n widget(s)</source> <translation> <numerusform>Définir les contraintes de dimensions sur %n widget</numerusform> @@ -6237,40 +6358,40 @@ Classe : %2</translation> <context> <name>qdesigner_internal::QDesignerWidgetBox</name> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="349"/> + <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="+349"/> <source>An error has been encountered at line %1 of %2: %3</source> <translation>Une erreur a été rencontrée à la ligne %1 de %2 : %3</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="488"/> + <location line="+139"/> <source>Unexpected element <%1> encountered when parsing for <widget> or <ui></source> <translation>L'élément inattendu <%1> a été rencontré lors de l'analyse des élements <widget> et <ui></translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="507"/> + <location line="+19"/> <source>Unexpected end of file encountered when parsing widgets.</source> <translation>Fin de fichier inattendue lors de l'analyse grammaticale des widgets.</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="516"/> + <location line="+9"/> <source>A widget element could not be found.</source> <translation>Un élement de widget n'a pas pu être trouvé.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_widgetbox.cpp" line="123"/> - <location filename="../tools/designer/src/lib/shared/qdesigner_widgetbox.cpp" line="136"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_widgetbox.cpp" line="+123"/> + <location line="+13"/> <source>Unexpected element <%1></source> <translation>Élément <%1> inattendu</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_widgetbox.cpp" line="143"/> + <location line="+7"/> <source>A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5</source> <translation>Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 du code XML spécifiant le widget %3 : %4 %5</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_widgetbox.cpp" line="152"/> + <location line="+9"/> <source>The XML code specified for the widget %1 does not contain any widget elements. %2</source> <translation>Le code XML spécifié pour le widget %1 ne contient aucun élément widget. @@ -6280,73 +6401,73 @@ Classe : %2</translation> <context> <name>qdesigner_internal::QtGradientStopsController</name> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="173"/> + <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="+173"/> <source>H</source> <translation>T</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="174"/> + <location line="+1"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="175"/> + <location line="+1"/> <source>V</source> <translation>V</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="181"/> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="185"/> + <location line="+6"/> + <location line="+4"/> <source>Hue</source> <translation>Teinte</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="182"/> + <location line="-3"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="183"/> + <location line="+1"/> <source>Val</source> <translation>Val</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="186"/> + <location line="+3"/> <source>Saturation</source> <translation>Saturation</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="187"/> + <location line="+1"/> <source>Value</source> <translation>Valeur</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="209"/> + <location line="+22"/> <source>R</source> <translation>R</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="210"/> + <location line="+1"/> <source>G</source> <translation>V</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="211"/> + <location line="+1"/> <source>B</source> <translation>B</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="217"/> + <location line="+6"/> <source>Red</source> <translation>Rouge</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="218"/> + <location line="+1"/> <source>Green</source> <translation>Vert</translation> </message> <message> - <location filename="../tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp" line="219"/> + <location line="+1"/> <source>Blue</source> <translation>Bleu</translation> </message> @@ -6354,27 +6475,27 @@ Classe : %2</translation> <context> <name>qdesigner_internal::RichTextEditorDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="624"/> + <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="+436"/> <source>Edit text</source> <translation>Éditer le texte</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="647"/> + <location line="+23"/> <source>Rich Text</source> <translation>Texte riche</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="648"/> + <location line="+1"/> <source>Source</source> <translation>Source</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="654"/> + <location line="+6"/> <source>&OK</source> <translation>&OK</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="656"/> + <location line="+2"/> <source>&Cancel</source> <translation>&Annuler</translation> </message> @@ -6382,72 +6503,72 @@ Classe : %2</translation> <context> <name>qdesigner_internal::RichTextEditorToolBar</name> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="354"/> + <location line="-302"/> <source>Bold</source> <translation>Gras</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="355"/> + <location line="+1"/> <source>CTRL+B</source> <translation>CTRL+B</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="360"/> + <location line="+5"/> <source>Italic</source> <translation>Italique</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="361"/> + <location line="+1"/> <source>CTRL+I</source> <translation>CTRL+I</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="366"/> + <location line="+5"/> <source>Underline</source> <translation>Souligné</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="367"/> + <location line="+1"/> <source>CTRL+U</source> <translation>CTRL+U</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="380"/> + <location line="+13"/> <source>Left Align</source> <translation>Aligner à gauche</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="385"/> + <location line="+5"/> <source>Center</source> <translation>Centrer</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="390"/> + <location line="+5"/> <source>Right Align</source> <translation>Aligner à droite</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="395"/> + <location line="+5"/> <source>Justify</source> <translation>Justifier</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="404"/> + <location line="+9"/> <source>Superscript</source> <translation>Exposant</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="410"/> + <location line="+6"/> <source>Subscript</source> <translation>Indice</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="419"/> + <location line="+9"/> <source>Insert &Link</source> <translation>Insérer &lien</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/richtexteditor.cpp" line="424"/> + <location line="+5"/> <source>Insert &Image</source> <translation>Insérer &image</translation> </message> @@ -6455,17 +6576,17 @@ Classe : %2</translation> <context> <name>qdesigner_internal::ScriptDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="66"/> + <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="+66"/> <source>Edit script</source> <translation>Éditer le script</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="71"/> + <location line="+5"/> <source><html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively.</source> <translation><html>Entrez un snippet de code Qt Script à exécuter lors du chargement du formulaire.<br>Le widget et ses enfants sont accessibles via les variables <i>widget</i> et <i>childWidgets</i>, respectivement.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/scriptdialog.cpp" line="122"/> + <location line="+51"/> <source>Syntax error</source> <translation>Erreur de syntaxe</translation> </message> @@ -6473,7 +6594,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::ScriptErrorDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="86"/> + <location filename="../tools/designer/src/lib/shared/scripterrordialog.cpp" line="+27"/> <source>Script errors</source> <translation>Erreurs de script</translation> </message> @@ -6481,23 +6602,23 @@ Classe : %2</translation> <context> <name>qdesigner_internal::SignalSlotDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="401"/> + <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="+199"/> <source>There is already a slot with the signature '%1'.</source> <translation>Un slot existe déjà avec la signature '%1'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="406"/> + <location line="+5"/> <source>There is already a signal with the signature '%1'.</source> <translation>Un signal existe déjà avec la signature '%1'.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="413"/> + <location line="+7"/> <source>%1 - Duplicate Signature</source> <translation>%1 - Signature double</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="434"/> - <location filename="../tools/designer/src/lib/shared/signalslotdialog.cpp" line="510"/> + <location line="+21"/> + <location line="+76"/> <source>Signals/Slots of %1</source> <translation>Signaux/slots de %1</translation> </message> @@ -6505,12 +6626,12 @@ Classe : %2</translation> <context> <name>qdesigner_internal::SignalSlotEditorPlugin</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp" line="72"/> + <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp" line="+72"/> <source>Edit Signals/Slots</source> <translation>Éditer signaux/slots</translation> </message> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp" line="74"/> + <location line="+2"/> <source>F4</source> <translation>F4</translation> </message> @@ -6518,7 +6639,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::SignalSlotEditorTool</name> <message> - <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp" line="58"/> + <location filename="../tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp" line="+58"/> <source>Edit Signals/Slots</source> <translation>Éditer signaux/slots</translation> </message> @@ -6526,7 +6647,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::StatusBarTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp" line="81"/> + <location filename="../tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp" line="+81"/> <source>Remove</source> <translation>Supprimer</translation> </message> @@ -6534,7 +6655,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::StringListEditorButton</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp" line="56"/> + <location filename="../tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp" line="+56"/> <source>Change String List</source> <translation>Modifier la liste de chaîne de caractères</translation> </message> @@ -6542,38 +6663,38 @@ Classe : %2</translation> <context> <name>qdesigner_internal::StyleSheetEditorDialog</name> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="90"/> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="370"/> + <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="+90"/> + <location line="+280"/> <source>Valid Style Sheet</source> <translation>Feuille de style valide</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="92"/> + <location line="-278"/> <source>Add Resource...</source> <translation>Ajouter ressource...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="93"/> + <location line="+1"/> <source>Add Gradient...</source> <translation>Ajouter gradient...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="94"/> + <location line="+1"/> <source>Add Color...</source> <translation>Ajouter couleur...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="95"/> + <location line="+1"/> <source>Add Font...</source> <translation>Ajouter police...</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="97"/> + <location line="+2"/> <source>Edit Style Sheet</source> <translation>Éditer feuille de style</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/stylesheeteditor.cpp" line="373"/> + <location line="+276"/> <source>Invalid Style Sheet</source> <translation>Feuille de style invalide</translation> </message> @@ -6581,27 +6702,27 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TabOrderEditor</name> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="363"/> + <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="+363"/> <source>Start from Here</source> <translation>Démarrer à partir d'ici</translation> </message> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="366"/> + <location line="+3"/> <source>Restart</source> <translation>Redémarrer</translation> </message> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="368"/> + <location line="+2"/> <source>Tab Order List...</source> <translation>Ordre de la liste de tabulation...</translation> </message> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="412"/> + <location line="+44"/> <source>Tab Order List</source> <translation>Ordre de la liste de tabulation</translation> </message> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor.cpp" line="413"/> + <location line="+1"/> <source>Tab Order</source> <translation>Ordre des tabulations</translation> </message> @@ -6609,7 +6730,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TabOrderEditorPlugin</name> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp" line="73"/> + <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp" line="+73"/> <source>Edit Tab Order</source> <translation>Éditer l'ordre des tabulations</translation> </message> @@ -6617,7 +6738,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TabOrderEditorTool</name> <message> - <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp" line="57"/> + <location filename="../tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp" line="+57"/> <source>Edit Tab Order</source> <translation>Éditer l'ordre des tabulations</translation> </message> @@ -6625,48 +6746,48 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TableWidgetEditor</name> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui" line="53"/> + <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui"/> <source>Edit Table Widget</source> <translation>Éditer le widget de table</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui" line="63"/> + <location/> <source>&Items</source> <translation>&Éléments</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui" line="75"/> + <location/> <source>Table Items</source> <translation>Éléments de la table</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.ui" line="97"/> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="218"/> + <location/> + <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="+218"/> <source>Properties &>></source> <translation>Propriétés &>></translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="67"/> + <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="-151"/> <source>New Column</source> <translation>Nouvelle colonne</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="70"/> + <location line="+3"/> <source>New Row</source> <translation>Nouvelle ligne</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="78"/> + <location line="+8"/> <source>&Columns</source> <translation>&Colonne</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="79"/> + <location line="+1"/> <source>&Rows</source> <translation>&Lignes</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidgeteditor.cpp" line="216"/> + <location line="+137"/> <source>Properties &<<</source> <translation>Propriétés &<<</translation> </message> @@ -6674,7 +6795,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TableWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp" line="64"/> + <location filename="../tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp" line="+64"/> <source>Edit Items...</source> <translation>Éditer les éléments...</translation> </message> @@ -6682,23 +6803,22 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TemplateOptionsWidget</name> <message> - <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui" line="13"/> + <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui" line="19"/> + <location/> <source>Additional Template Paths</source> <translation>Chemins de modèles additionnels</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui" line="28"/> - <location filename="../tools/designer/src/components/formeditor/templateoptionspage.ui" line="35"/> + <location/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/designer/src/components/formeditor/templateoptionspage.cpp" line="138"/> + <location filename="../tools/designer/src/components/formeditor/templateoptionspage.cpp" line="-18"/> <source>Pick a directory to save templates in</source> <translation>Choisir un répertoire où enregistrer les modèles</translation> </message> @@ -6706,22 +6826,22 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TextEditTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="58"/> + <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="+58"/> <source>Edit HTML</source> <translation>Éditer le HTML</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="59"/> + <location line="+1"/> <source>Change HTML...</source> <translation>Modifier le HTML...</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="68"/> + <location line="+9"/> <source>Edit Text</source> <translation>Éditer le texte</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/textedit_taskmenu.cpp" line="69"/> + <location line="+1"/> <source>Change Plain Text...</source> <translation>Modifier le texte simple...</translation> </message> @@ -6729,22 +6849,22 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TextEditor</name> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="150"/> + <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="-204"/> <source>Choose Resource...</source> <translation>Choisir ressource...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="151"/> + <location line="+1"/> <source>Choose File...</source> <translation>Choisir fichier...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="156"/> + <location line="+5"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../tools/designer/src/components/propertyeditor/designerpropertymanager.cpp" line="274"/> + <location line="+118"/> <source>Choose a File</source> <translation>Choisir un fichier</translation> </message> @@ -6752,27 +6872,27 @@ Classe : %2</translation> <context> <name>qdesigner_internal::ToolBarEventFilter</name> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="148"/> + <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="+148"/> <source>Insert Separator before '%1'</source> <translation>Insérer un séparateur avant '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="157"/> + <location line="+9"/> <source>Append Separator</source> <translation>Ajouter un séparateur à la fin</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="169"/> + <location line="+12"/> <source>Remove action '%1'</source> <translation>Supprimer l'action '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="176"/> + <location line="+7"/> <source>Remove Toolbar '%1'</source> <translation>Supprimer la barre d'outils '%1'</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/qdesigner_toolbar.cpp" line="234"/> + <location line="+58"/> <source>Insert Separator</source> <translation>Insérer un séparateur</translation> </message> @@ -6780,125 +6900,125 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TreeWidgetEditor</name> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="53"/> + <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui"/> <source>Edit Tree Widget</source> <translation>Éditer un widget d'arborescence</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="63"/> + <location/> <source>&Items</source> <translation>&Éléments</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="87"/> + <location/> <source>Tree Items</source> <translation>Élément de l'arbre</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="91"/> + <location/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="101"/> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="199"/> + <location/> + <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+199"/> <source>New Item</source> <translation>Nouvel élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="104"/> + <location/> <source>&New</source> <translation>&Nouveau</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="111"/> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="218"/> + <location/> + <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+19"/> <source>New Subitem</source> <translation>Nouveau sous-élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="114"/> + <location/> <source>New &Subitem</source> <translation>Nouveau &sous-élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="121"/> + <location/> <source>Delete Item</source> <translation>Supprimer l'élément</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="124"/> + <location/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="144"/> + <location/> <source>Move Item Left (before Parent Item)</source> <translation>Déplacer l'élément à gauche (avant l'élément parent)</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="147"/> + <location/> <source>L</source> <translation>G</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="154"/> + <location/> <source>Move Item Right (as a First Subitem of the Next Sibling Item)</source> <translation>Déplacer l'élément sur la droite (comme un premier sous-élément de l'élément à droite)</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="157"/> + <location/> <source>R</source> <translation>D</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="164"/> + <location/> <source>Move Item Up</source> <translation>Déplacer l'élément vers le haut</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="167"/> + <location/> <source>U</source> <translation>H</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="174"/> + <location/> <source>Move Item Down</source> <translation>Déplacer l'élément vers le bas</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="177"/> + <location/> <source>D</source> <translation>B</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.ui" line="197"/> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="395"/> + <location/> + <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="+177"/> <source>Properties &>></source> <translation>Propriétés &>></translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="68"/> + <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="-327"/> <source>New Column</source> <translation>Nouvelle colonne</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="76"/> + <location line="+8"/> <source>&Columns</source> <translation>&Colonnes</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="145"/> + <location line="+69"/> <source>Per column properties</source> <translation>Propriétés par colonnes</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="146"/> + <location line="+1"/> <source>Common properties</source> <translation>Propritétés de colonnes</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidgeteditor.cpp" line="393"/> + <location line="+247"/> <source>Properties &<<</source> <translation>Propriétés &<<</translation> </message> @@ -6906,7 +7026,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::TreeWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp" line="63"/> + <location filename="../tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp" line="+63"/> <source>Edit Items...</source> <translation>Éditer les éléments...</translation> </message> @@ -6914,7 +7034,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::WidgetBox</name> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp" line="115"/> + <location filename="../tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp" line="+115"/> <source>Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML.</source> <translation>Avertissement : La création du widget a échoué dans la boîte de widget. Ceci peut être causé par un code XML invalide d'un widget personnalisé.</translation> </message> @@ -6922,42 +7042,42 @@ Classe : %2</translation> <context> <name>qdesigner_internal::WidgetBoxTreeWidget</name> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="248"/> + <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="-268"/> <source>Scratchpad</source> <translation>bloc-notes</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="618"/> + <location line="+370"/> <source>Custom Widgets</source> <translation>Widgets personnalisés</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="881"/> + <location line="+263"/> <source>Expand all</source> <translation>Tout étendre</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="882"/> + <location line="+1"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="885"/> + <location line="+3"/> <source>List View</source> <translation>Vue de liste</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="886"/> + <location line="+1"/> <source>Icon View</source> <translation>Vue en icônes</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="901"/> + <location line="+15"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp" line="903"/> + <location line="+2"/> <source>Edit name</source> <translation>Éditer le nom</translation> </message> @@ -6965,7 +7085,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::WidgetDataBase</name> <message> - <location filename="../tools/designer/src/lib/shared/widgetdatabase.cpp" line="403"/> + <location filename="../tools/designer/src/lib/shared/widgetdatabase.cpp" line="-411"/> <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source> <translation>Un plugin de widgets personnalisés dont un nom de classe (%1) correspond à une classe existante à été trouvé.</translation> </message> @@ -6973,7 +7093,7 @@ Classe : %2</translation> <context> <name>qdesigner_internal::WidgetEditorTool</name> <message> - <location filename="../tools/designer/src/components/formeditor/tool_widgeteditor.cpp" line="67"/> + <location filename="../tools/designer/src/components/formeditor/tool_widgeteditor.cpp" line="+67"/> <source>Edit Widgets</source> <translation>Éditer les widgets</translation> </message> @@ -6981,34 +7101,34 @@ Classe : %2</translation> <context> <name>qdesigner_internal::WidgetFactory</name> <message> - <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="263"/> + <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="+263"/> <source>The custom widget factory registered for widgets of class %1 returned 0.</source> <translation>La fabrique (factory) de widget personnalisé, enregistrée pour les widgets de classe %1, a retourné 0.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="307"/> + <location line="+44"/> <source>A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2.</source> <translation>Une discordance de nom de classe est apparue lors de la création d'un nouveau widget à l'aide de la fabrique de widget personnalisé enregistrée pour la classe %1. La fabrique a retourné un widget de classe %2.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="406"/> + <location line="+99"/> <source>%1 Widget</source> <translation>%1 Widget</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="496"/> + <location line="+90"/> <source>The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget.</source> <translation>Le conteneur '%1' de la page courante (%2) n'a pas pu être déterminé lors de la création du layout. Ceci indique une incohérence dans le fichier ui, probablement un layout étant construit sur un widget conteneur.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="549"/> + <location line="+53"/> <source>Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file.</source> <translation>Temptative d'ajout d'un layout sur le widget '%1' (%2) qui a déjà un layout non pris en charge de type %3. Ceci indique une inconsistance dans le fichier ui.</translation> </message> <message> - <location filename="../tools/designer/src/lib/shared/widgetfactory.cpp" line="760"/> + <location line="+211"/> <source>Cannot create style '%1'.</source> <translation>Impossible de créer le style '%1'.</translation> </message> @@ -7016,12 +7136,12 @@ Ceci indique une inconsistance dans le fichier ui.</translation> <context> <name>qdesigner_internal::WizardContainerWidgetTaskMenu</name> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="232"/> + <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="-49"/> <source>Next</source> <translation>Suivant</translation> </message> <message> - <location filename="../tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp" line="233"/> + <location line="+1"/> <source>Back</source> <translation>Précédent</translation> </message> @@ -7029,7 +7149,7 @@ Ceci indique une inconsistance dans le fichier ui.</translation> <context> <name>qdesigner_internal::ZoomMenu</name> <message> - <location filename="../tools/designer/src/lib/shared/zoomwidget.cpp" line="84"/> + <location filename="../tools/designer/src/lib/shared/zoomwidget.cpp" line="+84"/> <source>%1 %</source> <extracomment>Zoom factor</extracomment> <translation>%1 %</translation> @@ -7038,7 +7158,7 @@ Ceci indique une inconsistance dans le fichier ui.</translation> <context> <name>qdesigner_internal::ZoomablePreviewDeviceSkin</name> <message> - <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="420"/> + <location filename="../tools/designer/src/lib/shared/previewmanager.cpp" line="-270"/> <source>&Zoom</source> <translation>&Zoom</translation> </message> diff --git a/translations/linguist_fr.ts b/translations/linguist_fr.ts index 873adb7..c186adc 100644 --- a/translations/linguist_fr.ts +++ b/translations/linguist_fr.ts @@ -2,17 +2,9 @@ <!DOCTYPE TS> <TS version="2.0"> <context> - <name></name> - <message> - <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="+59"/> - <source>(New Entry)</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>AboutDialog</name> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1357"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1366"/> <source>Qt Linguist</source> <translation type="unfinished"></translation> </message> @@ -68,11 +60,6 @@ </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> - </message> - <message> - <location/> <source>Translate also finished entries</source> <translation type="unfinished"></translation> </message> @@ -93,17 +80,22 @@ </message> <message> <location/> - <source>The batch translator will search through the selected phrase books in the order given above.</source> + <source>&Run</source> <translation type="unfinished"></translation> </message> <message> <location/> - <source>&Run</source> + <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> <location/> - <source>Cancel</source> + <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> + </message> + <message> + <location/> + <source>The batch translator will search through the selected phrase books in the order given above</source> <translation type="unfinished"></translation> </message> </context> @@ -116,11 +108,17 @@ </message> <message> <location line="+4"/> + <location line="+8"/> <source><p>[more duplicates omitted]</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="-5"/> + <source><p>* ID: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source><p>* Context: %1<br>* Source: %2</source> <translation type="unfinished"></translation> </message> @@ -130,7 +128,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+70"/> + <location line="+71"/> <source>Linguist does not know the plural rules for '%1'. Will assume a single universal form.</source> <translation type="unfinished"></translation> @@ -284,19 +282,62 @@ Will assume a single universal form.</source> </message> </context> <context> + <name>FormMultiWidget</name> + <message> + <location filename="../tools/linguist/linguist/messageeditorwidgets.cpp" line="+302"/> + <source>Alt+Delete</source> + <extracomment>translate, but don't change</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Shift+Alt+Insert</source> + <extracomment>translate, but don't change</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Alt+Insert</source> + <extracomment>translate, but don't change</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+131"/> + <source>Confirmation - Qt Linguist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Delete non-empty length variant?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>LRelease</name> <message numerus="yes"> - <location filename="../tools/linguist/shared/qm.cpp" line="+715"/> - <source> Generated %n translation(s) (%1 finished and %2 unfinished) -</source> + <location filename="../tools/linguist/shared/qm.cpp" line="+763"/> + <source>Dropped %n message(s) which had no ID.</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>Excess context/disambiguation dropped from %n message(s).</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location line="+8"/> + <source> Generated %n translation(s) (%1 finished and %2 unfinished)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> <location line="+4"/> - <source> Ignored %n untranslated source text(s) -</source> + <source> Ignored %n untranslated source text(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> @@ -400,7 +441,7 @@ Will assume a single universal form.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+646"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+668"/> <location line="+15"/> <source>&Save</source> <translation type="unfinished"></translation> @@ -412,51 +453,26 @@ Will assume a single universal form.</source> </message> <message> <location/> - <source>Previous unfinished item.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>Move to the previous unfinished item.</source> <translation type="unfinished"></translation> </message> <message> <location/> - <source>Next unfinished item.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>Move to the next unfinished item.</source> <translation type="unfinished"></translation> </message> <message> <location/> - <source>Move to previous item.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>Move to the previous item.</source> <translation type="unfinished"></translation> </message> <message> <location/> - <source>Next item.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>Move to the next item.</source> <translation type="unfinished"></translation> </message> <message> <location/> - <source>Mark item as done and move to the next unfinished item.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>Mark this item as done and move to the next unfinished item.</source> <translation type="unfinished"></translation> </message> @@ -467,21 +483,11 @@ Will assume a single universal form.</source> </message> <message> <location/> - <source>Toggle the validity check of accelerators.</source> - <translation type="unfinished"></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> </message> <message> <location/> - <source>Toggle the validity check of ending punctuation.</source> - <translation type="unfinished"></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> </message> @@ -492,11 +498,6 @@ Will assume a single universal form.</source> </message> <message> <location/> - <source>Toggle the validity check of place markers.</source> - <translation type="unfinished"></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> </message> @@ -516,14 +517,14 @@ Will assume a single universal form.</source> <translation type="unfinished"></translation> </message> <message> + <location/> <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-14"/> <location line="+11"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>Save &As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> <source>Save As...</source> <translation type="unfinished"></translation> </message> @@ -764,11 +765,6 @@ Will assume a single universal form.</source> </message> <message> <location/> - <source>Toggle checking that phrase suggestions are used.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>Place &Marker Matches</source> <translation type="unfinished"></translation> </message> @@ -854,11 +850,6 @@ Will assume a single universal form.</source> </message> <message> <location/> - <source>Display information about the Qt toolkit by Trolltech.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>&What's This?</source> <translation type="unfinished"></translation> </message> @@ -888,36 +879,31 @@ Will assume a single universal form.</source> <translation type="unfinished"></translation> </message> <message> + <location/> <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+21"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>&Batch Translation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> <source>Batch translate all entries using the information in the phrase books.</source> <translation type="unfinished"></translation> </message> <message> + <location/> <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-34"/> <location line="+10"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>Release As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> - <source>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-2004"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-2035"/> <source></source> <comment>This is the application's main window.</comment> <translation></translation> </message> <message> - <location line="+195"/> + <location line="+190"/> <source>Source text</source> <translation type="unfinished"></translation> </message> @@ -929,27 +915,27 @@ Will assume a single universal form.</source> </message> <message> <location line="-2"/> - <location line="+61"/> + <location line="+63"/> <source>Context</source> <translation type="unfinished"></translation> </message> <message> - <location line="-60"/> + <location line="-62"/> <source>Items</source> <translation type="unfinished"></translation> </message> <message> - <location line="+77"/> + <location line="+79"/> <source>This panel lists the source contexts.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+13"/> <source>Strings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> + <location line="+37"/> <source>Phrases and guesses</source> <translation type="unfinished"></translation> </message> @@ -970,7 +956,7 @@ Will assume a single universal form.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+125"/> + <location line="+139"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> @@ -1002,7 +988,7 @@ Skip loading the first named file?</source> </translation> </message> <message> - <location line="+93"/> + <location line="+94"/> <source>Related files (%1);;</source> <translation type="unfinished"></translation> </message> @@ -1018,14 +1004,14 @@ Skip loading the first named file?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <location line="+1164"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+15"/> + <location line="+1187"/> <source>Release</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1163"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1186"/> <source>Qt message files for released applications (*.qm) All files (*)</source> <translation type="unfinished"></translation> @@ -1037,7 +1023,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+34"/> <location line="+355"/> <source>Printing...</source> <translation type="unfinished"></translation> @@ -1088,10 +1074,10 @@ All files (*)</source> <message> <location line="+17"/> <location line="+278"/> - <location line="+40"/> + <location line="+34"/> <location line="+24"/> <location line="+22"/> - <location line="+516"/> + <location line="+538"/> <location line="+1"/> <location line="+274"/> <location line="+40"/> @@ -1100,7 +1086,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1204"/> + <location line="-1220"/> <location line="+102"/> <source>Cannot find the string '%1'.</source> <translation type="unfinished"></translation> @@ -1195,12 +1181,12 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <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) 2010 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> + <location line="+3"/> + <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>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source> <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> + <location line="+38"/> <source>Do you want to save the modified files?</source> <translation type="unfinished"></translation> </message> @@ -1226,7 +1212,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+176"/> + <location line="+198"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -1287,13 +1273,13 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1"/> <source>&Release All</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1"/> <source>Close All</source> <translation type="unfinished"></translation> </message> @@ -1318,37 +1304,37 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+51"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+51"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+7"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+6"/> <source>Translation</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+6"/> <source>Validation</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+7"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location line="+84"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+84"/> <source>Cannot read from phrase book '%1'.</source> <translation type="unfinished"></translation> </message> @@ -1378,7 +1364,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+314"/> + <location line="+349"/> <source>All</source> <translation type="unfinished"></translation> </message> @@ -1398,13 +1384,13 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-527"/> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-562"/> <source>Translation File &Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.ui"/> + <location/> <source>&Add to Phrase Book</source> <translation type="unfinished"></translation> </message> @@ -1423,11 +1409,87 @@ All files (*)</source> <source>Ctrl+Shift+J</source> <translation type="unfinished"></translation> </message> + <message> + <location/> + <source>Previous unfinished item</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Next unfinished item</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Move to previous item</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Next item</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Mark item as done and move to the next unfinished item</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Copies the source text into the translation field</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Toggle the validity check of accelerators</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Toggle the validity check of ending punctuation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Toggle checking that phrase suggestions are used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Toggle the validity check of place markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Display information about the Qt toolkit by Nokia.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Length Variants</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageEditor</name> <message> - <location filename="../tools/linguist/linguist/messageeditor.cpp" line="+72"/> + <location filename="../tools/linguist/linguist/messageeditor.cpp" line="+42"/> + <source></source> + <comment>This is the right panel of the main window.</comment> + <translation></translation> + </message> + <message> + <location line="+30"/> + <source>Russian</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>German</source> <translation type="unfinished"></translation> </message> @@ -1452,12 +1514,12 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+47"/> <source>This whole panel allows you to view and edit the translation of some source text.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+10"/> <source>Source text</source> <translation type="unfinished"></translation> </message> @@ -1467,7 +1529,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Source text (Plural)</source> <translation type="unfinished"></translation> </message> @@ -1477,7 +1539,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Developer comments</source> <translation type="unfinished"></translation> </message> @@ -1492,12 +1554,12 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+205"/> + <location line="+234"/> <source>%1 translation (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+9"/> <source>This is where you can enter or modify the translation of the above source text.</source> <translation type="unfinished"></translation> </message> @@ -1512,7 +1574,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+157"/> <source>'%1' Line: %2</source> <translation type="unfinished"></translation> @@ -1521,7 +1583,7 @@ Line: %2</source> <context> <name>MessageModel</name> <message> - <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+832"/> + <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+839"/> <source>Completion status for %1</source> <translation type="unfinished"></translation> </message> @@ -1544,7 +1606,7 @@ Line: %2</source> <context> <name>MsgEdit</name> <message> - <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-577"/> + <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-600"/> <source></source> <comment>This is the right panel of the main window.</comment> <translation></translation> @@ -1553,13 +1615,18 @@ Line: %2</source> <context> <name>PhraseBookBox</name> <message> - <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="-45"/> + <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="+14"/> <source></source> <comment>Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox.</comment> <translation></translation> </message> <message> - <location line="+53"/> + <location line="+52"/> + <source>(New Entry)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>%1[*] - Qt Linguist</source> <translation type="unfinished"></translation> </message> @@ -1680,7 +1747,7 @@ Line: %2</source> <context> <name>PhraseView</name> <message> - <location filename="../tools/linguist/linguist/phraseview.cpp" line="+121"/> + <location filename="../tools/linguist/linguist/phraseview.cpp" line="+122"/> <source>Insert</source> <translation type="unfinished"></translation> </message> @@ -1708,7 +1775,7 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1279"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1302"/> <source>Translation files (%1);;</source> <translation type="unfinished"></translation> </message> @@ -1718,8 +1785,8 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1118"/> - <location line="+18"/> + <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1134"/> + <location line="+27"/> <location line="+67"/> <location line="+39"/> <location line="+17"/> @@ -1729,23 +1796,13 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/cpp.cpp" line="+1072"/> - <source>C++ source files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../tools/linguist/shared/java.cpp" line="+646"/> - <source>Java source files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../tools/linguist/shared/po.cpp" line="+651"/> + <location filename="../tools/linguist/shared/po.cpp" line="+870"/> <source>GNU Gettext localization files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/qscript.cpp" line="+2399"/> - <source>Qt Script source files</source> + <location line="+7"/> + <source>GNU Gettext localization template files</source> <translation type="unfinished"></translation> </message> <message> @@ -1764,22 +1821,12 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/ui.cpp" line="+213"/> - <source>Qt Designer form files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Qt Jambi form files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../tools/linguist/shared/xliff.cpp" line="+817"/> + <location filename="../tools/linguist/shared/xliff.cpp" line="+829"/> <source>XLIFF localization files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/qph.cpp" line="+192"/> + <location filename="../tools/linguist/shared/qph.cpp" line="+195"/> <source>Qt Linguist 'Phrase Book'</source> <translation type="unfinished"></translation> </message> @@ -1930,12 +1977,12 @@ Line: %2</source> <context> <name>TranslationSettingsDialog</name> <message> - <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+68"/> + <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+93"/> <source>Any Country</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="-22"/> <location line="+8"/> <source>Settings for '%1' - Qt Linguist</source> <translation type="unfinished"></translation> diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 77feab6..1dd80be 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -2,59 +2,18 @@ <!DOCTYPE TS> <TS version="2.0" language="fr"> <context> - <name>MAC_APPLICATION_MENU</name> - <message> - <location filename="../src/gui/kernel/qapplication.cpp" line="+2316"/> - <source>Services</source> - <translation>Services</translation> - </message> - <message> - <location line="+1"/> - <source>Hide %1</source> - <translation>Masquer %1</translation> - </message> - <message> - <location line="+1"/> - <source>Hide Others</source> - <translation>Masquer les autres</translation> - </message> - <message> - <location line="+1"/> - <source>Show All</source> - <translation>Tout afficher</translation> - </message> - <message> - <location line="+1"/> - <source>Preferences...</source> - <translation>Préférences…</translation> - </message> - <message> - <location line="+1"/> - <source>Quit %1</source> - <translation>Quitter %1</translation> - </message> - <message> - <location line="+1"/> - <source>About %1</source> - <translation>À propos de %1</translation> - </message> -</context> -<context> <name>AudioOutput</name> <message> - <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+375"/> <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source> - <translation><html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html></translation> + <translation type="obsolete"><html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html></translation> </message> <message> - <location line="+13"/> <source><html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html></source> - <translation><html>Utilisation de <b>%1</b><br/>qui vient de devenir disponible et a une plus grande priorité.</html></translation> + <translation type="obsolete"><html>Utilisation de <b>%1</b><br/>qui vient de devenir disponible et a une plus grande priorité.</html></translation> </message> <message> - <location line="+3"/> <source>Revert back to device '%1'</source> - <translation>Utilisation de '%1'</translation> + <translation type="obsolete">Utilisation de '%1'</translation> </message> </context> <context> @@ -80,15 +39,15 @@ </message> <message> <source>local audio file:</source> - <translation type="obsolete">Fichier audio local:</translation> + <translation type="obsolete">Fichier audio local : </translation> </message> <message> <source>local video file:</source> - <translation type="obsolete">Fichier vidéo local:</translation> + <translation type="obsolete">Fichier vidéo local : </translation> </message> <message> <source>remote media URL:</source> - <translation type="obsolete">URL distante :</translation> + <translation type="obsolete">URL distante : </translation> </message> <message> <source>run tests</source> @@ -107,6 +66,48 @@ </message> </context> <context> + <name>FakeReply</name> + <message> + <source>Fake error !</source> + <translation>Fausse erreur !</translation> + </message> + <message> + <source>Invalid URL</source> + <translation>URL invalide</translation> + </message> +</context> +<context> + <name>MAC_APPLICATION_MENU</name> + <message> + <source>Services</source> + <translation>Services</translation> + </message> + <message> + <source>Hide %1</source> + <translation>Masquer %1</translation> + </message> + <message> + <source>Hide Others</source> + <translation>Masquer les autres</translation> + </message> + <message> + <source>Show All</source> + <translation>Tout afficher</translation> + </message> + <message> + <source>Preferences...</source> + <translation>Préférences...</translation> + </message> + <message> + <source>Quit %1</source> + <translation>Quitter %1</translation> + </message> + <message> + <source>About %1</source> + <translation>À propos de %1</translation> + </message> +</context> +<context> <name>MainWindow</name> <message> <source>Print</source> @@ -114,7 +115,7 @@ </message> <message> <source>Location:</source> - <translation type="obsolete">Emplacement:</translation> + <translation type="obsolete">Emplacement : </translation> </message> </context> <context> @@ -200,29 +201,47 @@ so on.</source> </message> </context> <context> + <name>Phonon::AudioOutput</name> + <message> + <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source> + <translation><html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Repli sur <b>%2</b>.</html></translation> + </message> + <message> + <source><html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html></source> + <translation><html>Basculement vers le périphérique audio <b>%1</b><br/>qui vient juste d'être disponible et dont le niveau de préférence est plus élevé.</html></translation> + </message> + <message> + <source>Revert back to device '%1'</source> + <translation>Revenir au périphérique '%1'</translation> + </message> + <message> + <source><html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html></source> + <translation><html>Basculement vers le périphérique audio <b>%1</b><br/>dont le niveau de préférence est plus élevé ou qui est spécifiquement configuré pour ce flux.</html></translation> + </message> +</context> +<context> <name>Phonon::Gstreamer::Backend</name> <message> <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled.</source> - <translation>Attention: Vous n'avez apparemment pas installé le paquet gstreamer0.10-plugins-good. + <translation>Attention : Vous n'avez apparemment pas installé le paquet gstreamer0.10-plugins-good. Des fonctionnalités vidéo ont été desactivées.</translation> </message> <message> <source>Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled</source> - <translation>Attention: Vous n'avez apparemment pas installées les plugins de base de GStreamer. + <translation>Attention : Vous n'avez apparemment pas installées les plugins de base de GStreamer. Le support audio et vidéo est désactivé</translation> </message> </context> <context> <name>Phonon::Gstreamer::MediaObject</name> <message> - <location filename="../src/3rdparty/phonon/gstreamer/mediaobject.cpp" line="+90"/> <source>Cannot start playback. Check your Gstreamer installation and make sure you have libgstreamer-plugins-base installed.</source> - <translation>Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d'avoir installé libgstreamer-plugins-base.</translation> + <translation type="obsolete">Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d'avoir installé libgstreamer-plugins-base.</translation> </message> <message> <source>Unknown media format: %1</source> @@ -257,8 +276,17 @@ have libgstreamer-plugins-base installed.</source> <translation type="obsolete">Impossible de charger la source</translation> </message> <message> + <source>Missing codec helper script assistant.</source> + <translatorcomment>???</translatorcomment> + <translation>Assistant de script d'aide au codec manquant.</translation> + </message> + <message> + <source>Plugin codec installation failed for codec: %0</source> + <translation>Échec de l'installation du plugin pour le codec : %0</translation> + </message> + <message> <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source> - <translation>Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0</translation> + <translation>Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu : %0</translation> </message> <message> <source>Could not open media source.</source> @@ -292,10 +320,340 @@ d'avoir installé libgstreamer-plugins-base.</translation> </message> </context> <context> + <name>Phonon::MMF</name> + <message> + <source>Audio Output</source> + <translation>Sortie audio</translation> + </message> + <message> + <source>The audio output device</source> + <translation>Périphérique audio de sortie</translation> + </message> + <message> + <source>No error</source> + <translation>Aucune erreur</translation> + </message> + <message> + <source>Not found</source> + <translation>Introuvable</translation> + </message> + <message> + <source>Out of memory</source> + <translation>Mémoire insuffisante</translation> + </message> + <message> + <source>Not supported</source> + <translation>Non supporté</translation> + </message> + <message> + <source>Overflow</source> + <translation>Dépassement</translation> + </message> + <message> + <source>Underflow</source> + <translation>Soupassement</translation> + </message> + <message> + <source>Already exists</source> + <translation>Existe déjà</translation> + </message> + <message> + <source>Path not found</source> + <translation>Chemin introuvable</translation> + </message> + <message> + <source>In use</source> + <translation>Utilisé</translation> + </message> + <message> + <source>Not ready</source> + <translation>Pas prêt</translation> + </message> + <message> + <source>Access denied</source> + <translation>Autorisation refusée</translation> + </message> + <message> + <source>Could not connect</source> + <translation>Connexion impossible</translation> + </message> + <message> + <source>Disconnected</source> + <translation>Déconnecté</translation> + </message> + <message> + <source>Permission denied</source> + <translation>Autorisation refusée</translation> + </message> + <message> + <source>Insufficient bandwidth</source> + <translation>Bande passante insuffisante</translation> + </message> + <message> + <source>Network unavailable</source> + <translation>Réseau non disponible</translation> + </message> + <message> + <source>Network communication error</source> + <translation>Erreur de communication réseau</translation> + </message> + <message> + <source>Streaming not supported</source> + <translation>Streaming non supporté</translation> + </message> + <message> + <source>Server alert</source> + <translation>Alerte serveur</translation> + </message> + <message> + <source>Invalid protocol</source> + <translation>Protocole invalide</translation> + </message> + <message> + <source>Invalid URL</source> + <translation>URL invalide</translation> + </message> + <message> + <source>Multicast error</source> + <translation>Erreur multicast</translation> + </message> + <message> + <source>Proxy server error</source> + <translation>Erreur du serveur proxy</translation> + </message> + <message> + <source>Proxy server not supported</source> + <translation>Serveur proxy non supporté</translation> + </message> + <message> + <source>Audio output error</source> + <translation>Erreur de sortie audio</translation> + </message> + <message> + <source>Video output error</source> + <translation>Erreur de sortie vidéo</translation> + </message> + <message> + <source>Decoder error</source> + <translation>Erreur du décodeur</translation> + </message> + <message> + <source>Audio or video components could not be played</source> + <translation>Les composants audio ou vidéo n'ont pas pu être lus</translation> + </message> + <message> + <source>DRM error</source> + <translation>Erreur GDN</translation> + </message> + <message> + <source>Unknown error (%1)</source> + <translation>Erreur inconnue (%1)</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AbstractMediaPlayer</name> + <message> + <source>Not ready to play</source> + <translation>Pas prêt pour lecture</translation> + </message> + <message> + <source>Error opening file</source> + <translation>Erreur lors de l'ouverture du fichier</translation> + </message> + <message> + <source>Error opening URL</source> + <translation>Erreur lors de l'ouverture de l'URL</translation> + </message> + <message> + <source>Error opening resource</source> + <translation>erreur lors de l'ouverture de la ressource</translation> + </message> + <message> + <source>Error opening source: resource not opened</source> + <translation>erreur lors de l'ouverture de la source : ressource non ouverte</translation> + </message> + <message> + <source>Setting volume failed</source> + <translation>Le réglage du volume a échoué</translation> + </message> + <message> + <source>Loading clip failed</source> + <translation>Échec de l'ouverture du clip</translation> + </message> + <message> + <source>Playback complete</source> + <translation>Lecture terminée</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AbstractVideoPlayer</name> + <message> + <source>Pause failed</source> + <translation>La mise en pause a échoué</translation> + </message> + <message> + <source>Seek failed</source> + <translation>La recherche a échoué</translation> + </message> + <message> + <source>Getting position failed</source> + <translation>L'obtention de la position a échoué</translation> + </message> + <message> + <source>Opening clip failed</source> + <translation>L'ouverture du clip a échoué</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AudioEqualizer</name> + <message> + <source>%1 Hz</source> + <translation>%1 Hz</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AudioPlayer</name> + <message> + <source>Getting position failed</source> + <translation>L'obtention de la position a échoué</translation> + </message> + <message> + <source>Opening clip failed</source> + <translation type="obsolete">L'ouverture du clip a échoué</translation> + </message> +</context> +<context> + <name>Phonon::MMF::DsaVideoPlayer</name> + <message> + <source>Video display error</source> + <translation>Erreur de l'affichage vidéo</translation> + </message> +</context> +<context> + <name>Phonon::MMF::EffectFactory</name> + <message> + <source>Enabled</source> + <translation>Activé</translation> + </message> +</context> +<context> + <name>Phonon::MMF::EnvironmentalReverb</name> + <message> + <source>Decay HF ratio (%)</source> + <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime.</extracomment> + <translation>Ratio HF du déclin (%)</translation> + </message> + <message> + <source>Decay time (ms)</source> + <extracomment>DecayTime: Time over which reverberation is diminished.</extracomment> + <translation>Temps de déclin (ms)</translation> + </message> + <message> + <source>Density (%)</source> + <extracomment>Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value.</extracomment> + <translation>Densité (%)</translation> + </message> + <message> + <source>Diffusion (%)</source> + <extracomment>Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value.</extracomment> + <translation>Diffusion (%)</translation> + </message> + <message> + <source>Reflections delay (ms)</source> + <extracomment>ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection.</extracomment> + <translation>Délai réflexions (ms)</translation> + </message> + <message> + <source>Reflections level (mB)</source> + <extracomment>ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude.</extracomment> + <translation>Niveau réflexions (mB)</translation> + </message> + <message> + <source>Reverb delay (ms)</source> + <extracomment>ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation.</extracomment> + <translation>Délai de réverbération (ms)</translation> + </message> + <message> + <source>Reverb level (mB)</source> + <extracomment>ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude.</extracomment> + <translation>Niveau de réverbération (mB)</translation> + </message> + <message> + <source>Room HF level</source> + <extracomment>RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound.</extracomment> + <translation>Niveau HF pièce</translation> + </message> + <message> + <source>Room level (mB)</source> + <extracomment>RoomLevel: Master volume control for all reflected sound.</extracomment> + <translation>Niveau pièce (mB)</translation> + </message> +</context> +<context> + <name>Phonon::MMF::MediaObject</name> + <message> + <source>Error opening source: type not supported</source> + <translation>Erreur lors de l'ouverture de la source : type non supporté</translation> + </message> + <message> + <source>Error opening source: resource is compressed</source> + <translation>Erreur lors de l'ouverture de la source : ressource compressée</translation> + </message> + <message> + <source>Error opening source: resource not valid</source> + <translation>Erreur lors de l'ouverture de la source : ressource invalide</translation> + </message> + <message> + <source>Error opening source: media type could not be determined</source> + <translation>Erreur lors de l'ouverture de la source : type de média non déterminé</translation> + </message> +</context> +<context> + <name>Phonon::MMF::StereoWidening</name> + <message> + <source>Level (%)</source> + <translation>Niveau (%)</translation> + </message> +</context> +<context> + <name>Phonon::MMF::SurfaceVideoPlayer</name> + <message> + <source>Video display error</source> + <translation>Erreur de l'affichage vidéo</translation> + </message> +</context> +<context> + <name>Phonon::MMF::VideoPlayer</name> + <message> + <source>Pause failed</source> + <translation type="obsolete">La mise en pause a échoué</translation> + </message> + <message> + <source>Seek failed</source> + <translation type="obsolete">La recherche a échoué</translation> + </message> + <message> + <source>Getting position failed</source> + <translation type="obsolete">L'obtention de la position a échoué</translation> + </message> + <message> + <source>Opening clip failed</source> + <translation type="obsolete">L'ouverture du clip a échoué</translation> + </message> + <message> + <source>Buffering clip failed</source> + <translation type="obsolete">La mise en mémoire tampon du clip a échoué</translation> + </message> + <message> + <source>Video display error</source> + <translation type="obsolete">Erreur de l'affichage vidéo</translation> + </message> +</context> +<context> <name>Phonon::VolumeSlider</name> <message> <source>Volume: %1%</source> - <translation>Volume: %1%</translation> + <translation>Volume : %1%</translation> </message> <message> <source>Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%</source> @@ -388,15 +746,15 @@ d'avoir installé libgstreamer-plugins-base.</translation> </message> <message> <source>Look &in:</source> - <translation>Chercher &dans :</translation> + <translation>Chercher &dans : </translation> </message> <message> <source>File &name:</source> - <translation>&Nom de fichier :</translation> + <translation>&Nom de fichier : </translation> </message> <message> <source>File &type:</source> - <translation>&Type de fichier :</translation> + <translation>&Type de fichier : </translation> </message> <message> <source>Back</source> @@ -568,7 +926,7 @@ d'avoir installé libgstreamer-plugins-base.</translation> </message> <message> <source>Directory:</source> - <translation>Dossier :</translation> + <translation>Dossier : </translation> </message> <message> <source>Error</source> @@ -580,7 +938,7 @@ File not found. Check path and filename.</source> <translation>%1 Impossible de trouver le fichier. -Vérifier le chemin et le nom du fichier.</translation> +Vérifiez le chemin et le nom du fichier.</translation> </message> <message> <source>All Files (*.*)</source> @@ -748,9 +1106,8 @@ en <translation>Contient des commandes pour manipuler la fenêtre</translation> </message> <message> - <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+277"/> <source>Puts a minimized back to normal</source> - <translation>Rend à une fenêtre minimisée son aspect normal</translation> + <translation type="obsolete">Rend à une fenêtre minimisée son aspect normal</translation> </message> <message> <source>Moves the window out of the way</source> @@ -781,7 +1138,7 @@ en <name>Q3ToolBar</name> <message> <source>More...</source> - <translation>Reste...</translation> + <translation>Plus...</translation> </message> </context> <context> @@ -893,9 +1250,15 @@ en </message> </context> <context> + <name>QAccessibleButton</name> + <message> + <source>Press</source> + <translation>Appuyer</translation> + </message> +</context> +<context> <name>QApplication</name> <message> - <location filename="../src/gui/kernel/qapplication.cpp" line="+2248"/> <source>QT_LAYOUT_DIRECTION</source> <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> <translation>LTR</translation> @@ -918,7 +1281,7 @@ en </message> <message> <source>QT_LAYOUT_DIRECTION</source> - <translation>LTR</translation> + <translation type="obsolete">LTR</translation> </message> </context> <context> @@ -937,7 +1300,7 @@ en </message> <message> <source>COM &Object:</source> - <translation>&Objet COM :</translation> + <translation>&Objet COM : </translation> </message> </context> <context> @@ -959,31 +1322,31 @@ en <name>QColorDialog</name> <message> <source>Hu&e:</source> - <translation>&Teinte :</translation> + <translation>&Teinte : </translation> </message> <message> <source>&Sat:</source> - <translation>&Saturation :</translation> + <translation>&Saturation : </translation> </message> <message> <source>&Val:</source> - <translation>&Valeur :</translation> + <translation>&Valeur : </translation> </message> <message> <source>&Red:</source> - <translation>&Rouge :</translation> + <translation>&Rouge : </translation> </message> <message> <source>&Green:</source> - <translation>&Vert :</translation> + <translation>&Vert : </translation> </message> <message> <source>Bl&ue:</source> - <translation>Ble&u :</translation> + <translation>Ble&u : </translation> </message> <message> <source>A&lpha channel:</source> - <translation>Canal a&lpha :</translation> + <translation>Canal a&lpha : </translation> </message> <message> <source>Select Color</source> @@ -1042,73 +1405,75 @@ en <message> <source>%1: permission denied</source> <comment>QSystemSemaphore</comment> - <translation type="obsolete">%1: permission refusée</translation> + <translation type="obsolete">%1 : permission refusée</translation> </message> <message> <source>%1: already exists</source> <comment>QSystemSemaphore</comment> - <translation type="obsolete">%1: existe déjà</translation> + <translation>%1 : existe déjà</translation> </message> <message> <source>%1: doesn't exists</source> <comment>QSystemSemaphore</comment> - <translation type="obsolete">%1: n'existe pas</translation> + <translation type="obsolete">%1 : n'existe pas</translation> + </message> + <message> + <source>%1: does not exist</source> + <comment>QSystemSemaphore</comment> + <translation>%1 : n'existe pas</translation> </message> <message> <source>%1: out of resources</source> <comment>QSystemSemaphore</comment> - <translation type="obsolete">%1: plus de ressources disponibles</translation> + <translation>%1 : plus de ressources disponibles</translation> </message> <message> <source>%1: unknown error %2</source> <comment>QSystemSemaphore</comment> - <translation type="obsolete">%1: erreur inconnue %2</translation> + <translation>%1 : erreur inconnue %2</translation> </message> <message> - <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="+119"/> <source>%1: key is empty</source> <comment>QSystemSemaphore</comment> - <translation>%1: clé vide</translation> + <translation>%1 : clé vide</translation> </message> <message> - <location line="+12"/> <source>%1: unable to make key</source> <comment>QSystemSemaphore</comment> - <translation>%1: impossible de créer la clé</translation> + <translation>%1 : impossible de créer la clé</translation> </message> <message> - <location line="+9"/> <source>%1: ftok failed</source> <comment>QSystemSemaphore</comment> - <translation>%1: ftok a échoué</translation> + <translation>%1 : ftok a échoué</translation> </message> <message> <source>%1: key is empty</source> - <translation>%1: clé vide</translation> + <translation type="obsolete">%1 : clé vide</translation> </message> <message> <source>%1: unable to make key</source> - <translation>%1: impossible de créer la clé</translation> + <translation type="obsolete">%1 : impossible de créer la clé</translation> </message> <message> <source>%1: ftok failed</source> - <translation>%1: ftok a échoué</translation> + <translation type="obsolete">%1 : ftok a échoué</translation> </message> <message> <source>%1: already exists</source> - <translation>%1: existe déjà</translation> + <translation type="obsolete">%1 : existe déjà</translation> </message> <message> <source>%1: does not exist</source> - <translation>%1: n'existe pas</translation> + <translation type="obsolete">%1 : n'existe pas</translation> </message> <message> <source>%1: out of resources</source> - <translation>%1: plus de ressources disponibles</translation> + <translation type="obsolete">%1 : plus de ressources disponibles</translation> </message> <message> <source>%1: unknown error %2</source> - <translation>%1: erreur inconnue %2</translation> + <translation type="obsolete">%1 : erreur inconnue %2</translation> </message> </context> <context> @@ -1138,7 +1503,7 @@ en </message> <message> <source>Unable to prepare statement</source> - <translation>Impossible de prépare la requête</translation> + <translation>Impossible de préparer la requête</translation> </message> <message> <source>Unable to bind variable</source> @@ -1177,6 +1542,909 @@ en </message> </context> <context> + <name>QDeclarativeAbstractAnimation</name> + <message> + <source>Cannot animate non-existent property "%1"</source> + <translation>Impossible d'animer la propriété inexistante "%1"</translation> + </message> + <message> + <source>Cannot animate read-only property "%1"</source> + <translation>Impossible d'animer la propriété en lecture seule "%1"</translation> + </message> + <message> + <source>Animation is an abstract class</source> + <translation>L'animation est une classe abstraite</translation> + </message> +</context> +<context> + <name>QDeclarativeAnchorAnimation</name> + <message> + <source>Cannot set a duration of < 0</source> + <translation>Impossible de sélectionner une durée négative</translation> + </message> +</context> +<context> + <name>QDeclarativeAnchors</name> + <message> + <source>Possible anchor loop detected on fill.</source> + <translation>Boucle potentielle dans les ancres détectée pour le remplissage.</translation> + </message> + <message> + <source>Possible anchor loop detected on centerIn.</source> + <translation>Boucle potentielle dans les ancres détectée pour le centrage.</translation> + </message> + <message> + <source>Cannot anchor to an item that isn't a parent or sibling.</source> + <translation>Impossible d'ancrer à un élément qui n'est pas un parent ou partage le même parent.</translation> + </message> + <message> + <source>Possible anchor loop detected on vertical anchor.</source> + <translation>Boucle potentielle dans les ancres détectée pour l'ancre verticale.</translation> + </message> + <message> + <source>Possible anchor loop detected on horizontal anchor.</source> + <translation>Boucle potentielle dans les ancres détectée pour l'ancre horizontale.</translation> + </message> + <message> + <source>Cannot specify left, right, and hcenter anchors.</source> + <translation>Impossible de spécifier à la fois une ancre gauche, droite et hcenter.</translation> + </message> + <message> + <source>Cannot anchor to a null item.</source> + <translation>Impossible d'ancrer à un élément nul.</translation> + </message> + <message> + <source>Cannot anchor a horizontal edge to a vertical edge.</source> + <translation>Impossible d'ancrer un bord horizontal à un bord vertical.</translation> + </message> + <message> + <source>Cannot anchor item to self.</source> + <translation>Impossible d'ancrer l'élément à lui même.</translation> + </message> + <message> + <source>Cannot specify top, bottom, and vcenter anchors.</source> + <translation>Impossible de spécifier à la fois une ancre haut, bas et vcenter.</translation> + </message> + <message> + <source>Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.</source> + <translation>L'ancre baseline ne peut pas etre combinée à l'usage des ancres haut, bas ou vcenter.</translation> + </message> + <message> + <source>Cannot anchor a vertical edge to a horizontal edge.</source> + <translation>Impossible d'ancrer un bord vertical à un bord horizontal.</translation> + </message> +</context> +<context> + <name>QDeclarativeAnimatedImage</name> + <message> + <source>Qt was built without support for QMovie</source> + <translation>Qt a été compilé sans support de QMovie</translation> + </message> +</context> +<context> + <name>QDeclarativeBehavior</name> + <message> + <source>Cannot change the animation assigned to a Behavior.</source> + <translation>Impossible de changer l'animation affectée à un comportement.</translation> + </message> +</context> +<context> + <name>QDeclarativeBinding</name> + <message> + <source>Binding loop detected for property "%1"</source> + <translation>Boucle détectée dans l'affectation pour la propriété "%1"</translation> + </message> +</context> +<context> + <name>QDeclarativeBindings</name> + <message> + <source>Binding loop detected for property "%1"</source> + <translation>Boucle détectée dans l'affectation pour la propriété "%1"</translation> + </message> +</context> +<context> + <name>QDeclarativeCompiler</name> + <message> + <source>Invalid property assignment: "%1" is a read-only property</source> + <translation>Affectation de propriété invalide : "%1"est une propriété en lecture seule</translation> + </message> + <message> + <source>Invalid property assignment: unknown enumeration</source> + <translation>Affectation de propriété invalide : énumération inconnue</translation> + </message> + <message> + <source>Invalid property assignment: string expected</source> + <translation>Affectation de propriété invalide : chaîne attendue</translation> + </message> + <message> + <source>Invalid property assignment: url expected</source> + <translation>Affectation de propriété invalide : url attendue</translation> + </message> + <message> + <source>Invalid property assignment: unsigned int expected</source> + <translation>Affectation de propriété invalide : unsigned int attendu</translation> + </message> + <message> + <source>Invalid property assignment: int expected</source> + <translation>Affectation de propriété invalide : int attendu</translation> + </message> + <message> + <source>Invalid property assignment: float expected</source> + <translation type="obsolete">Affectation de propriété invalide : float attendu</translation> + </message> + <message> + <source>Invalid property assignment: double expected</source> + <translation type="obsolete">Affectation de propriété invalide : double attendu</translation> + </message> + <message> + <source>Invalid property assignment: number expected</source> + <translation>Affectation de propriété invalide : nombre attendu</translation> + </message> + <message> + <source>Invalid property assignment: color expected</source> + <translation>Affectation de propriété invalide : couleur attendue</translation> + </message> + <message> + <source>Invalid property assignment: date expected</source> + <translation>Affectation de propriété invalide : date attendue</translation> + </message> + <message> + <source>Invalid property assignment: time expected</source> + <translation>Affectation de propriété invalide : heure attendue</translation> + </message> + <message> + <source>Invalid property assignment: datetime expected</source> + <translation>Affectation de propriété invalide : date et heure attendues</translation> + </message> + <message> + <source>Invalid property assignment: point expected</source> + <translation>Affectation de propriété invalide : point attendu</translation> + </message> + <message> + <source>Invalid property assignment: size expected</source> + <translation>Affectation de propriété invalide : taille attendue</translation> + </message> + <message> + <source>Invalid property assignment: rect expected</source> + <translation>Affectation de propriété invalide : rectangle attendu</translation> + </message> + <message> + <source>Invalid property assignment: boolean expected</source> + <translation>Affectation de propriété invalide : booléen attendu</translation> + </message> + <message> + <source>Invalid property assignment: 3D vector expected</source> + <translation>Affectation de propriété invalide : vecteur 3D attendu</translation> + </message> + <message> + <source>Invalid property assignment: unsupported type "%1"</source> + <translation>Affectation de propriété invalide : type "%1" non supporté</translation> + </message> + <message> + <source>Element is not creatable.</source> + <translation>Impossible de créer l'élément.</translation> + </message> + <message> + <source>Component elements may not contain properties other than id</source> + <translation>Les éléments du composant ne peuvent pas contenir des propriétés autres que id</translation> + </message> + <message> + <source>Invalid component id specification</source> + <translation>L'id de composant spécifiée n'est pas valide</translation> + </message> + <message> + <source>id is not unique</source> + <translation>l'id n'est pas unique</translation> + </message> + <message> + <source>Invalid component body specification</source> + <translation>Le corps de la spécification du composant n'est pas valide</translation> + </message> + <message> + <source>Component objects cannot declare new properties.</source> + <translation>Les objets composants ne peuvent pas déclarer de nouvelles propriétés.</translation> + </message> + <message> + <source>Component objects cannot declare new signals.</source> + <translation>Les objets composants ne peuvent pas déclarer de nouveaux signaux.</translation> + </message> + <message> + <source>Component objects cannot declare new functions.</source> + <translation>Les objets composants ne peuvent pas déclarer de nouvelles fonctions.</translation> + </message> + <message> + <source>Cannot create empty component specification</source> + <translation>Impossible de créer une spécification du composant vide</translation> + </message> + <message> + <source>Incorrectly specified signal assignment</source> + <translation>L'affectation du signal est incorrectement spécifiée</translation> + </message> + <message> + <source>Cannot assign a value to a signal (expecting a script to be run)</source> + <translation>Impossible d'assigner une valeur à un signal (un script à exécuter est attendu)</translation> + </message> + <message> + <source>Empty signal assignment</source> + <translation>Affectation de signal vide</translation> + </message> + <message> + <source>Empty property assignment</source> + <translation>Affectation de propriété vide</translation> + </message> + <message> + <source>Attached properties cannot be used here</source> + <translation>La configuration spécifiée ne peut être utilisée ici.</translation> + </message> + <message> + <source>Non-existent attached object</source> + <translation>Objet attaché inexistant</translation> + </message> + <message> + <source>Invalid attached object assignment</source> + <translation>L'affectation de l'objet attaché est invalide</translation> + </message> + <message> + <source>Cannot assign to non-existent default property</source> + <translation>Impossible d'attacher à une propriété par défaut inexistante</translation> + </message> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Impossible d'attacher à une propriété inexistante "%1"</translation> + </message> + <message> + <source>Invalid use of namespace</source> + <translation>Utilisation invalide d'espace de noms</translation> + </message> + <message> + <source>Not an attached property name</source> + <translation>Ce n'est pas un nom de propriété attachée</translation> + </message> + <message> + <source>Invalid use of id property</source> + <translation>Utilisation invalide de la propriété id</translation> + </message> + <message> + <source>Property has already been assigned a value</source> + <translation>Une valeur a déjà été attribuée à la propriété</translation> + </message> + <message> + <source>Invalid grouped property access</source> + <translation>Accès invalide à une propriété groupée</translation> + </message> + <message> + <source>Cannot assign a value directly to a grouped property</source> + <translation>Impossible d'assigner directement une valeur à une propriété groupée</translation> + </message> + <message> + <source>Invalid property use</source> + <translation>La propriété utilisée est invalide</translation> + </message> + <message> + <source>Property assignment expected</source> + <translation>Affectation de propriété attendue</translation> + </message> + <message> + <source>Single property assignment expected</source> + <translation>Une seule affectation de propriété est attendue</translation> + </message> + <message> + <source>Unexpected object assignment</source> + <translation>Affectation d'objet inattendue</translation> + </message> + <message> + <source>Cannot assign object to list</source> + <translation>Impossible d'assigner un objet à une liste</translation> + </message> + <message> + <source>Can only assign one binding to lists</source> + <translation>Un seul lien peut être assigné à des listes</translation> + </message> + <message> + <source>Cannot assign primitives to lists</source> + <translation>Impossible d'assigner des primitives à des listes</translation> + </message> + <message> + <source>Cannot assign multiple values to a script property</source> + <translation>Impossible d'assigner plusieurs valeurs à une propriété de script</translation> + </message> + <message> + <source>Invalid property assignment: script expected</source> + <translation>Affectation de propriété invalide : script attendu</translation> + </message> + <message> + <source>Cannot assign object to property</source> + <translation>Impossible d'assigner un objet à une propriété</translation> + </message> + <message> + <source>"%1" cannot operate on "%2"</source> + <translation>"%1" ne peut pas opérer sur "%2"</translation> + </message> + <message> + <source>Duplicate default property</source> + <translation>Propriété par défaut en double</translation> + </message> + <message> + <source>Duplicate property name</source> + <translation>Nom de propriété en double</translation> + </message> + <message> + <source>Property names cannot begin with an upper case letter</source> + <translation>Les noms des propriétés ne peuvent pas commencer par une majuscule</translation> + </message> + <message> + <source>Illegal property name</source> + <translation>Nom de propriété invalide</translation> + </message> + <message> + <source>Duplicate signal name</source> + <translation>Nom de signal en double</translation> + </message> + <message> + <source>Signal names cannot begin with an upper case letter</source> + <translation>Les noms de signaux ne peuvent pas commencer par une majuscule</translation> + </message> + <message> + <source>Illegal signal name</source> + <translation>Nom de signal invalide</translation> + </message> + <message> + <source>Duplicate method name</source> + <translation>Nom de méthode en double</translation> + </message> + <message> + <source>Method names cannot begin with an upper case letter</source> + <translation>Les noms des méthodes ne peuvent pas commencer par une majuscule</translation> + </message> + <message> + <source>Illegal method name</source> + <translation>Nom de méthode invalide</translation> + </message> + <message> + <source>Property value set multiple times</source> + <translation>Valeur de propriété attribuée plusieurs fois</translation> + </message> + <message> + <source>Invalid property nesting</source> + <translation>Imbrication de propriété invalide</translation> + </message> + <message> + <source>Cannot override FINAL property</source> + <translation>Impossible de remplacer la propriété FINAL</translation> + </message> + <message> + <source>Invalid property type</source> + <translation>Type de propriété invalide</translation> + </message> + <message> + <source>Invalid empty ID</source> + <translation>id vide invalide</translation> + </message> + <message> + <source>IDs cannot start with an uppercase letter</source> + <translation>Les ids ne peuvent pas commencer par une majuscule</translation> + </message> + <message> + <source>IDs must start with a letter or underscore</source> + <translation>Les ids doivent commencer par une lettre ou un tiret bas</translation> + </message> + <message> + <source>IDs must contain only letters, numbers, and underscores</source> + <translation>Les ids ne peuvent contenir que des lettres, des nombres ou des tirets bas</translation> + </message> + <message> + <source>ID illegally masks global JavaScript property</source> + <translation>id masque illégalement la propriété JavaScript globale</translation> + </message> + <message> + <source></source> + <translation>L'alias de propriété n'a pas d'emplacement</translation> + </message> + <message> + <source>Invalid alias reference. An alias reference must be specified as <id> or <id>.<property></source> + <translation>Référence d'alias invalide. Les références d'alias doivent être spécifiées comme <id> ou <id>.<property></translation> + </message> + <message> + <source>Invalid alias reference. Unable to find id "%1"</source> + <translation>Référence d'alias invalide. Impossible de trouver l'id "%1"</translation> + </message> +</context> +<context> + <name>QDeclarativeComponent</name> + <message> + <source>Invalid empty URL</source> + <translation>URL vide invalide</translation> + </message> +</context> +<context> + <name>QDeclarativeCompositeTypeManager</name> + <message> + <source>Resource %1 unavailable</source> + <translation>La ressource %1 n'est pas disponible</translation> + </message> + <message> + <source>Namespace %1 cannot be used as a type</source> + <translation>L'espace de noms %1 ne peut pas être utilisé comme un type</translation> + </message> + <message> + <source>%1 %2</source> + <translation>%1 %2</translation> + </message> + <message> + <source>Type %1 unavailable</source> + <translation>Le type %1 n'est pas disponible</translation> + </message> +</context> +<context> + <name>QDeclarativeConnections</name> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Imposible d'assigner à la propriété inexistante "%1"</translation> + </message> + <message> + <source>Connections: nested objects not allowed</source> + <translation>Connexions : les éléments imbriqués ne sont pas autorisés</translation> + </message> + <message> + <source>Connections: syntax error</source> + <translation>Connexions : erreur de syntaxe</translation> + </message> + <message> + <source>Connections: script expected</source> + <translation>Connexions : script attendu</translation> + </message> +</context> +<context> + <name>QDeclarativeEngine</name> + <message> + <source>executeSql called outside transaction()</source> + <translation>executeSql a été appelé en dehors de transaction()</translation> + </message> + <message> + <source>Read-only Transaction</source> + <translation>Transaction en lecture seule</translation> + </message> + <message> + <source>Version mismatch: expected %1, found %2</source> + <translation>Version incompatible : %1 attendue, %2 trouvée</translation> + </message> + <message> + <source>SQL transaction failed</source> + <translation>la transaction SQL a échouée</translation> + </message> + <message> + <source>transaction: missing callback</source> + <translation>transaction : la fonction de rappel est absente</translation> + </message> + <message> + <source>SQL: database version mismatch</source> + <translation>SQL : la version de la base de données est incompatible</translation> + </message> +</context> +<context> + <name>QDeclarativeFlipable</name> + <message> + <source>front is a write-once property</source> + <translation>front est une propriété à écriture unique</translation> + </message> + <message> + <source>back is a write-once property</source> + <translation>back est une propriété à écriture unique</translation> + </message> +</context> +<context> + <name>QDeclarativeImportDatabase</name> + <message> + <source>module "%1" definition "%2" not readable</source> + <translation>la définition "%2" du module "%1% n'est pas lisible</translation> + </message> + <message> + <source>plugin cannot be loaded for module "%1": %2</source> + <translation>impossible de charger le plugin pour le module "%1" : %2</translation> + </message> + <message> + <source>module "%1" plugin "%2" not found</source> + <translation>le plugin "%2" du module "%1" n'a pas été trouvé</translation> + </message> + <message> + <source>module "%1" version %2.%3 is not installed</source> + <translation>la version %2.%3 du module "%1" n'est pas installée</translation> + </message> + <message> + <source>module "%1" is not installed</source> + <translation>le module "%1" n'est pas installé</translation> + </message> + <message> + <source>"%1": no such directory</source> + <translation>"%1" : le répertoire n'existe pas</translation> + </message> + <message> + <source>import "%1" has no qmldir and no namespace</source> + <translation>l'importation "%1" n'a pas de qmldir ni d'espace de noms</translation> + </message> + <message> + <source>- %1 is not a namespace</source> + <translation>- %1 n'est pas un espace de noms</translation> + </message> + <message> + <source>- nested namespaces not allowed</source> + <translation>- les espaces de noms imbriqués ne sont pas autorisés</translation> + </message> + <message> + <source>local directory</source> + <translation>répertoire local</translation> + </message> + <message> + <source>is ambiguous. Found in %1 and in %2</source> + <translation>est ambigu. Trouvé dans %1 et dans %2</translation> + </message> + <message> + <source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source> + <translation>est ambigu. Trouvé dans %1 dans les versions %2.%3 et %4.%5</translation> + </message> + <message> + <source>is instantiated recursively</source> + <translation>est instancié récursivement</translation> + </message> + <message> + <source>is not a type</source> + <translation>n'est pas un type</translation> + </message> +</context> +<context> + <name>QDeclarativeKeyNavigationAttached</name> + <message> + <source>KeyNavigation is only available via attached properties</source> + <translation>KeyNavigation est disponible uniquement via les propriétés attachées</translation> + </message> +</context> +<context> + <name>QDeclarativeKeysAttached</name> + <message> + <source>Keys is only available via attached properties</source> + <translatorcomment>Keys, a verifier</translatorcomment> + <translation>Keys est disponible uniquement via les propriétés attachées</translation> + </message> +</context> +<context> + <name>QDeclarativeListModel</name> + <message> + <source>remove: index %1 out of range</source> + <translation>remove : l'index %1 est hors de la plage de valeurs admissibles</translation> + </message> + <message> + <source>insert: value is not an object</source> + <translation>insert : une valeur n'est pas un objet</translation> + </message> + <message> + <source>insert: index %1 out of range</source> + <translation>insert : l'index %1 est hors de la plage de valeurs admissibles</translation> + </message> + <message> + <source>move: out of range</source> + <translation>move : hors de la plage de valeurs admissibles</translation> + </message> + <message> + <source>append: value is not an object</source> + <translation>append : une valeur n'est pas un objet</translation> + </message> + <message> + <source>set: value is not an object</source> + <translation>set : une valeur n'est pas un objet</translation> + </message> + <message> + <source>set: index %1 out of range</source> + <translation>set : l'index %1 est hors de la plage de valeurs admissible</translation> + </message> + <message> + <source>ListElement: cannot contain nested elements</source> + <translation>ListElement : ne peut pas contenir des éléments imbriqués</translation> + </message> + <message> + <source>ListElement: cannot use reserved "id" property</source> + <translation>ListElement : ne peut pas utiliser la propriété réservée "id"</translation> + </message> + <message> + <source>ListElement: cannot use script for property value</source> + <translation>ListElement : ne peut pas utiliser script comme valeur pour une propriété</translation> + </message> + <message> + <source>ListModel: undefined property '%1'</source> + <translation>ListModel : propriété indéfinie '%1'</translation> + </message> +</context> +<context> + <name>QDeclarativeLoader</name> + <message> + <source>Loader does not support loading non-visual elements.</source> + <translation>Le chargeur n'est pas compatible avec le chargement d'éléments non-visuels.</translation> + </message> +</context> +<context> + <name>QDeclarativeParentAnimation</name> + <message> + <source>Unable to preserve appearance under complex transform</source> + <translation>Impossible de conserver l'aspect lors d'une transformation complexe</translation> + </message> + <message> + <source>Unable to preserve appearance under non-uniform scale</source> + <translation>Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme</translation> + </message> + <message> + <source>Unable to preserve appearance under scale of 0</source> + <translation>Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0</translation> + </message> +</context> +<context> + <name>QDeclarativeParentChange</name> + <message> + <source>Unable to preserve appearance under complex transform</source> + <translation>Impossible de conserver l'aspect lors d'une transformation complexe</translation> + </message> + <message> + <source>Unable to preserve appearance under non-uniform scale</source> + <translation>Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme</translation> + </message> + <message> + <source>Unable to preserve appearance under scale of 0</source> + <translation>Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0</translation> + </message> +</context> +<context> + <name>QDeclarativeParser</name> + <message> + <source>Illegal unicode escape sequence</source> + <translation>Séquence d'échappement Unicode illégale</translation> + </message> + <message> + <source>Illegal character</source> + <translation>Caractère illégal</translation> + </message> + <message> + <source>Unclosed string at end of line</source> + <translation>Chaîne de caractères non fermée en fin de ligne</translation> + </message> + <message> + <source>Illegal escape squence</source> + <translation>Séquence d'échappement illégale</translation> + </message> + <message> + <source>Unclosed comment at end of file</source> + <translation>Commentaire non fermé en fin de ligne</translation> + </message> + <message> + <source>Illegal syntax for exponential number</source> + <translation>Syntaxe illégale pour un nombre exponentiel</translation> + </message> + <message> + <source>Identifier cannot start with numeric literal</source> + <translation>Impossible de commencer un identifiant par un chiffre</translation> + </message> + <message> + <source>Unterminated regular expression literal</source> + <translation>Élément non terminé pour l'expression régulière</translation> + </message> + <message> + <source>Invalid regular expression flag '%0'</source> + <translation>Drapeau '%0' invalid pour l'expression régulière</translation> + </message> + <message> + <source>Unterminated regular expression backslash sequence</source> + <translation>Séquence antislash non terminée pour l'expression régulière</translation> + </message> + <message> + <source>Unterminated regular expression class</source> + <translation>Classe non terminée pour l'expression régulière</translation> + </message> + <message> + <source>Syntax error</source> + <translation>Erreur de syntaxe</translation> + </message> + <message> + <source>Unexpected token `%1'</source> + <translation>jeton inattendu '%1'</translation> + </message> + <message> + <source>Expected token `%1'</source> + <translation>jeton attendu '%1'</translation> + </message> + <message> + <source>Property value set multiple times</source> + <translation>valeur de propriété attribuée à plusieurs reprises</translation> + </message> + <message> + <source>Expected type name</source> + <translation>Nom de type attendu</translation> + </message> + <message> + <source>Invalid import qualifier ID</source> + <translation>qualificatif id d'importation invalide</translation> + </message> + <message> + <source>Reserved name "Qt" cannot be used as an qualifier</source> + <translation>"Qt" est un nom réservé et ne peut pas être utilisé comme qualificatif</translation> + </message> + <message> + <source>Script import qualifiers must be unique.</source> + <translatorcomment>??</translatorcomment> + <translation>Les qualificatifs d'importation de script doivent être uniques.</translation> + </message> + <message> + <source>Script import requires a qualifier</source> + <translation>L'importation de script exige un qualificatif</translation> + </message> + <message> + <source>Library import requires a version</source> + <translation>L'importation de bibliothèque exige une version</translation> + </message> + <message> + <source>Expected parameter type</source> + <translation>Type de paramètre attendu</translation> + </message> + <message> + <source>Invalid property type modifier</source> + <translation>Modificateur invalide pour le type de propriété</translation> + </message> + <message> + <source>Unexpected property type modifier</source> + <translation>Modificateur inattendu pour le type de propriété</translation> + </message> + <message> + <source>Expected property type</source> + <translation>Type de propriété attendu</translation> + </message> + <message> + <source>Readonly not yet supported</source> + <translation>La lecture seule n'est pas encore implémentée</translation> + </message> + <message> + <source>JavaScript declaration outside Script element</source> + <translation>Déclaration JavaScript en dehors de l'élément Script</translation> + </message> +</context> +<context> + <name>QDeclarativePauseAnimation</name> + <message> + <source>Cannot set a duration of < 0</source> + <translation>Impossible d'attribuer une durée < 0</translation> + </message> +</context> +<context> + <name>QDeclarativePixmap</name> + <message> + <source>Error decoding: %1: %2</source> + <translation>Erreur de décodage : %1 : %2</translation> + </message> + <message> + <source>Failed to get image from provider: %1</source> + <translation>Impossible d'obtenir l'image du fournisseur : %1</translation> + </message> + <message> + <source>Cannot open: %1</source> + <translation>Impossible d'ouvrir : %1</translation> + </message> +</context> +<context> + <name>QDeclarativePixmapCache</name> + <message> + <source>Error decoding: %1: %2</source> + <translation type="obsolete">Erreur de décodage : %1 : %2</translation> + </message> + <message> + <source>Failed to get image from provider: %1</source> + <translation type="obsolete">Impossible d'obtenir l'image du fournisseur : %1</translation> + </message> + <message> + <source>Cannot open: %1</source> + <translation type="obsolete">Impossible d'ouvrir : %1</translation> + </message> + <message> + <source>Unknown Error loading %1</source> + <translation type="obsolete">Erreur de chargement inconnue : %1</translation> + </message> +</context> +<context> + <name>QDeclarativePropertyAnimation</name> + <message> + <source>Cannot set a duration of < 0</source> + <translation>Impossible d'attribuer une durée < 0</translation> + </message> +</context> +<context> + <name>QDeclarativePropertyChanges</name> + <message> + <source>PropertyChanges does not support creating state-specific objects.</source> + <translation>PropertyChanges n'est pas compatible avec la création d'objets spécifiques à un état.</translation> + </message> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Ne peut pas assigner à la propriété inexistante "%1"</translation> + </message> + <message> + <source>Cannot assign to read-only property "%1"</source> + <translation>Ne peut pas assigner à la propriété en lecture seule "%1"</translation> + </message> +</context> +<context> + <name>QDeclarativeTextInput</name> + <message> + <source>Could not load cursor delegate</source> + <translation>Impossible de charger le délégué de curseur</translation> + </message> + <message> + <source>Could not instantiate cursor delegate</source> + <translation>Impossible d'instancier le délégué de curseur</translation> + </message> +</context> +<context> + <name>QDeclarativeVME</name> + <message> + <source>Unable to create object of type %1</source> + <translation>Impossible de créer un objet de type %1</translation> + </message> + <message> + <source>Cannot assign value %1 to property %2</source> + <translation>Impossible d'assigner la valeur %1 à la propriété %2</translation> + </message> + <message> + <source>Cannot assign object type %1 with no default method</source> + <translation>Impossible d'assigner un objet de type %1 sans méthode par défaut</translation> + </message> + <message> + <source>Cannot connect mismatched signal/slot %1 %vs. %2</source> + <translatorcomment>le vs a confirmer</translatorcomment> + <translation>Impossible de connecter le signal/slot %1 %vs. %2 pour cause d'incompatibilité</translation> + </message> + <message> + <source>Cannot assign an object to signal property %1</source> + <translation>Impossible d'assigner un objet à la propriété %1 d'un signal</translation> + </message> + <message> + <source>Cannot assign object to list</source> + <translation>Impossible d'assigner un objet à une liste</translation> + </message> + <message> + <source>Cannot assign object to interface property</source> + <translation>Impossible d'assigner un objet à la propriété d'une interface</translation> + </message> + <message> + <source>Unable to create attached object</source> + <translation>Impossible de créer un objet attaché</translation> + </message> + <message> + <source>Cannot set properties on %1 as it is null</source> + <translation>Impossible d'attribuer les propriétés à %1 car ce dernier est nul</translation> + </message> +</context> +<context> + <name>QDeclarativeVisualDataModel</name> + <message> + <source>Delegate component must be Item type.</source> + <translation>Un composant délégué doit être de type Item.</translation> + </message> +</context> +<context> + <name>QDeclarativeXmlListModel</name> + <message> + <source>Qt was built without support for xmlpatterns</source> + <translation>Qt a été compilé sans support pour xmlpatterns</translation> + </message> +</context> +<context> + <name>QDeclarativeXmlListModelRole</name> + <message> + <source>An XmlRole query must not start with '/'</source> + <translation>Une requête XmlRole ne doit pas commencer par '/'</translation> + </message> +</context> +<context> + <name>QDeclarativeXmlRoleList</name> + <message> + <source>An XmlListModel query must start with '/' or "//"</source> + <translation>Une requête XmlListModel doit commencer par '/' ou "//"</translation> + </message> +</context> +<context> <name>QDial</name> <message> <source>QDial</source> @@ -1188,7 +2456,7 @@ en </message> <message> <source>SliderHandle</source> - <translation>Poignée</translation> + <translation>Poignée du slider</translation> </message> </context> <context> @@ -1312,13 +2580,11 @@ en <translation>Taille</translation> </message> <message> - <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+457"/> <source>Kind</source> <comment>Match OS X Finder</comment> <translation>Type</translation> </message> <message> - <location line="+2"/> <source>Type</source> <comment>All other platforms</comment> <translation>Type</translation> @@ -1329,11 +2595,11 @@ en </message> <message> <source>Kind</source> - <translation>Type</translation> + <translation type="obsolete">Type</translation> </message> <message> <source>Type</source> - <translation>Type</translation> + <translation type="obsolete">Type</translation> </message> </context> <context> @@ -1374,15 +2640,15 @@ en </message> <message> <source>Debug Message:</source> - <translation>Message de débogage:</translation> + <translation>Message de débogage : </translation> </message> <message> <source>Warning:</source> - <translation>Avertissement:</translation> + <translation>Avertissement : </translation> </message> <message> <source>Fatal Error:</source> - <translation>Erreur fatale:</translation> + <translation>Erreur fatale : </translation> </message> </context> <context> @@ -1413,7 +2679,7 @@ en </message> <message> <source>Will not rename sequential file using block copy</source> - <translation>Ne renommera pas le fichier séquentiel avec la copie bloc</translation> + <translation>Ne renommera pas le fichier séquentiel avec la copie par blocs</translation> </message> </context> <context> @@ -1489,11 +2755,11 @@ Veuillez vérifier que le nom du fichier est correct.</translation> </message> <message> <source>Files of type:</source> - <translation>Fichiers de type :</translation> + <translation>Fichiers de type : </translation> </message> <message> <source>Directory:</source> - <translation>Dossier :</translation> + <translation>Dossier : </translation> </message> <message> <source> @@ -1519,7 +2785,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Are sure you want to delete '%1'?</source> - <translation>Etes-vous sûr de vouloir supprimer '%1' ?</translation> + <translation>Êtes-vous sûr de vouloir supprimer '%1' ?</translation> </message> <message> <source>Could not delete directory.</source> @@ -1542,6 +2808,26 @@ Voulez-vous quand même le supprimer ?</translation> <translation>Fichier</translation> </message> <message> + <source>File Folder</source> + <comment>Match Windows Explorer</comment> + <translation>Fichier Dossier</translation> + </message> + <message> + <source>Folder</source> + <comment>All other platforms</comment> + <translation>Dossier</translation> + </message> + <message> + <source>Alias</source> + <comment>Mac OS X Finder</comment> + <translation>Alias</translation> + </message> + <message> + <source>Shortcut</source> + <comment>All other platforms</comment> + <translation>Raccourci</translation> + </message> + <message> <source>Unknown</source> <translation>Inconnu</translation> </message> @@ -1551,7 +2837,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Show </source> - <translation>Montrer </translation> + <translation>Afficher</translation> </message> <message> <source>Forward</source> @@ -1575,11 +2861,11 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>File &name:</source> - <translation>&Nom de fichier :</translation> + <translation>&Nom de fichier : </translation> </message> <message> <source>Look in:</source> - <translation>Voir dans:</translation> + <translation>Voir dans : </translation> </message> <message> <source>Create New Folder</source> @@ -1587,19 +2873,43 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>File Folder</source> - <translation>Fichier Dossier</translation> + <translation type="obsolete">Fichier Dossier</translation> </message> <message> <source>Folder</source> - <translation>Dossier</translation> + <translation type="obsolete">Dossier</translation> </message> <message> <source>Alias</source> - <translation>Alias</translation> + <translation type="obsolete">Alias</translation> </message> <message> <source>Shortcut</source> - <translation>Raccourci</translation> + <translation type="obsolete">Raccourci</translation> + </message> + <message> + <source>Go back</source> + <translation>Précédent</translation> + </message> + <message> + <source>Go forward</source> + <translation>Suivant</translation> + </message> + <message> + <source>Go to the parent directory</source> + <translation>Dossier parent</translation> + </message> + <message> + <source>Create a New Folder</source> + <translation>Créer un nouveau dossier</translation> + </message> + <message> + <source>Change to list view mode</source> + <translation>Affichage liste</translation> + </message> + <message> + <source>Change to detail view mode</source> + <translation>Affichage détaillé</translation> </message> </context> <context> @@ -1641,13 +2951,11 @@ Voulez-vous quand même le supprimer ?</translation> <translation>Taille</translation> </message> <message> - <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+898"/> <source>Kind</source> <comment>Match OS X Finder</comment> <translation>Type</translation> </message> <message> - <location line="+2"/> <source>Type</source> <comment>All other platforms</comment> <translation>Type</translation> @@ -1658,7 +2966,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>My Computer</source> - <translation>Mon ordinateur</translation> + <translation>Poste de travail</translation> </message> <message> <source>Computer</source> @@ -1666,11 +2974,11 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Kind</source> - <translation>Type</translation> + <translation type="obsolete">Type</translation> </message> <message> <source>Type</source> - <translation>Type</translation> + <translation type="obsolete">Type</translation> </message> <message> <source>%1 byte(s)</source> @@ -1689,11 +2997,11 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Demi Bold</source> - <translation>Semi Gras</translation> + <translation>Demi-gras</translation> </message> <message> <source>Black</source> - <translation>Noir</translation> + <translation>Extra-gras</translation> </message> <message> <source>Demi</source> @@ -1701,7 +3009,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Light</source> - <translation>Léger</translation> + <translation>Maigre</translation> </message> <message> <source>Italic</source> @@ -1745,11 +3053,11 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Thaana</source> - <translation>Thaana</translation> + <translation>Thâna</translation> </message> <message> <source>Devanagari</source> - <translation>Devanagari</translation> + <translation>Dévanagari</translation> </message> <message> <source>Bengali</source> @@ -1769,7 +3077,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Tamil</source> - <translation>Tamil</translation> + <translation>Tamoul</translation> </message> <message> <source>Telugu</source> @@ -1909,11 +3217,11 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Connection to %1 closed</source> - <translation>Connexion à %1 arrêtée</translation> + <translation>Connexion à %1 fermée</translation> </message> <message> <source>Connection closed</source> - <translation>Connexion arrêtée</translation> + <translation>Connexion fermée</translation> </message> <message> <source>Host %1 not found</source> @@ -1940,7 +3248,7 @@ Voulez-vous quand même le supprimer ?</translation> <message> <source>Login failed: %1</source> - <translation>Échec du login: + <translation>Échec du login : %1</translation> </message> <message> @@ -1995,11 +3303,22 @@ Voulez-vous quand même le supprimer ?</translation> </message> </context> <context> + <name>QGstreamerPlayerSession</name> + <message> + <source>Unable to play %1</source> + <translation>Impossible de lire %1</translation> + </message> +</context> +<context> <name>QHostInfo</name> <message> <source>Unknown error</source> <translation>Erreur inconnue</translation> </message> + <message> + <source>No host name given</source> + <translation>Aucun nom d'hôte n'a été donné</translation> + </message> </context> <context> <name>QHostInfoAgent</name> @@ -2021,7 +3340,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Invalid hostname</source> - <translation>Nom d'hôte non valide</translation> + <translation>Nom d'hôte invalide</translation> </message> </context> <context> @@ -2060,11 +3379,11 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Connection to %1 closed</source> - <translation>Connexion à %1 arrêtée</translation> + <translation>Connexion à %1 fermée</translation> </message> <message> <source>Connection closed</source> - <translation>Connexion arrêtée</translation> + <translation>Connexion fermée</translation> </message> <message> <source>Unknown error</source> @@ -2124,7 +3443,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>SSL handshake failed</source> - <translation>le handshake SSL a échoué</translation> + <translation>La poignée de main SSL a échoué</translation> </message> <message> <source>Connection refused (or timed out)</source> @@ -2151,7 +3470,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Proxy denied connection</source> - <translation>Le Proxy a rejeté la connexion</translation> + <translation>Le proxy a rejeté la connexion</translation> </message> <message> <source>Error communicating with HTTP proxy</source> @@ -2268,7 +3587,7 @@ Voulez-vous quand même le supprimer ?</translation> <name>QIODevice</name> <message> <source>Permission denied</source> - <translation>Accès refusé</translation> + <translation>Autorisation refusée</translation> </message> <message> <source>Too many open files</source> @@ -2318,22 +3637,22 @@ Voulez-vous quand même le supprimer ?</translation> <name>QInputDialog</name> <message> <source>Enter a value:</source> - <translation>Entrer une valeur :</translation> + <translation>Entrer une valeur : </translation> </message> </context> <context> <name>QLibrary</name> <message> <source>QLibrary::load_sys: Cannot load %1 (%2)</source> - <translation type="obsolete">QLibrary::load_sys: Impossible de charger %1 (%2)</translation> + <translation type="obsolete">QLibrary::load_sys : Impossible de charger %1 (%2)</translation> </message> <message> <source>QLibrary::unload_sys: Cannot unload %1 (%2)</source> - <translation type="obsolete">QLibrary::unload_sys: Impossible de décharger %1 (%2)</translation> + <translation type="obsolete">QLibrary::unload_sys : Impossible de décharger %1 (%2)</translation> </message> <message> <source>QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3)</source> - <translation type="obsolete">QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3)</translation> + <translation type="obsolete">QLibrary::resolve_sys : Symbole "%1" non défini dans %2 (%3)</translation> </message> <message> <source>Could not mmap '%1': %2</source> @@ -2419,58 +3738,58 @@ Voulez-vous quand même le supprimer ?</translation> <name>QLocalServer</name> <message> <source>%1: Name error</source> - <translation>%1: Erreur de nom</translation> + <translation>%1 : Erreur de nom</translation> </message> <message> <source>%1: Permission denied</source> - <translation>%1: Permission refusée</translation> + <translation>%1 : Permission refusée</translation> </message> <message> <source>%1: Address in use</source> - <translation>%1: Address déjà utilisée</translation> + <translation>%1 : Address déjà utilisée</translation> </message> <message> <source>%1: Unknown error %2</source> - <translation>%1: Erreur inconnue %2</translation> + <translation>%1 : Erreur inconnue %2</translation> </message> </context> <context> <name>QLocalSocket</name> <message> <source>%1: Connection refused</source> - <translation>%1: Connexion refusée</translation> + <translation>%1 : Connexion refusée</translation> </message> <message> <source>%1: Remote closed</source> - <translation>%1: Connexion fermée</translation> + <translation>%1 : Connexion fermée</translation> </message> <message> <source>%1: Invalid name</source> - <translation>%1: Nom invalide</translation> + <translation>%1 : Nom invalide</translation> </message> <message> <source>%1: Socket access error</source> - <translation>%1: Erreur d'accès au socket</translation> + <translation>%1 : Erreur d'accès au socket</translation> </message> <message> <source>%1: Socket resource error</source> - <translation>%1: Erreur de ressource du socket</translation> + <translation>%1 : Erreur de ressource du socket</translation> </message> <message> <source>%1: Socket operation timed out</source> - <translation>%1: L'opération socket a expiré</translation> + <translation>%1 : L'opération socket a expiré</translation> </message> <message> <source>%1: Datagram too large</source> - <translation>%1: Datagramme trop grand</translation> + <translation>%1 : Datagramme trop grand</translation> </message> <message> <source>%1: Connection error</source> - <translation>%1: Erreur de connexion</translation> + <translation>%1 : Erreur de connexion</translation> </message> <message> <source>%1: The socket operation is not supported</source> - <translation>%1: L'opération n'est pas supportée</translation> + <translation>%1 : L'opération n'est pas supportée</translation> </message> <message> <source>%1: Unknown error</source> @@ -2478,7 +3797,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>%1: Unknown error %2</source> - <translation>%1: Erreur inconnue %2</translation> + <translation>%1 : Erreur inconnue %2</translation> </message> </context> <context> @@ -2634,6 +3953,28 @@ Voulez-vous quand même le supprimer ?</translation> </message> </context> <context> + <name>QMediaPlayer</name> + <message> + <source>The QMediaPlayer object does not have a valid service</source> + <translation>Pas de service valide pour l'objet QMediaPlayer</translation> + </message> +</context> +<context> + <name>QMediaPlaylist</name> + <message> + <source>Could not add items to read only playlist.</source> + <translation>Impossible d'ajouter des éléments à une liste de lecture en lecture seule.</translation> + </message> + <message> + <source>Playlist format is not supported</source> + <translation>Le format de liste de lecture n'est pas supporté</translation> + </message> + <message> + <source>The file could not be accessed.</source> + <translation>Impossible d'accéder au fichier.</translation> + </message> +</context> +<context> <name>QMenu</name> <message> <source>Close</source> @@ -2652,7 +3993,7 @@ Voulez-vous quand même le supprimer ?</translation> <name>QMenuBar</name> <message> <source>About</source> - <translation type="obsolete">A propos</translation> + <translation type="obsolete">À propos</translation> </message> <message> <source>Config</source> @@ -2684,7 +4025,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>About %1</source> - <translation type="obsolete">A propos de %1</translation> + <translation type="obsolete">À propos de %1</translation> </message> <message> <source>About Qt</source> @@ -2723,7 +4064,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com/</a> for more information.</p></source> - <translation type="obsolete"><h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></translation> + <translation type="obsolete"><h3>À propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http : //qt.nokia.com/">qt.nokia.com</a> for more information.</p></translation> </message> <message> <source>Show Details...</source> @@ -2734,21 +4075,20 @@ Voulez-vous quand même le supprimer ?</translation> <translation>Cacher les détails...</translation> </message> <message> - <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1693"/> <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://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></source> - <translation><h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p></translation> + <translation type="obsolete"><h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés comme Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http : //qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p></translation> </message> <message> <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></source> - <translation type="obsolete"><h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p></translation> + <translation type="obsolete"><h3>À propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p></translation> </message> <message> <source><p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p></source> - <translation type="obsolete"><p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p></translation> + <translation type="obsolete"><p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http : //qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p></translation> </message> <message> <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></source> - <translation type="obsolete"><h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p></translation> + <translation type="obsolete"><h3>À propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p></translation> </message> <message> <source><h3>About Qt</h3><p>This program uses Qt version %1.</p></source> @@ -2756,7 +4096,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source><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><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://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></source> - <translation><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p></translation> + <translation><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés comme Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http : //qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p></translation> </message> </context> <context> @@ -2809,7 +4149,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Permission denied</source> - <translation>Accès refusé</translation> + <translation>Autorisation refusée</translation> </message> <message> <source>Connection timed out</source> @@ -2892,6 +4232,32 @@ Voulez-vous quand même le supprimer ?</translation> </message> </context> <context> + <name>QNetworkAccessDataBackend</name> + <message> + <source>Operation not supported on %1</source> + <translation>Opération non supportée sur %1</translation> + </message> + <message> + <source>Invalid URI: %1</source> + <translation>URI invalide : %1</translation> + </message> +</context> +<context> + <name>QNetworkAccessDebugPipeBackend</name> + <message> + <source>Write error writing to %1: %2</source> + <translation>Erreur lors de l'écriture dans %1 : %2</translation> + </message> + <message> + <source>Socket error on %1: %2</source> + <translation>Erreur de socket sur %1 : %2</translation> + </message> + <message> + <source>Remote host closed the connection prematurely on %1</source> + <translation>L'hôte distant a fermé sa connexion de façon prématurée sur %1</translation> + </message> +</context> +<context> <name>QNetworkAccessFileBackend</name> <message> <source>Request for opening non-local file %1</source> @@ -2945,15 +4311,30 @@ Voulez-vous quand même le supprimer ?</translation> </message> </context> <context> + <name>QNetworkAccessManager</name> + <message> + <source>Network access is disabled.</source> + <translation>L'accès au réseau est désactivé.</translation> + </message> +</context> +<context> <name>QNetworkReply</name> <message> <source>Error downloading %1 - server replied: %2</source> - <translation>Erreur lors du téléchargement de %1 - le serveur a répondu: %2</translation> + <translation>Erreur lors du téléchargement de %1 - le serveur a répondu : %2</translation> </message> <message> <source>Protocol "%1" is unknown</source> <translation>Le protocole "%1" est inconnu</translation> </message> + <message> + <source>Network session error.</source> + <translation>Erreur de session réseau.</translation> + </message> + <message> + <source>Temporary network failure.</source> + <translation>Erreur réseau temporaire.</translation> + </message> </context> <context> <name>QNetworkReplyImpl</name> @@ -2963,13 +4344,54 @@ Voulez-vous quand même le supprimer ?</translation> </message> </context> <context> + <name>QNetworkSession</name> + <message> + <source>Invalid configuration.</source> + <translation>Configuration invalide.</translation> + </message> +</context> +<context> + <name>QNetworkSessionPrivateImpl</name> + <message> + <source>Roaming error</source> + <translation>Erreur de roaming</translation> + </message> + <message> + <source>Session aborted by user or system</source> + <translation>Session annulée par l'utilisateur ou le système</translation> + </message> + <message> + <source>Unidentified Error</source> + <translation>Erreur inconnue</translation> + </message> + <message> + <source>Unknown session error.</source> + <translation>Erreur de session inconnue.</translation> + </message> + <message> + <source>The session was aborted by the user or system.</source> + <translation>la session a été annulée par l'utilisateur ou le système.</translation> + </message> + <message> + <source>The requested operation is not supported by the system.</source> + <translation>L'opération requise n'est pas suportée par le système.</translation> + </message> + <message> + <source>The specified configuration cannot be used.</source> + <translation>La configuration spécifiée ne peut être utilisée.</translation> + </message> + <message> + <source>Roaming was aborted or is not possible.</source> + <translation>Le roaming a été annulé ou est impossible.</translation> + </message> +</context> +<context> <name>QOCIDriver</name> <message> <source>Unable to logon</source> <translation>Impossible d'ouvrir une session</translation> </message> <message> - <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+1925"/> <source>Unable to initialize</source> <comment>QOCIDriver</comment> <translation>L'initialisation a échoué</translation> @@ -2988,7 +4410,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Unable to initialize</source> - <translation>L'initialisation a échoué</translation> + <translation type="obsolete">L'initialisation a échoué</translation> </message> </context> <context> @@ -3037,9 +4459,8 @@ Voulez-vous quand même le supprimer ?</translation> <translation>Incapable d'établir une connexion</translation> </message> <message> - <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1791"/> <source>Unable to connect - Driver doesn't support all needed functionality</source> - <translation>Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires</translation> + <translation type="obsolete">Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires</translation> </message> <message> <source>Unable to disable autocommit</source> @@ -3066,7 +4487,7 @@ Voulez-vous quand même le supprimer ?</translation> <name>QODBCResult</name> <message> <source>QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration</source> - <translation>QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC</translation> + <translation>QODBCResult::reset : Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC</translation> </message> <message> <source>Unable to execute statement</source> @@ -3104,48 +4525,56 @@ Voulez-vous quand même le supprimer ?</translation> <context> <name>QObject</name> <message> - <location filename="../src/gui/util/qdesktopservices_mac.cpp" line="+165"/> <source>Home</source> - <translation>Début</translation> + <translation type="obsolete">Début</translation> </message> <message> <source>Operation not supported on %1</source> - <translation>Opération non supportée sur %1</translation> + <translation type="obsolete">Opération non supportée sur %1</translation> </message> <message> <source>Invalid URI: %1</source> - <translation>URI invalide : %1</translation> + <translation type="obsolete">URI invalide : %1</translation> </message> <message> - <location filename="../src/network/access/qnetworkaccessdebugpipebackend.cpp" line="+175"/> <source>Write error writing to %1: %2</source> - <translation>Erreur d'écriture sur %1 : %2</translation> + <translation type="obsolete">Erreur d'écriture sur %1 : %2</translation> </message> <message> - <location line="+57"/> <source>Read error reading from %1: %2</source> - <translation>Erreur de lecture sur %1 : %2</translation> + <translation type="obsolete">Erreur de lecture sur %1 : %2</translation> </message> <message> <source>Socket error on %1: %2</source> - <translation>Erreur de socket sur %1 : %2</translation> + <translation type="obsolete">Erreur de socket sur %1 : %2</translation> </message> <message> <source>Remote host closed the connection prematurely on %1</source> - <translation>L'hôte distant a fermé sa connexion de façon prématurée sur %1</translation> + <translation type="obsolete">L'hôte distant a fermé sa connexion de façon prématurée sur %1</translation> </message> <message> - <location line="+99"/> <source>Protocol error: packet of size 0 received</source> - <translation>Erreur de protocole: paquet de taille 0 reçu</translation> + <translation type="obsolete">Erreur de protocole : paquet de taille 0 reçu</translation> </message> <message> <source>No host name given</source> - <translation>Nom d'hôte manquant</translation> + <translation type="obsolete">Nom d'hôte manquant</translation> </message> <message> <source>Invalid hostname</source> - <translation>Nom d'hôte non valide</translation> + <translation type="obsolete">Nom d'hôte invalide</translation> + </message> + <message> + <source>PulseAudio Sound Server</source> + <translation>Serveur de son PulseAudio</translation> + </message> + <message> + <source>"%1" duplicates a previous role name and will be disabled.</source> + <translation>"%1" est un doublon d'un nom de role existant et sera désactivé.</translation> + </message> + <message> + <source>invalid query: "%1"</source> + <translation>Requête invalide : "%1"</translation> </message> </context> <context> @@ -3225,19 +4654,19 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Page size:</source> - <translation>Dimensions :</translation> + <translation>Dimensions : </translation> </message> <message> <source>Width:</source> - <translation>Largeur :</translation> + <translation>Largeur : </translation> </message> <message> <source>Height:</source> - <translation>Hauteur :</translation> + <translation>Hauteur : </translation> </message> <message> <source>Paper source:</source> - <translation>Source du papier :</translation> + <translation>Source du papier : </translation> </message> <message> <source>Orientation</source> @@ -3327,7 +4756,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Number of copies:</source> - <translation type="obsolete">Nombre de copies :</translation> + <translation type="obsolete">Nombre de copies : </translation> </message> <message> <source>Paper format</source> @@ -3442,6 +4871,10 @@ Voulez-vous quand même le supprimer ?</translation> <translation>US Common #10 Envelope (105 x 241 mm)</translation> </message> <message> + <source>Print current page</source> + <translation>Imprimer la page courante</translation> + </message> + <message> <source>Aliases: %1</source> <translation>Alias : %1</translation> </message> @@ -3471,19 +4904,19 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Page size:</source> - <translation type="obsolete">Dimensions :</translation> + <translation type="obsolete">Dimensions : </translation> </message> <message> <source>Orientation:</source> - <translation type="obsolete">Orientation :</translation> + <translation type="obsolete">Orientation : </translation> </message> <message> <source>Paper source:</source> - <translation type="obsolete">Source du papier :</translation> + <translation type="obsolete">Source du papier : </translation> </message> <message> <source>Print</source> - <translation>Impr écran</translation> + <translation>Imprimer</translation> </message> <message> <source>File</source> @@ -3503,7 +4936,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Size:</source> - <translation type="obsolete">Taille :</translation> + <translation type="obsolete">Taille : </translation> </message> <message> <source>Properties</source> @@ -3511,7 +4944,7 @@ Voulez-vous quand même le supprimer ?</translation> </message> <message> <source>Printer info:</source> - <translation type="obsolete">Informations sur l'imprimante :</translation> + <translation type="obsolete">Informations sur l'imprimante : </translation> </message> <message> <source>Browse</source> @@ -3796,11 +5229,11 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Print</source> - <translation>Impr écran</translation> + <translation>Imprimer</translation> </message> <message> <source>Page setup</source> - <translation>Configuration de la page</translation> + <translation>Mise en page</translation> </message> <message> <source>Close</source> @@ -3816,7 +5249,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Page Setup</source> - <translation>Configuration de la page</translation> + <translation>Mise en page</translation> </message> </context> <context> @@ -3885,7 +5318,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Copies:</source> - <translation>Copies :</translation> + <translation>Copies : </translation> </message> <message> <source>Collate</source> @@ -3927,6 +5360,10 @@ Veuillez choisir un nom de fichier différent.</translation> <source>Short side</source> <translation>Côté court</translation> </message> + <message> + <source>Current Page</source> + <translation>Page courante</translation> + </message> </context> <context> <name>QPrintWidget</name> @@ -3940,7 +5377,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>&Name:</source> - <translation>&Nom :</translation> + <translation>&Nom : </translation> </message> <message> <source>P&roperties</source> @@ -3948,7 +5385,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Location:</source> - <translation>Emplacement :</translation> + <translation>Emplacement : </translation> </message> <message> <source>Preview</source> @@ -3956,11 +5393,11 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Type:</source> - <translation>Type :</translation> + <translation>Type : </translation> </message> <message> <source>Output &file:</source> - <translation>&Fichier de sortie:</translation> + <translation>&Fichier de sortie : </translation> </message> <message> <source>...</source> @@ -4002,13 +5439,12 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Aucun programme défini</translation> </message> <message> - <location filename="../src/corelib/io/qprocess_win.cpp" line="+464"/> <source>Process failed to start</source> - <translation>Le processus n'a pas démarré</translation> + <translation type="obsolete">Le processus n'a pas démarré</translation> </message> <message> <source>Process failed to start: %1</source> - <translation>Le démarrage du processus a échoué: %1</translation> + <translation>Le démarrage du processus a échoué : %1</translation> </message> </context> <context> @@ -4072,19 +5508,18 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>invalid interval</source> - <translation>intervalle non valide</translation> + <translation>intervalle invalide</translation> </message> <message> <source>invalid category</source> - <translation>catégorie non valide</translation> + <translation>catégorie invalide</translation> </message> </context> <context> <name>QSQLite2Driver</name> <message> - <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+396"/> <source>Error to open database</source> - <translation>Erreur à l'ouverture de la base de données</translation> + <translation type="obsolete">Erreur à l'ouverture de la base de données</translation> </message> <message> <source>Unable to begin transaction</source> @@ -4095,9 +5530,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Impossible de soumettre la transaction</translation> </message> <message> - <location line="+75"/> <source>Unable to rollback Transaction</source> - <translation>Impossible d'annuler la transaction</translation> + <translation type="obsolete">Impossible d'annuler la transaction</translation> </message> <message> <source>Error opening database</source> @@ -4174,6 +5608,281 @@ Veuillez choisir un nom de fichier différent.</translation> </message> </context> <context> + <name>QScriptBreakpointsModel</name> + <message> + <source>ID</source> + <translation>Identifiant</translation> + </message> + <message> + <source>Location</source> + <translation>Lieu</translation> + </message> + <message> + <source>Condition</source> + <translation>Condition</translation> + </message> + <message> + <source>Ignore-count</source> + <translation>Nombre d'ignorés</translation> + </message> + <message> + <source>Single-shot</source> + <translation>Un seul coup</translation> + </message> + <message> + <source>Hit-count</source> + <translation>Nombre de coups</translation> + </message> +</context> +<context> + <name>QScriptBreakpointsWidget</name> + <message> + <source>New</source> + <translation>Créer</translation> + </message> + <message> + <source>Delete</source> + <translation>Supprimer</translation> + </message> +</context> +<context> + <name>QScriptDebugger</name> + <message> + <source>Go to Line</source> + <translation>Aller à la ligne</translation> + </message> + <message> + <source>Line:</source> + <translation>Ligne : </translation> + </message> + <message> + <source>Interrupt</source> + <translation>Interrompre</translation> + </message> + <message> + <source>Shift+F5</source> + <translation>Shift+F5</translation> + </message> + <message> + <source>Continue</source> + <translation>Continuer</translation> + </message> + <message> + <source>F5</source> + <translation>F5</translation> + </message> + <message> + <source>Step Into</source> + <translation>Pas à pas détaillé</translation> + </message> + <message> + <source>F11</source> + <translation>F11</translation> + </message> + <message> + <source>Step Over</source> + <translation>Pas à pas principal</translation> + </message> + <message> + <source>F10</source> + <translation>F10</translation> + </message> + <message> + <source>Step Out</source> + <translation>Pas à pas sortant</translation> + </message> + <message> + <source>Shift+F11</source> + <translation>Shift+F11</translation> + </message> + <message> + <source>Run to Cursor</source> + <translation>Exécuter au curseur</translation> + </message> + <message> + <source>Ctrl+F10</source> + <translation>Ctrl+F10</translation> + </message> + <message> + <source>Run to New Script</source> + <translation>Exécuter au nouveau script</translation> + </message> + <message> + <source>Toggle Breakpoint</source> + <translation>Basculer le point d'arrêt</translation> + </message> + <message> + <source>F9</source> + <translation>F9</translation> + </message> + <message> + <source>Clear Debug Output</source> + <translation>Effacer les résultats du débogage</translation> + </message> + <message> + <source>Clear Error Log</source> + <translation>Effacer le journal d'erreurs</translation> + </message> + <message> + <source>Clear Console</source> + <translation>Effacer la console</translation> + </message> + <message> + <source>&Find in Script...</source> + <translation>&Chercher dans le script...</translation> + </message> + <message> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> + </message> + <message> + <source>Find &Next</source> + <translation>Résultat &suivant</translation> + </message> + <message> + <source>F3</source> + <translation>F3</translation> + </message> + <message> + <source>Find &Previous</source> + <translation>Chercher &précédent</translation> + </message> + <message> + <source>Shift+F3</source> + <translation>Shift+F3</translation> + </message> + <message> + <source>Ctrl+G</source> + <translation>Ctrl+G</translation> + </message> + <message> + <source>Debug</source> + <translation>Déboguer</translation> + </message> +</context> +<context> + <name>QScriptDebuggerCodeFinderWidget</name> + <message> + <source>Close</source> + <translation>Fermer</translation> + </message> + <message> + <source>Previous</source> + <translation>Précédent</translation> + </message> + <message> + <source>Next</source> + <translation>Suivant</translation> + </message> + <message> + <source>Case Sensitive</source> + <translation>Sensible à la casse</translation> + </message> + <message> + <source>Whole words</source> + <translation>Mots complets</translation> + </message> + <message> + <source><img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped</source> + <translation><img src=" : /qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début</translation> + </message> +</context> +<context> + <name>QScriptDebuggerLocalsModel</name> + <message> + <source>Name</source> + <translation>Nom</translation> + </message> + <message> + <source>Value</source> + <translation>Valeur</translation> + </message> +</context> +<context> + <name>QScriptDebuggerStackModel</name> + <message> + <source>Level</source> + <translation>Niveau</translation> + </message> + <message> + <source>Name</source> + <translation>Nom</translation> + </message> + <message> + <source>Location</source> + <translation>Emplacement</translation> + </message> +</context> +<context> + <name>QScriptEdit</name> + <message> + <source>Toggle Breakpoint</source> + <translation>Basculer le point d'arrêt</translation> + </message> + <message> + <source>Disable Breakpoint</source> + <translation>Désactiver le point d'arrêt</translation> + </message> + <message> + <source>Enable Breakpoint</source> + <translation>Activer le point d'arrêt</translation> + </message> + <message> + <source>Breakpoint Condition:</source> + <translation>Condition du point d'arrêt : </translation> + </message> +</context> +<context> + <name>QScriptEngineDebugger</name> + <message> + <source>Loaded Scripts</source> + <translation>Scripts chargés</translation> + </message> + <message> + <source>Breakpoints</source> + <translation>Points d'arrêt</translation> + </message> + <message> + <source>Stack</source> + <translation>Pile</translation> + </message> + <message> + <source>Locals</source> + <translation>Locaux</translation> + </message> + <message> + <source>Console</source> + <translation>Console</translation> + </message> + <message> + <source>Debug Output</source> + <translation>Résultats du débogage</translation> + </message> + <message> + <source>Error Log</source> + <translation>Journal d'erreurs</translation> + </message> + <message> + <source>Search</source> + <translation>Chercher</translation> + </message> + <message> + <source>View</source> + <translation>Affichage</translation> + </message> + <message> + <source>Qt Script Debugger</source> + <translation>Débogueur de script Qt</translation> + </message> +</context> +<context> + <name>QScriptNewBreakpointWidget</name> + <message> + <source>Close</source> + <translation>Fermer</translation> + </message> +</context> +<context> <name>QScrollBar</name> <message> <source>Scroll here</source> @@ -4181,7 +5890,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Left edge</source> - <translation>Extrême gauche</translation> + <translation>Bord gauche</translation> </message> <message> <source>Top</source> @@ -4189,7 +5898,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Right edge</source> - <translation>Extrême droite</translation> + <translation>Bord droit</translation> </message> <message> <source>Bottom</source> @@ -4283,9 +5992,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>%1 : clé vide</translation> </message> <message> - <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+125"/> <source>%1: unix key file doesn't exists</source> - <translation>%1 : le fichier de clé unix n'existe pas</translation> + <translation type="obsolete">%1 : le fichier de clé unix n'existe pas</translation> </message> <message> <source>%1: ftok failed</source> @@ -4317,17 +6025,18 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>%1: doesn't exist</source> - <translation>%1: n'existe pas</translation> + <translation>%1 : n'existe pas</translation> </message> <message> <source>%1: UNIX key file doesn't exist</source> - <translation>%1: le fichier de clés UNIX n'existe pas</translation> + <translation>%1 : le fichier de clés UNIX n'existe pas</translation> </message> </context> <context> <name>QShortcut</name> <message> <source>Space</source> + <extracomment>This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used.</extracomment> <translation>Espace</translation> </message> <message> @@ -4368,7 +6077,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Print</source> - <translation>Impr écran</translation> + <translation>Imprimer</translation> </message> <message> <source>SysReq</source> @@ -4436,7 +6145,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Stop</source> - <translation>Stop</translation> + <translation>Arrêter</translation> </message> <message> <source>Refresh</source> @@ -4657,17 +6366,164 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Call</source> + <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment> <translation>Appeler</translation> </message> <message> <source>Hangup</source> + <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment> <translation>Raccrocher</translation> </message> <message> + <source>Toggle Call/Hangup</source> + <extracomment>Button that will hang up if we're in call, or make a call if we're not.</extracomment> + <translation>Décrocher/Raccrocher</translation> + </message> + <message> <source>Flip</source> <translation>Retourner</translation> </message> <message> + <source>Voice Dial</source> + <extracomment>Button to trigger voice dialling</extracomment> + <translation>Commande vocale</translation> + </message> + <message> + <source>Last Number Redial</source> + <extracomment>Button to redial the last number called</extracomment> + <translation>Bis</translation> + </message> + <message> + <source>Camera Shutter</source> + <extracomment>Button to trigger the camera shutter (take a picture)</extracomment> + <translation>Déclencheur appareil photo</translation> + </message> + <message> + <source>Camera Focus</source> + <extracomment>Button to focus the camera</extracomment> + <translation>Focus appareil photo</translation> + </message> + <message> + <source>Kanji</source> + <translation></translation> + </message> + <message> + <source>Muhenkan</source> + <translation></translation> + </message> + <message> + <source>Henkan</source> + <translation></translation> + </message> + <message> + <source>Romaji</source> + <translation></translation> + </message> + <message> + <source>Hiragana</source> + <translation></translation> + </message> + <message> + <source>Katakana</source> + <translation></translation> + </message> + <message> + <source>Hiragana Katakana</source> + <translation></translation> + </message> + <message> + <source>Zenkaku</source> + <translation></translation> + </message> + <message> + <source>Hankaku</source> + <translation></translation> + </message> + <message> + <source>Zenkaku Hankaku</source> + <translation></translation> + </message> + <message> + <source>Touroku</source> + <translation></translation> + </message> + <message> + <source>Massyo</source> + <translation></translation> + </message> + <message> + <source>Kana Lock</source> + <translation></translation> + </message> + <message> + <source>Kana Shift</source> + <translation></translation> + </message> + <message> + <source>Eisu Shift</source> + <translation></translation> + </message> + <message> + <source>Eisu toggle</source> + <translation></translation> + </message> + <message> + <source>Code input</source> + <translation></translation> + </message> + <message> + <source>Multiple Candidate</source> + <translation>Candidat multiple</translation> + </message> + <message> + <source>Previous Candidate</source> + <translation>Candidat précédent</translation> + </message> + <message> + <source>Hangul</source> + <translation></translation> + </message> + <message> + <source>Hangul Start</source> + <translation>Hangul début</translation> + </message> + <message> + <source>Hangul End</source> + <translation>Hangul Fin</translation> + </message> + <message> + <source>Hangul Hanja</source> + <translation></translation> + </message> + <message> + <source>Hangul Jamo</source> + <translation></translation> + </message> + <message> + <source>Hangul Romaja</source> + <translation></translation> + </message> + <message> + <source>Hangul Jeonja</source> + <translation></translation> + </message> + <message> + <source>Hangul Banja</source> + <translation></translation> + </message> + <message> + <source>Hangul PreHanja</source> + <translation></translation> + </message> + <message> + <source>Hangul PostHanja</source> + <translation></translation> + </message> + <message> + <source>Hangul Special</source> + <translation></translation> + </message> + <message> <source>Ctrl</source> <translation>Ctrl</translation> </message> @@ -4696,6 +6552,16 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Page d'accueil</translation> </message> <message> + <source>Media Pause</source> + <extracomment>Media player pause button</extracomment> + <translation>Média pause</translation> + </message> + <message> + <source>Toggle Media Play/Pause</source> + <extracomment>Media player button to toggle between playing and paused</extracomment> + <translation>Média Lecture/Pause</translation> + </message> + <message> <source>Monitor Brightness Up</source> <translation>Augmenter la luminosité du moniteur</translation> </message> @@ -5037,7 +6903,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>View</source> - <translation>Afficher</translation> + <translation>Affichage</translation> </message> <message> <source>Top Menu</source> @@ -5139,6 +7005,33 @@ Veuillez choisir un nom de fichier différent.</translation> </message> </context> <context> + <name>QSoftKeyManager</name> + <message> + <source>Ok</source> + <translation>OK</translation> + </message> + <message> + <source>Select</source> + <translation>Sélectionner</translation> + </message> + <message> + <source>Done</source> + <translation>Terminer</translation> + </message> + <message> + <source>Options</source> + <translation>Options</translation> + </message> + <message> + <source>Cancel</source> + <translation>Annuler</translation> + </message> + <message> + <source>Exit</source> + <translation>Quitter</translation> + </message> +</context> +<context> <name>QSpinBox</name> <message> <source>More</source> @@ -5239,13 +7132,12 @@ Veuillez choisir un nom de fichier différent.</translation> <translation type="obsolete">La clé privée ne certifie pas la clé publique, %1</translation> </message> <message> - <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+327"/> <source>Private key does not certificate public key, %1</source> - <translation>La clé privée ne certifie pas la clé publique, %1</translation> + <translation type="obsolete">La clé privée ne certifie pas la clé publique, %1</translation> </message> <message> <source>Unable to decrypt data: %1</source> - <translation>Impossible de décrypter les données: %1</translation> + <translation>Impossible de décrypter les données : %1</translation> </message> <message> <source>Private key does not certify public key, %1</source> @@ -5281,11 +7173,11 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>The certificate's notBefore field contains an invalid time</source> - <translation>Le champ pasAvant du certificat inclut une heure non valide</translation> + <translation>Le champ pasAvant du certificat inclut une heure invalide</translation> </message> <message> <source>The certificate's notAfter field contains an invalid time</source> - <translation>Le champ pasAprès du certificat inclut une heure non valide</translation> + <translation>Le champ pasAprès du certificat inclut une heure invalide</translation> </message> <message> <source>The certificate is self-signed, and untrusted</source> @@ -5345,14 +7237,33 @@ Veuillez choisir un nom de fichier différent.</translation> </message> </context> <context> + <name>QStateMachine</name> + <message> + <source>Missing initial state in compound state '%1'</source> + <translation>État initial manquant dans l'état composé '%1'</translation> + </message> + <message> + <source>Missing default state in history state '%1'</source> + <translation>État par défaut manquant dans l'état de l'historique '%1'</translation> + </message> + <message> + <source>No common ancestor for targets and source of transition from state '%1'</source> + <translation>Aucun ancêtre commun pour les cibles et la source de transition de l'état '%1'</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erreur inconnue</translation> + </message> +</context> +<context> <name>QSystemSemaphore</name> <message> <source>%1: out of resources</source> - <translation>%1: plus de ressources disponibles</translation> + <translation>%1 : plus de ressources disponibles</translation> </message> <message> <source>%1: permission denied</source> - <translation>%1: permission refusée</translation> + <translation>%1 : permission refusée</translation> </message> <message> <source>%1: already exists</source> @@ -5364,7 +7275,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>%1: unknown error %2</source> - <translation>%1: erreur inconnue %2</translation> + <translation>%1 : erreur inconnue %2</translation> </message> </context> <context> @@ -5408,7 +7319,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>&Redo</source> - <translation>&Répéter</translation> + <translation>&Rétablir</translation> </message> <message> <source>Cu&t</source> @@ -5439,7 +7350,7 @@ Veuillez choisir un nom de fichier différent.</translation> <name>QToolButton</name> <message> <source>Press</source> - <translation>Presser</translation> + <translation>Appuyer</translation> </message> <message> <source>Open</source> @@ -5461,7 +7372,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Redo</source> - <translation>Répéter</translation> + <translation>Rétablir</translation> </message> </context> <context> @@ -5479,7 +7390,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Redo</source> - <translation>Répéter</translation> + <translation>Rétablir</translation> </message> </context> <context> @@ -5544,9 +7455,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Impossible d'afficher l'URL</translation> </message> <message> - <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+722"/> <source>Frame load interruped by policy change</source> - <translation>Chargement de la frame interrompu par un changement de configuration</translation> + <translation type="obsolete">Chargement de la frame interrompu par un changement de configuration</translation> </message> <message> <source>Cannot show mimetype</source> @@ -5564,19 +7474,16 @@ Veuillez choisir un nom de fichier différent.</translation> <context> <name>QWebPage</name> <message> - <location filename="../src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp" line="+42"/> <source>Submit</source> <comment>default label for Submit buttons in forms on web pages</comment> <translation>Soumettre</translation> </message> <message> - <location line="+5"/> <source>Submit</source> <comment>Submit (input element) alt text for <input> elements with no alt, title, or value</comment> <translation>Soumettre</translation> </message> <message> - <location line="+5"/> <source>Reset</source> <comment>default label for Reset buttons in forms on web pages</comment> <translation>Réinitialiser</translation> @@ -5587,271 +7494,436 @@ Veuillez choisir un nom de fichier différent.</translation> <translation type="obsolete">Index recherchable</translation> </message> <message> - <location line="+15"/> <source>Choose File</source> <comment>title for file button used in HTML forms</comment> <translation>Choisir le fichier</translation> </message> <message> - <location line="+5"/> <source>No file selected</source> <comment>text to display in file button used in HTML forms when no file is selected</comment> <translation>Pas de fichier sélectionné</translation> </message> <message> - <location line="+5"/> <source>Open in New Window</source> <comment>Open in New Window context menu item</comment> <translation>Ouvrir dans une Nouvelle Fenêtre</translation> </message> <message> - <location line="+5"/> <source>Save Link...</source> <comment>Download Linked File context menu item</comment> <translation>Enregistrer le lien...</translation> </message> <message> - <location line="+5"/> <source>Copy Link</source> <comment>Copy Link context menu item</comment> <translation>Copier le lien</translation> </message> <message> - <location line="+5"/> <source>Open Image</source> <comment>Open Image in New Window context menu item</comment> <translation>Ouvrir l'image</translation> </message> <message> - <location line="+5"/> <source>Save Image</source> <comment>Download Image context menu item</comment> <translation>Enregistrer l'image</translation> </message> <message> - <location line="+5"/> <source>Copy Image</source> <comment>Copy Link context menu item</comment> <translation>Copier l'image</translation> </message> <message> - <location line="+5"/> <source>Open Frame</source> <comment>Open Frame in New Window context menu item</comment> <translation>Ouvrir le cadre</translation> </message> <message> - <location line="+5"/> <source>Copy</source> <comment>Copy context menu item</comment> <translation>Copier</translation> </message> <message> - <location line="+5"/> <source>Go Back</source> <comment>Back context menu item</comment> <translation>Précédent</translation> </message> <message> - <location line="+5"/> <source>Go Forward</source> <comment>Forward context menu item</comment> <translation>Suivant</translation> </message> <message> - <location line="+5"/> <source>Stop</source> <comment>Stop context menu item</comment> - <translation>Stop</translation> + <translation>Arrêter</translation> </message> <message> - <location line="+5"/> <source>Reload</source> <comment>Reload context menu item</comment> <translation>Recharger</translation> </message> <message> - <location line="+5"/> <source>Cut</source> <comment>Cut context menu item</comment> <translation>Couper</translation> </message> <message> - <location line="+5"/> <source>Paste</source> <comment>Paste context menu item</comment> <translation>Coller</translation> </message> <message> - <location line="+5"/> <source>No Guesses Found</source> <comment>No Guesses Found context menu item</comment> <translation>Pas de candidat trouvés</translation> </message> <message> - <location line="+5"/> <source>Ignore</source> <comment>Ignore Spelling context menu item</comment> <translation>Ignorer</translation> </message> <message> - <location line="+5"/> <source>Add To Dictionary</source> <comment>Learn Spelling context menu item</comment> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location line="+5"/> <source>Search The Web</source> <comment>Search The Web context menu item</comment> <translation>Chercher sur le Web</translation> </message> <message> - <location line="+5"/> <source>Look Up In Dictionary</source> <comment>Look Up in Dictionary context menu item</comment> <translation>Chercher dans le dictionnaire</translation> </message> <message> - <location line="+5"/> <source>Open Link</source> <comment>Open Link context menu item</comment> <translation>Ouvrir le lien</translation> </message> <message> - <location line="+5"/> <source>Ignore</source> <comment>Ignore Grammar context menu item</comment> <translation>Ignorer</translation> </message> <message> - <location line="+5"/> <source>Spelling</source> <comment>Spelling and Grammar context sub-menu item</comment> <translation>Orthographe</translation> </message> <message> - <location line="+5"/> <source>Show Spelling and Grammar</source> <comment>menu item title</comment> <translation>Afficher Orthographe et Grammaire</translation> </message> <message> - <location line="+1"/> <source>Hide Spelling and Grammar</source> <comment>menu item title</comment> <translation>Cacher Orthographe et Grammaire</translation> </message> <message> - <location line="+5"/> <source>Check Spelling</source> <comment>Check spelling context menu item</comment> <translation>Vérifier l'orthographe</translation> </message> <message> - <location line="+5"/> <source>Check Spelling While Typing</source> <comment>Check spelling while typing context menu item</comment> <translation>Vérifier l'orthographe pendant la saisie</translation> </message> <message> - <location line="+5"/> <source>Check Grammar With Spelling</source> <comment>Check grammar with spelling context menu item</comment> <translation>Vérifier la grammaire en même temps que l'orthographe</translation> </message> <message> - <location line="+5"/> <source>Fonts</source> <comment>Font context sub-menu item</comment> <translation>Polices</translation> </message> <message> - <location line="+5"/> <source>Bold</source> <comment>Bold context menu item</comment> <translation>Gras</translation> </message> <message> - <location line="+5"/> <source>Italic</source> <comment>Italic context menu item</comment> <translation>Italique</translation> </message> <message> - <location line="+5"/> <source>Underline</source> <comment>Underline context menu item</comment> <translation>Souligné</translation> </message> <message> - <location line="+5"/> <source>Outline</source> <comment>Outline context menu item</comment> <translation>Contour</translation> </message> <message> - <location line="+5"/> <source>Direction</source> <comment>Writing direction context sub-menu item</comment> <translation></translation> </message> <message> - <location line="+5"/> <source>Text Direction</source> <comment>Text direction context sub-menu item</comment> <translation>Orientation du texte</translation> </message> <message> - <location line="+5"/> <source>Default</source> <comment>Default writing direction context menu item</comment> - <translation>Défaut</translation> + <translation>Par défaut</translation> + </message> + <message> + <source>Left to Right</source> + <comment>Left to Right context menu item</comment> + <translation>Gauche à droite</translation> + </message> + <message> + <source>Right to Left</source> + <comment>Right to Left context menu item</comment> + <translation>Droite à gauche</translation> + </message> + <message> + <source>Loading...</source> + <comment>Media controller status message when the media is loading</comment> + <translation>Chargement...</translation> + </message> + <message> + <source>Live Broadcast</source> + <comment>Media controller status message when watching a live broadcast</comment> + <translation>Diffusion en direct</translation> + </message> + <message> + <source>Audio Element</source> + <comment>Media controller element</comment> + <translation>Élément audio</translation> + </message> + <message> + <source>Video Element</source> + <comment>Media controller element</comment> + <translation>Élément vidéo</translation> + </message> + <message> + <source>Mute Button</source> + <comment>Media controller element</comment> + <translation>Bouton de désactivation du son</translation> + </message> + <message> + <source>Unmute Button</source> + <comment>Media controller element</comment> + <translation>Bouton de réactivation du son</translation> + </message> + <message> + <source>Play Button</source> + <comment>Media controller element</comment> + <translation>Bouton de lecture</translation> + </message> + <message> + <source>Pause Button</source> + <comment>Media controller element</comment> + <translation>Bouton de pause</translation> + </message> + <message> + <source>Slider</source> + <comment>Media controller element</comment> + <translation>Slider</translation> + </message> + <message> + <source>Slider Thumb</source> + <comment>Media controller element</comment> + <translation>Curseur de la barre de défilement</translation> + </message> + <message> + <source>Rewind Button</source> + <comment>Media controller element</comment> + <translation>Bouton de retour en arrière</translation> + </message> + <message> + <source>Return to Real-time Button</source> + <comment>Media controller element</comment> + <translation>Bouton de retour au temps réel</translation> + </message> + <message> + <source>Elapsed Time</source> + <comment>Media controller element</comment> + <translation>Temps écoulé</translation> + </message> + <message> + <source>Remaining Time</source> + <comment>Media controller element</comment> + <translation>Durée restante</translation> + </message> + <message> + <source>Status Display</source> + <comment>Media controller element</comment> + <translation>Affichage de l'état</translation> + </message> + <message> + <source>Fullscreen Button</source> + <comment>Media controller element</comment> + <translation>Bouton de plein écran</translation> + </message> + <message> + <source>Seek Forward Button</source> + <comment>Media controller element</comment> + <translation>Bouton de recherche avant</translation> + </message> + <message> + <source>Seek Back Button</source> + <comment>Media controller element</comment> + <translation>Bouton de recherche arrière</translation> + </message> + <message> + <source>Audio element playback controls and status display</source> + <comment>Media controller element</comment> + <translation>Commandes de lecture et affichage de l'état de l'élément audio</translation> + </message> + <message> + <source>Video element playback controls and status display</source> + <comment>Media controller element</comment> + <translation>Commandes de lecture et affichage de l'état de l'élément vidéo</translation> + </message> + <message> + <source>Mute audio tracks</source> + <comment>Media controller element</comment> + <translation>Couper le son des pistes audio</translation> + </message> + <message> + <source>Unmute audio tracks</source> + <comment>Media controller element</comment> + <translation>Réactiver le son des pistes audio</translation> + </message> + <message> + <source>Begin playback</source> + <comment>Media controller element</comment> + <translation>Commencer la lecture</translation> + </message> + <message> + <source>Pause playback</source> + <comment>Media controller element</comment> + <translation>Pause lecture</translation> + </message> + <message> + <source>Movie time scrubber</source> + <comment>Media controller element</comment> + <translation>Balayeur de durée du film</translation> + </message> + <message> + <source>Movie time scrubber thumb</source> + <comment>Media controller element</comment> + <translation>Case de défilement du balayeur de la durée du film</translation> + </message> + <message> + <source>Rewind movie</source> + <comment>Media controller element</comment> + <translation>Rembobiner le film</translation> + </message> + <message> + <source>Return streaming movie to real-time</source> + <comment>Media controller element</comment> + <translation>Ramener le film en streaming en temps réel</translation> + </message> + <message> + <source>Current movie time</source> + <comment>Media controller element</comment> + <translation>Durée du film en cours</translation> + </message> + <message> + <source>Remaining movie time</source> + <comment>Media controller element</comment> + <translation>Durée de film restante</translation> + </message> + <message> + <source>Current movie status</source> + <comment>Media controller element</comment> + <translation>État du film actuel</translation> + </message> + <message> + <source>Play movie in full-screen mode</source> + <comment>Media controller element</comment> + <translation>Regarder le film en mode plein écran</translation> + </message> + <message> + <source>Seek quickly back</source> + <comment>Media controller element</comment> + <translation>Recherche rapide arrière</translation> + </message> + <message> + <source>Seek quickly forward</source> + <comment>Media controller element</comment> + <translation>Recherche rapide avant</translation> + </message> + <message> + <source>Indefinite time</source> + <comment>Media time description</comment> + <translation>Durée indéfinie</translation> + </message> + <message> + <source>%1 days %2 hours %3 minutes %4 seconds</source> + <comment>Media time description</comment> + <translation>%1 jours %2 heures %3 minutes %4 secondes</translation> + </message> + <message> + <source>%1 hours %2 minutes %3 seconds</source> + <comment>Media time description</comment> + <translation>%1 heures %2 minutes %3 secondes</translation> + </message> + <message> + <source>%1 minutes %2 seconds</source> + <comment>Media time description</comment> + <translation>%1 minutes %2 secondes</translation> + </message> + <message> + <source>%1 seconds</source> + <comment>Media time description</comment> + <translation>%1 secondes</translation> </message> <message> - <location line="+5"/> <source>LTR</source> <comment>Left to Right context menu item</comment> - <translation>De la gauche vers la droite</translation> + <translation type="obsolete">De la gauche vers la droite</translation> </message> <message> - <location line="+5"/> <source>RTL</source> <comment>Right to Left context menu item</comment> - <translation>De la droite vers la gauche</translation> + <translation type="obsolete">De la droite vers la gauche</translation> </message> <message> - <location line="+5"/> <source>Inspect</source> <comment>Inspect Element context menu item</comment> <translation>Inspecter</translation> </message> <message> - <location line="+5"/> <source>No recent searches</source> <comment>Label for only item in menu that appears when clicking on the search field image, when no searches have been performed</comment> <translation>Pas de recherche récente</translation> </message> <message> - <location line="+5"/> <source>Recent searches</source> <comment>label for first item in the menu that appears when clicking on the search field image, used as embedded menu title</comment> <translation>Recherches récentes</translation> </message> <message> - <location line="+5"/> <source>Clear recent searches</source> <comment>menu item in Recent Searches menu that empties menu's contents</comment> <translation>Effacer les recherches récentes</translation> </message> <message> - <location line="+75"/> + <source>Missing Plug-in</source> + <comment>Label text to be used when a plug-in is missing</comment> + <translation>Plug-in manquant</translation> + </message> + <message> <source>Unknown</source> <comment>Unknown filesize FTP directory listing item</comment> <translation>Inconnu</translation> </message> <message> - <location line="+5"/> <source>%1 (%2x%3 pixels)</source> <comment>Title string for images</comment> <translation>%1 (%2x%3 pixels)</translation> @@ -5861,14 +7933,17 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Inspecteur Web - %2</translation> </message> <message> + <source>Redirection limit reached</source> + <translation>Limite de redirection atteinte</translation> + </message> + <message> <source>Bad HTTP request</source> <translation>Requête HTTP erronée</translation> </message> <message> - <location line="-291"/> <source>This is a searchable index. Enter search keywords: </source> <comment>text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index'</comment> - <translation>Ceci est un index. Veuillez saisir les mots-clé :</translation> + <translation>Ceci est un index. Veuillez saisir les mots-clé : </translation> </message> <message> <source>Scroll here</source> @@ -5923,7 +7998,6 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Défiler vers le bas</translation> </message> <message numerus="yes"> - <location filename="../src/3rdparty/webkit/WebCore/platform/qt/FileChooserQt.cpp" line="+45"/> <source>%n file(s)</source> <comment>number of chosen file</comment> <translation> @@ -6061,353 +8135,347 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Submit</source> - <translation>Soumettre</translation> + <translation type="obsolete">Soumettre</translation> </message> <message> <source>Reset</source> - <translation>Réinitialiser</translation> + <translation type="obsolete">Réinitialiser</translation> </message> <message> <source>Choose File</source> - <translation>Choisir le fichier</translation> + <translation type="obsolete">Choisir le fichier</translation> </message> <message> <source>No file selected</source> - <translation>Pas de fichier sélectionné</translation> + <translation type="obsolete">Pas de fichier sélectionné</translation> </message> <message> <source>Open in New Window</source> - <translation>Ouvrir dans une Nouvelle Fenêtre</translation> + <translation type="obsolete">Ouvrir dans une Nouvelle Fenêtre</translation> </message> <message> <source>Save Link...</source> - <translation>Enregistrer la cible du lien...</translation> + <translation type="obsolete">Enregistrer la cible du lien...</translation> </message> <message> <source>Copy Link</source> - <translation>Copier le lien</translation> + <translation type="obsolete">Copier le lien</translation> </message> <message> <source>Open Image</source> - <translation>Ouvrir l'image</translation> + <translation type="obsolete">Ouvrir l'image</translation> </message> <message> <source>Save Image</source> - <translation>Enregistrer l'image</translation> + <translation type="obsolete">Enregistrer l'image</translation> </message> <message> <source>Copy Image</source> - <translation>Copier l'image</translation> + <translation type="obsolete">Copier l'image</translation> </message> <message> <source>Open Frame</source> - <translation>Ouvrir le cadre</translation> + <translation type="obsolete">Ouvrir le cadre</translation> </message> <message> <source>Copy</source> - <translation>Copier</translation> + <translation type="obsolete">Copier</translation> </message> <message> <source>Go Back</source> - <translation>Précédent</translation> + <translation type="obsolete">Précédent</translation> </message> <message> <source>Go Forward</source> - <translation>Suivant</translation> + <translation type="obsolete">Suivant</translation> </message> <message> <source>Stop</source> - <translation>Stop</translation> + <translation type="obsolete">Stop</translation> </message> <message> <source>Reload</source> - <translation>Recharger</translation> + <translation type="obsolete">Recharger</translation> </message> <message> <source>Cut</source> - <translation>Couper</translation> + <translation type="obsolete">Couper</translation> </message> <message> <source>Paste</source> - <translation>Coller</translation> + <translation type="obsolete">Coller</translation> </message> <message> <source>No Guesses Found</source> - <translation>Pas de candidat trouvés</translation> + <translation type="obsolete">Pas de candidat trouvés</translation> </message> <message> <source>Ignore</source> - <translation>Ignorer</translation> + <translation type="obsolete">Ignorer</translation> </message> <message> <source>Add To Dictionary</source> - <translation>Ajouter au dictionnaire</translation> + <translation type="obsolete">Ajouter au dictionnaire</translation> </message> <message> <source>Search The Web</source> - <translation>Chercher sur le Web</translation> + <translation type="obsolete">Chercher sur le Web</translation> </message> <message> <source>Look Up In Dictionary</source> - <translation>Chercher dans le dictionnaire</translation> + <translation type="obsolete">Chercher dans le dictionnaire</translation> </message> <message> <source>Open Link</source> - <translation>Ouvrir le lien</translation> + <translation type="obsolete">Ouvrir le lien</translation> </message> <message> <source>Spelling</source> - <translation>Orthographe</translation> + <translation type="obsolete">Orthographe</translation> </message> <message> <source>Show Spelling and Grammar</source> - <translation>Afficher Orthographe et Grammaire</translation> + <translation type="obsolete">Afficher Orthographe et Grammaire</translation> </message> <message> <source>Hide Spelling and Grammar</source> - <translation>Cacher Orthographe et Grammaire</translation> + <translation type="obsolete">Cacher Orthographe et Grammaire</translation> </message> <message> <source>Check Spelling</source> - <translation>Vérifier l'orthographe</translation> + <translation type="obsolete">Vérifier l'orthographe</translation> </message> <message> <source>Check Spelling While Typing</source> - <translation>Vérifier l'orthographe pendant la saisie</translation> + <translation type="obsolete">Vérifier l'orthographe pendant la saisie</translation> </message> <message> <source>Check Grammar With Spelling</source> - <translation>Vérifier la grammaire en même temps que l'orthographe</translation> + <translation type="obsolete">Vérifier la grammaire en même temps que l'orthographe</translation> </message> <message> <source>Fonts</source> - <translation>Polices</translation> + <translation type="obsolete">Polices</translation> </message> <message> <source>Bold</source> - <translation>Gras</translation> + <translation type="obsolete">Gras</translation> </message> <message> <source>Italic</source> - <translation>Italique</translation> + <translation type="obsolete">Italique</translation> </message> <message> <source>Underline</source> - <translation>Souligné</translation> + <translation type="obsolete">Souligné</translation> </message> <message> <source>Outline</source> - <translation>Contour</translation> + <translation type="obsolete">Contour</translation> </message> <message> <source>Direction</source> - <translation>Direction</translation> + <translation type="obsolete">Direction</translation> </message> <message> <source>Text Direction</source> - <translation>Orientation du texte</translation> + <translation type="obsolete">Orientation du texte</translation> </message> <message> <source>Default</source> - <translation>Défaut</translation> + <translation type="obsolete">Défaut</translation> </message> <message> <source>Left to Right</source> - <translation>Gauche à droite</translation> + <translation type="obsolete">Gauche à droite</translation> </message> <message> <source>Right to Left</source> - <translation>Droite à gauche</translation> + <translation type="obsolete">Droite à gauche</translation> </message> <message> <source>Loading...</source> - <translation>Chargement...</translation> + <translation type="obsolete">Chargement...</translation> </message> <message> <source>Live Broadcast</source> - <translation>Diffusion en direct</translation> + <translation type="obsolete">Diffusion en direct</translation> </message> <message> <source>Audio Element</source> - <translation>Élément audio</translation> + <translation type="obsolete">Élément audio</translation> </message> <message> <source>Video Element</source> - <translation>Élément vidéo</translation> + <translation type="obsolete">Élément vidéo</translation> </message> <message> <source>Mute Button</source> - <translation>Bouton de désactivation du son</translation> + <translation type="obsolete">Bouton de désactivation du son</translation> </message> <message> <source>Unmute Button</source> - <translation>Bouton de réactivation du son</translation> + <translation type="obsolete">Bouton de réactivation du son</translation> </message> <message> <source>Play Button</source> - <translation>Bouton de lecture</translation> + <translation type="obsolete">Bouton de lecture</translation> </message> <message> <source>Pause Button</source> - <translation>Bouton de pause</translation> + <translation type="obsolete">Bouton de pause</translation> </message> <message> <source>Slider</source> - <translation>Barre de défilement</translation> + <translation type="obsolete">Barre de défilement</translation> </message> <message> <source>Slider Thumb</source> - <translation>Curseur de la barre de défilement</translation> + <translation type="obsolete">Curseur de la barre de défilement</translation> </message> <message> <source>Rewind Button</source> - <translation>Bouton de retour en arrière</translation> + <translation type="obsolete">Bouton de retour en arrière</translation> </message> <message> <source>Return to Real-time Button</source> - <translation>Bouton de retour au temps réel</translation> + <translation type="obsolete">Bouton de retour au temps réel</translation> </message> <message> <source>Elapsed Time</source> - <translation>Temps écoulé</translation> + <translation type="obsolete">Temps écoulé</translation> </message> <message> <source>Remaining Time</source> - <translation>Durée restante</translation> + <translation type="obsolete">Durée restante</translation> </message> <message> <source>Status Display</source> - <translation>Affichage de l'état</translation> + <translation type="obsolete">Affichage de l'état</translation> </message> <message> <source>Fullscreen Button</source> - <translation>Bouton de plein écran</translation> + <translation type="obsolete">Bouton de plein écran</translation> </message> <message> <source>Seek Forward Button</source> - <translation>Bouton de recherche avant</translation> + <translation type="obsolete">Bouton de recherche avant</translation> </message> <message> <source>Seek Back Button</source> - <translation>Bouton de recherche arrière</translation> + <translation type="obsolete">Bouton de recherche arrière</translation> </message> <message> <source>Audio element playback controls and status display</source> - <translation>Commandes de lecture et affichage de l'état de l'élément audio</translation> + <translation type="obsolete">Commandes de lecture et affichage de l'état de l'élément audio</translation> </message> <message> <source>Video element playback controls and status display</source> - <translation>Commandes de lecture et affichage de l'état de l'élément vidéo</translation> + <translation type="obsolete">Commandes de lecture et affichage de l'état de l'élément vidéo</translation> </message> <message> <source>Mute audio tracks</source> - <translation>Couper le son des pistes audio</translation> + <translation type="obsolete">Couper le son des pistes audio</translation> </message> <message> <source>Unmute audio tracks</source> - <translation>Réactiver le son des pistes audio</translation> + <translation type="obsolete">Réactiver le son des pistes audio</translation> </message> <message> <source>Begin playback</source> - <translation>Commencer la lecture</translation> + <translation type="obsolete">Commencer la lecture</translation> </message> <message> <source>Pause playback</source> - <translation>Pause lecture</translation> + <translation type="obsolete">Pause lecture</translation> </message> <message> <source>Movie time scrubber</source> - <translation>Épurateur de la durée du film</translation> + <translation type="obsolete">Épurateur de la durée du film</translation> </message> <message> <source>Movie time scrubber thumb</source> - <translation>Case de défilement de l'épurateur de la durée du film</translation> + <translation type="obsolete">Case de défilement de l'épurateur de la durée du film</translation> </message> <message> <source>Rewind movie</source> - <translation>Rembobiner le film</translation> + <translation type="obsolete">Rembobiner le film</translation> </message> <message> <source>Return streaming movie to real-time</source> - <translation>Ramener le film en streaming en temps réel</translation> + <translation type="obsolete">Ramener le film en streaming en temps réel</translation> </message> <message> <source>Current movie time</source> - <translation>Durée du film actuel</translation> + <translation type="obsolete">Durée du film actuel</translation> </message> <message> <source>Remaining movie time</source> - <translation>Durée de film restante</translation> + <translation type="obsolete">Durée de film restante</translation> </message> <message> <source>Current movie status</source> - <translation>État du film actuel</translation> + <translation type="obsolete">État du film actuel</translation> </message> <message> <source>Play movie in full-screen mode</source> - <translation>Regarder le film en mode plein écran</translation> + <translation type="obsolete">Regarder le film en mode plein écran</translation> </message> <message> <source>Seek quickly back</source> - <translation>Recherche rapide arrière</translation> + <translation type="obsolete">Recherche rapide arrière</translation> </message> <message> <source>Seek quickly forward</source> - <translation>Recherche rapide avant</translation> + <translation type="obsolete">Recherche rapide avant</translation> </message> <message> <source>Indefinite time</source> - <translation>Durée indéfinie</translation> + <translation type="obsolete">Durée indéfinie</translation> </message> <message> <source>%1 days %2 hours %3 minutes %4 seconds</source> - <translation>%1 jours %2 heures %3 minutes %4 secondes</translation> + <translation type="obsolete">%1 jours %2 heures %3 minutes %4 secondes</translation> </message> <message> <source>%1 hours %2 minutes %3 seconds</source> - <translation>%1 heures %2 minutes %3 secondes</translation> + <translation type="obsolete">%1 heures %2 minutes %3 secondes</translation> </message> <message> <source>%1 minutes %2 seconds</source> - <translation>%1 minutes %2 secondes</translation> + <translation type="obsolete">%1 minutes %2 secondes</translation> </message> <message> <source>%1 seconds</source> - <translation>%1 secondes</translation> + <translation type="obsolete">%1 secondes</translation> </message> <message> <source>Inspect</source> - <translation>Inspecter</translation> + <translation type="obsolete">Inspecter</translation> </message> <message> <source>No recent searches</source> - <translation>Pas de recherche récente</translation> + <translation type="obsolete">Pas de recherche récente</translation> </message> <message> <source>Recent searches</source> - <translation>Recherches récentes</translation> + <translation type="obsolete">Recherches récentes</translation> </message> <message> <source>Clear recent searches</source> - <translation>Effacer les recherches récentes</translation> + <translation type="obsolete">Effacer les recherches récentes</translation> </message> <message> <source>Unknown</source> - <translation>Inconnu</translation> + <translation type="obsolete">Inconnu</translation> </message> <message> <source>%1 (%2x%3 pixels)</source> - <translation>%1 (%2x%3 pixels)</translation> + <translation type="obsolete">%1 (%2x%3 pixels)</translation> </message> <message> <source>This is a searchable index. Enter search keywords: </source> - <translation>Ceci est un index. Veuillez saisir les mots-clé :</translation> - </message> - <message numerus="yes"> - <source>%n file(s)</source> - <translation> - <numerusform></numerusform> - </translation> + <translation type="obsolete">Ceci est un index. Veuillez saisir les mots-clé : </translation> </message> <message> <source>JavaScript Problem - %1</source> @@ -6415,7 +8483,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>The script on this page appears to have a problem. Do you want to stop the script?</source> - <translation>Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script?</translation> + <translation>Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script ?</translation> </message> <message> <source>Paste and Match Style</source> @@ -6599,138 +8667,161 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>error triggered by consumer</source> - <translation type="unfinished"></translation> + <translation>Erreur déclenchée par le consommateur</translation> </message> <message> <source>unexpected end of file</source> - <translation type="unfinished"></translation> + <translation>Fin de fichier inattendue</translation> </message> <message> <source>more than one document type definition</source> - <translation type="unfinished"></translation> + <translation>plus d'une définition de type de document</translation> </message> <message> <source>error occurred while parsing element</source> - <translation type="unfinished"></translation> + <translation>une erreur s'est produite pendant l'analyse syntaxique de l'élement</translation> </message> <message> <source>tag mismatch</source> - <translation type="unfinished"></translation> + <translation>tag incongru</translation> </message> <message> <source>error occurred while parsing content</source> - <translation type="unfinished"></translation> + <translation>une erreur s'est produite pendant l'analyse syntaxique du contenu</translation> </message> <message> <source>unexpected character</source> - <translation type="unfinished"></translation> + <translation>caractère inattendu</translation> </message> <message> <source>invalid name for processing instruction</source> - <translation type="unfinished"></translation> + <translation>nom d'instruction invalide</translation> </message> <message> <source>version expected while reading the XML declaration</source> - <translation type="unfinished"></translation> + <translation>une version est attendue dans la déclaration XML</translation> </message> <message> <source>wrong value for standalone declaration</source> - <translation type="unfinished"></translation> + <translation>valeur incorrecte pour une déclaration "standalone"</translation> </message> <message> <source>error occurred while parsing document type definition</source> - <translation type="unfinished"></translation> + <translation>une erreur s'est produite pendant l'analyse syntaxique de la définition du type de document</translation> </message> <message> <source>letter is expected</source> - <translation type="unfinished"></translation> + <translation>une lettre est attendue</translation> </message> <message> <source>error occurred while parsing comment</source> - <translation type="unfinished"></translation> + <translation>une erreur s'est produite pendant l'analyse syntaxique du commentaire</translation> </message> <message> <source>error occurred while parsing reference</source> - <translation type="unfinished"></translation> + <translation>une erreur s'est produite pendant l'analyse syntaxique d'une référence</translation> </message> <message> <source>internal general entity reference not allowed in DTD</source> - <translation type="unfinished"></translation> + <translation>référence à une entité générale interne non autorisée dans la DTD</translation> </message> <message> <source>external parsed general entity reference not allowed in attribute value</source> - <translation type="unfinished"></translation> + <translation>référence à une entité générale externe non autorisée dans la valeur d'attribut</translation> </message> <message> <source>external parsed general entity reference not allowed in DTD</source> - <translation type="unfinished"></translation> + <translation>référence à une entité générale externe non autorisée dans le DTD</translation> </message> <message> <source>unparsed entity reference in wrong context</source> - <translation type="unfinished"></translation> + <translation>référence à une entité non analysée dans le mauvais contexte</translation> </message> <message> <source>recursive entities</source> - <translation type="unfinished"></translation> + <translation>entités récursives</translation> </message> <message> <source>error in the text declaration of an external entity</source> - <translation type="unfinished"></translation> + <translation>erreur dans la déclaration texte d'une entité externe</translation> </message> <message> <source>encoding declaration or standalone declaration expected while reading the XML declaration</source> - <translation type="unfinished"></translation> + <translation>déclaration d'encodage ou déclaration "standalone" attendue lors de la lecture de la déclaration XML</translation> </message> <message> <source>standalone declaration expected while reading the XML declaration</source> - <translation type="unfinished"></translation> + <translation>déclaration "standalone" attendue lors de la lecture de la déclaration XML</translation> + </message> +</context> +<context> + <name>QXmlPatternistCLI</name> + <message> + <source>Warning in %1, at line %2, column %3: %4</source> + <translation>Avertissement dans %1, à la ligne %2, colonne %3 : %4</translation> + </message> + <message> + <source>Warning in %1: %2</source> + <translation>Avertissement dans %1 : %2</translation> + </message> + <message> + <source></source> + <translation>Lieu inconnu</translation> + </message> + <message> + <source>Error %1 in %2, at line %3, column %4: %5</source> + <translation>Erreur %1 dans %2, à la ligne %3, colonne %4 : %5</translation> + </message> + <message> + <source>Error %1 in %2: %3</source> + <translation>Erreur %1 dans %2 : %3</translation> </message> </context> <context> <name>QXmlStream</name> <message> <source>Extra content at end of document.</source> - <translation type="unfinished"></translation> + <translation>Contenu superflu à la fin du document.</translation> </message> <message> <source>Invalid entity value.</source> - <translation type="unfinished"></translation> + <translation>Valeur de l'entité invalide.</translation> </message> <message> <source>Invalid XML character.</source> - <translation type="unfinished"></translation> + <translation>Caractère XML invalide.</translation> </message> <message> <source>Sequence ']]>' not allowed in content.</source> - <translation type="unfinished"></translation> + <translation>séquence ']]>' non autorisée dans le contenu.</translation> </message> <message> <source>Namespace prefix '%1' not declared</source> - <translation type="unfinished"></translation> + <translation>Le préfixe d'espace de noms %1 n'a pas été déclaré</translation> </message> <message> <source>Attribute redefined.</source> - <translation type="unfinished"></translation> + <translation>Redéfinition d'attribut.</translation> </message> <message> <source>Unexpected character '%1' in public id literal.</source> - <translation type="unfinished"></translation> + <translation>Caractère '%1' inattendu pour une valeur d'identifiant public.</translation> </message> <message> <source>Invalid XML version string.</source> - <translation type="unfinished"></translation> + <translation>Chaîne de version XML invalide.</translation> </message> <message> <source>Unsupported XML version.</source> - <translation type="unfinished"></translation> + <translation>Version XML non supportée.</translation> </message> <message> <source>%1 is an invalid encoding name.</source> - <translation type="unfinished"></translation> + <translation>%1 n'est pas un nom d'encodage valide.</translation> </message> <message> <source>Encoding %1 is unsupported</source> - <translation type="unfinished"></translation> + <translation>%1 n'est pas un encodage supporté</translation> </message> <message> <source>Invalid XML encoding name.</source> @@ -6738,112 +8829,110 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Standalone accepts only yes or no.</source> - <translation type="unfinished"></translation> + <translation>Le seules valeurs possibles pour "standalone" sont "yes" ou "no".</translation> </message> <message> <source>Invalid attribute in XML declaration.</source> - <translation type="unfinished"></translation> + <translation>Attribut invalide dans une déclaration XML.</translation> </message> <message> <source>Premature end of document.</source> - <translation type="unfinished"></translation> + <translation>Fin de document inattendue.</translation> </message> <message> <source>Invalid document.</source> - <translation type="unfinished"></translation> + <translation>Document invalide.</translation> </message> <message> <source>Expected </source> - <translation type="unfinished"></translation> + <translation>Attendu(e)</translation> </message> <message> <source>, but got '</source> - <translation type="unfinished"></translation> + <translation>, mais trouvé '</translation> </message> <message> <source>Unexpected '</source> - <translation type="unfinished"></translation> + <translation>Inattendu(e)</translation> </message> <message> <source>Expected character data.</source> - <translation type="unfinished"></translation> + <translation>données texte attendues.</translation> </message> <message> <source>Recursive entity detected.</source> - <translation type="unfinished"></translation> + <translation>Entité récursive détectée.</translation> </message> <message> <source>Start tag expected.</source> - <translation type="unfinished"></translation> + <translation>Tag de départ attendu.</translation> </message> <message> <source>XML declaration not at start of document.</source> - <translation type="unfinished"></translation> + <translation>La déclaration XML doit être en début de document.</translation> </message> <message> <source>NDATA in parameter entity declaration.</source> - <translation type="unfinished"></translation> + <translation>NDATA dans une déclaration de paramètre d'entité.</translation> </message> <message> <source>%1 is an invalid processing instruction name.</source> - <translation type="unfinished"></translation> + <translation>%1 n'est pas un nom d'instruction valide.</translation> </message> <message> <source>Invalid processing instruction name.</source> - <translation type="unfinished"></translation> + <translation>nom d'instruction invalide.</translation> </message> <message> <source>Illegal namespace declaration.</source> - <translation type="unfinished"></translation> + <translation>Déclaration d'espace de noms non autorisée.</translation> </message> <message> <source>Invalid XML name.</source> - <translation type="unfinished"></translation> + <translation>Nom XML invalide.</translation> </message> <message> <source>Opening and ending tag mismatch.</source> - <translation type="unfinished"></translation> + <translation>Tags ouvrant et fermants ne correspondent pas.</translation> </message> <message> <source>Reference to unparsed entity '%1'.</source> - <translation type="unfinished"></translation> + <translation>Référence à l'entité '%1' non analysée.</translation> </message> <message> <source>Entity '%1' not declared.</source> - <translation type="unfinished"></translation> + <translation>Entité '%1' non déclarée.</translation> </message> <message> <source>Reference to external entity '%1' in attribute value.</source> - <translation type="unfinished"></translation> + <translation>Référence à l'entité externe '%1' en valeur d'attribut.</translation> </message> <message> <source>Invalid character reference.</source> - <translation type="unfinished"></translation> + <translation>Référence à un caractère invalide.</translation> </message> <message> <source>Encountered incorrectly encoded content.</source> - <translation type="unfinished"></translation> + <translation>Du contenu avec un encodage incorrect a été rencontré.</translation> </message> <message> <source>The standalone pseudo attribute must appear after the encoding.</source> - <translation type="unfinished"></translation> + <translation>Le pseudo-attribut "standalone" doit apparaître après l'encodage.</translation> </message> <message> <source>%1 is an invalid PUBLIC identifier.</source> - <translation type="unfinished"></translation> + <translation>%1 n'est pas un identifiant "PUBLIC" valide.</translation> </message> </context> <context> <name>QtXmlPatterns</name> <message> - <location filename="../src/xmlpatterns/acceltree/qacceltreebuilder.cpp" line="+205"/> <source>An %1-attribute with value %2 has already been declared.</source> - <translation>Un attribute %1 avec la valeur %2 est déjà déclaré.</translation> + <translation type="obsolete">Un attribute %1 avec la valeur %2 est déjà déclaré.</translation> </message> <message> - <location line="+13"/> <source>An %1-attribute must have a valid %2 as value, which %3 isn't.</source> - <translation>Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas.</translation> + <translation type="obsolete">Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas.</translation> </message> <message> <source>Network timeout.</source> @@ -6871,7 +8960,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Overflow: Can't represent date %1.</source> - <translation>Overflow: ne peut pas représenter la date %1.</translation> + <translation>Overflow : impossible de représenter la date %1.</translation> </message> <message> <source>Day %1 is invalid for month %2.</source> @@ -6879,11 +8968,11 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source> - <translation>L'heure 24:%1:%2.%3 est invalide. L'heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0;</translation> + <translation>Heure 24 : %1 : %2.%3 est invalide. L'heure est 24 mais les minutes, secondes et millisecondes ne sont pas à 0;</translation> </message> <message> <source>Time %1:%2:%3.%4 is invalid.</source> - <translation>L'heure %1:%2:%3.%4 est invalide.</translation> + <translation>L'heure %1 : %2 : %3.%4 est invalide.</translation> </message> <message> <source>Overflow: Date can't be represented.</source> @@ -6898,19 +8987,16 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Au moins un composant doit apparaître après le délimiteur %1.</translation> </message> <message> - <location filename="../src/xmlpatterns/data/qabstractfloatmathematician.cpp" line="+64"/> <source>No operand in an integer division, %1, can be %2.</source> - <translation>Pas d'opérande dans une division entière, %1, peut être %2.</translation> + <translation type="obsolete">Pas d'opérande dans une division entière, %1, peut être %2.</translation> </message> <message> - <location line="+7"/> <source>The first operand in an integer division, %1, cannot be infinity (%2).</source> - <translation>Le premier opérande dans une division entière, %1, ne peut être infini (%2).</translation> + <translation type="obsolete">Le premier opérande dans une division entière, %1, ne peut être infini (%2).</translation> </message> <message> - <location line="+6"/> <source>The second operand in a division, %1, cannot be zero (%2).</source> - <translation>Le second opérande dans une division, %1, ne peut être nul (%2).</translation> + <translation type="obsolete">Le second opérande dans une division, %1, ne peut être nul (%2).</translation> </message> <message> <source>%1 is not a valid value of type %2.</source> @@ -6946,7 +9032,7 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>A value of type %1 cannot have an Effective Boolean Value.</source> - <translation>Une valeur de type %1 ne peut pas avoir une Effective Boolean Value.</translation> + <translation>Une valeur de type %1 ne peut pas avoir une valeur booléene effective.</translation> </message> <message> <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source> @@ -6993,29 +9079,24 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n'est pas autorisé.</translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcastingplatform.cpp" line="+134"/> <source>No casting is possible with %1 as the target type.</source> - <translation>Aucun cast n'est possible avec %1 comme type de destination.</translation> + <translation type="obsolete">Aucun cast n'est possible avec %1 comme type de destination.</translation> </message> <message> - <location line="+15"/> <source>It is not possible to cast from %1 to %2.</source> - <translation>Il est impossible de caster de %1 en %2.</translation> + <translation type="obsolete">Il est impossible de caster de %1 en %2.</translation> </message> <message> - <location line="+27"/> <source>Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated.</source> - <translation>Caster vers %1 est impossible parce que c'est un type abstrait qui ne peut donc être instancié.</translation> + <translation type="obsolete">Caster vers %1 est impossible parce que c'est un type abstrait qui ne peut donc être instancié.</translation> </message> <message> - <location line="+23"/> <source>It's not possible to cast the value %1 of type %2 to %3</source> - <translation>I lest impossible de caster la valeur %1 de type %2 en %3</translation> + <translation type="obsolete">I lest impossible de caster la valeur %1 de type %2 en %3</translation> </message> <message> - <location line="+8"/> <source>Failure when casting from %1 to %2: %3</source> - <translation>Echec en castant de %1 ver %2 : %3</translation> + <translation type="obsolete">Echec en castant de %1 ver %2 : %3</translation> </message> <message> <source>A comment cannot contain %1</source> @@ -7026,14 +9107,12 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Un commentaire ne peut pas finir par %1.</translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qcomparisonplatform.cpp" line="+167"/> <source>No comparisons can be done involving the type %1.</source> - <translation>Aucune comparaison ne peut être faite avec le type %1.</translation> + <translation type="obsolete">Aucune comparaison ne peut être faite avec le type %1.</translation> </message> <message> - <location line="+14"/> <source>Operator %1 is not available between atomic values of type %2 and %3.</source> - <translation>L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3.</translation> + <translation type="obsolete">L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3.</translation> </message> <message> <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source> @@ -7056,9 +9135,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Un prédicat de position doit être évalué en une unique valeur numérique.</translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qncnameconstructor_p.h" line="+113"/> <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid.</source> - <translation>Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide.</translation> + <translation type="obsolete">Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide.</translation> </message> <message> <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source> @@ -7115,9 +9193,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>%1 n'est pas un caractère XML 1.0 valide.</translation> </message> <message> - <location filename="../src/xmlpatterns/functions/qcomparingaggregator.cpp" line="+197"/> <source>The first argument to %1 cannot be of type %2.</source> - <translation>Le premier argument de %1 ne peut être du type %2.</translation> + <translation type="obsolete">Le premier argument de %1 ne peut être du type %2.</translation> </message> <message> <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source> @@ -7157,11 +9234,11 @@ Veuillez choisir un nom de fichier différent.</translation> </message> <message> <source>%1 is an invalid regular expression pattern: %2</source> - <translation>%1 est un modèle d'expression régulière invalide: %2</translation> + <translation>%1 est un modèle d'expression régulière invalide : %2</translation> </message> <message> <source>%1 is an invalid flag for regular expressions. Valid flags are:</source> - <translation>%1 est un flag invalide pour des expressions régulières. Les flags valides sont :</translation> + <translation>%1 est un flag invalide pour des expressions régulières. Les flags valides sont : </translation> </message> <message> <source>If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.</source> @@ -7216,9 +9293,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>L'initialisation de la variable %1 dépend d'elle-même</translation> </message> <message> - <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+912"/> <source>No variable by name %1 exists</source> - <translation>Aucun variable nommée %1 existe</translation> + <translation type="obsolete">Aucun variable nommée %1 existe</translation> </message> <message> <source>The variable %1 is unused</source> @@ -7281,42 +9357,36 @@ Veuillez choisir un nom de fichier différent.</translation> <translation type="obsolete">Une variable du nom %1 a déjà été déclarée dans le prologue.</translation> </message> <message> - <location line="+3572"/> <source>No value is available for the external variable by name %1.</source> - <translation>Aucune valeur n'est disponible pour la variable externe %1.</translation> + <translation type="obsolete">Aucune valeur n'est disponible pour la variable externe %1.</translation> </message> <message> <source>The namespace for a user defined function cannot be empty(try the predefined prefix %1 which exists for cases like this)</source> <translation type="obsolete">Le namespace d'une fonction définie par l'utilisateur ne peut être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas)</translation> </message> <message> - <location line="-4154"/> <source>A construct was encountered which only is allowed in XQuery.</source> - <translation>Construct n'est autorisé que dans XQuery.</translation> + <translation type="obsolete">Construct n'est autorisé que dans XQuery.</translation> </message> <message> - <location line="+118"/> <source>A template by name %1 has already been declared.</source> - <translation>Un template nommé %1 a déjà été déclaré.</translation> + <translation type="obsolete">Un template nommé %1 a déjà été déclaré.</translation> </message> <message> <source>The keyword %1 cannot occur with any other mode name.</source> <translation>Le mot-clé %1 ne peut pas apparaître avec un autre nom de mode.</translation> </message> <message> - <location line="+3610"/> <source>The value of attribute %1 must of type %2, which %3 isn't.</source> - <translation>La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas.</translation> + <translation type="obsolete">La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas.</translation> </message> <message> - <location line="+75"/> <source>The prefix %1 can not be bound. By default, it is already bound to the namespace %2.</source> - <translation>Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2.</translation> + <translation type="obsolete">Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2.</translation> </message> <message> - <location line="+312"/> <source>A variable by name %1 has already been declared.</source> - <translation>Une variable nommée %1 a déjà été déclarée.</translation> + <translation type="obsolete">Une variable nommée %1 a déjà été déclarée.</translation> </message> <message> <source>A stylesheet function must have a prefixed name.</source> @@ -7343,9 +9413,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Les fonctions externes ne sont pas supportées. Toutes les fonctions supportées peuvent êter utilisées directement sans les déclarer préalablement comme externes</translation> </message> <message> - <location line="+259"/> <source>An argument by name %1 has already been declared. Every argument name must be unique.</source> - <translation>Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique.</translation> + <translation type="obsolete">Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique.</translation> </message> <message> <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source> @@ -7404,9 +9473,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>%1 n'est pas une valeur numérique valide.</translation> </message> <message> - <location line="+1935"/> <source>No function by name %1 is available.</source> - <translation>La fonction %1 n'est pas disponible.</translation> + <translation type="obsolete">La fonction %1 n'est pas disponible.</translation> </message> <message> <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source> @@ -7437,9 +9505,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>L'URI de namespace doit être une constante et ne peut contenir d'expressions.</translation> </message> <message> - <location line="+250"/> <source>An attribute by name %1 has already appeared on this element.</source> - <translation>Un attribute nommé %1 existe déjà pour cet élément.</translation> + <translation type="obsolete">Un attribute nommé %1 existe déjà pour cet élément.</translation> </message> <message> <source>A direct element constructor is not well-formed. %1 is ended with %2.</source> @@ -7558,9 +9625,8 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Seul le préfixe %1 peut être lié à %2, et vice versa.</translation> </message> <message> - <location filename="../src/xmlpatterns/expr/qevaluationcache.cpp" line="+117"/> <source>Circularity detected</source> - <translation>Circularité détectée</translation> + <translation type="obsolete">Circularité détectée</translation> </message> <message> <source>The parameter %1 is required, but no corresponding %2 is supplied.</source> @@ -7575,16 +9641,12 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>L'URI ne peut pas avoir de fragments</translation> </message> <message> - <source>Element %1 is not allowed at this location.</source> + <source></source> <translation>L'élément %1 n'est pas autorisé à cet emplacement.</translation> </message> <message> - <source>Text nodes are not allowed at this location.</source> - <translation>Les noeuds de texte ne sont pas autorisés à cet emplacement.</translation> - </message> - <message> <source>Parse error: %1</source> - <translation>Erreur: %1</translation> + <translation>Erreur : %1</translation> </message> <message> <source>The value of the XSL-T version attribute must be a value of type %1, which %2 isn't.</source> @@ -7619,39 +9681,32 @@ Veuillez choisir un nom de fichier différent.</translation> <translation>Au moins un mode doit être spécifié dans l'attribut %1 sur l'élément %2.</translation> </message> <message> - <location filename="../src/xmlpatterns/parser/qmaintainingreader.cpp" line="+183"/> <source>Attribute %1 cannot appear on the element %2. Only the standard attributes can appear.</source> - <translation>L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent.</translation> + <translation type="obsolete">L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent.</translation> </message> <message> - <location line="+6"/> <source>Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes.</source> - <translation>L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 est autorisé, ainsi que les attributs standard.</translation> + <translation type="obsolete">L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 est autorisé, ainsi que les attributs standard.</translation> </message> <message> - <location line="+8"/> <source>Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes.</source> - <translation>L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls %3, %4 et les attributs standard le sont.</translation> + <translation type="obsolete">L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls %3, %4 et les attributs standard le sont.</translation> </message> <message> - <location line="+9"/> <source>Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes.</source> - <translation>L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 et les attributs standard le sont.</translation> + <translation type="obsolete">L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 et les attributs standard le sont.</translation> </message> <message> - <location line="+13"/> <source>XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is.</source> - <translation>Les attributs XSL-T sur des éléments XSL-T doivent être dans le namespace null, et pas dans %1.</translation> + <translation type="obsolete">Les attributs XSL-T sur des éléments XSL-T doivent être dans le namespace null, et pas dans %1.</translation> </message> <message> - <location line="+12"/> <source>The attribute %1 must appear on element %2.</source> - <translation>L'attribut %1 doit apparaître sur l'élément %2.</translation> + <translation type="obsolete">L'attribut %1 doit apparaître sur l'élément %2.</translation> </message> <message> - <location line="+8"/> <source>The element with local name %1 does not exist in XSL-T.</source> - <translation>L'élément avec le nom local %1 n'existe pas dans XSL-T.</translation> + <translation type="obsolete">L'élément avec le nom local %1 n'existe pas dans XSL-T.</translation> </message> <message> <source>Element %1 must come last.</source> @@ -8849,15 +10904,12 @@ Veuillez choisir un nom de fichier différent.</translation> <context> <name>VolumeSlider</name> <message> - <location filename="../src/3rdparty/phonon/phonon/volumeslider.cpp" line="+184"/> <source>Muted</source> - <translation>Muet</translation> + <translation type="obsolete">Muet</translation> </message> <message> - <location line="+5"/> - <location line="+15"/> <source>Volume: %1%</source> - <translation>Volume : %1%</translation> + <translation type="obsolete">Volume : %1%</translation> </message> </context> <context> @@ -8915,655 +10967,4 @@ Veuillez choisir un nom de fichier différent.</translation> <translation type="obsolete">Défiler vers le bas</translation> </message> </context> -<context> - <name>FakeReply</name> - <message> - <source>Fake error !</source> - <translation>Fausse erreur!</translation> - </message> - <message> - <source>Invalid URL</source> - <translation>URL non valide</translation> - </message> -</context> -<context> - <name>Phonon::AudioOutput</name> - <message> - <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source> - <translation><html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Repli sur <b>%2</b>.</html></translation> - </message> - <message> - <source><html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html></source> - <translation><html>Basculement vers le périphérique audio <b>%1</b><br/>qui vient juste d'être disponible et dont le niveau de préférence est plus élevé.</html></translation> - </message> - <message> - <source>Revert back to device '%1'</source> - <translation>Revenir au périphérique '%1'</translation> - </message> -</context> -<context> - <name>Phonon::MMF</name> - <message> - <source>Audio Output</source> - <translation>Sortie audio</translation> - </message> - <message> - <source>The audio output device</source> - <translation>Périphérique audio de sortie</translation> - </message> - <message> - <source>No error</source> - <translation>Aucune erreur</translation> - </message> - <message> - <source>Not found</source> - <translation>Introuvable</translation> - </message> - <message> - <source>Out of memory</source> - <translation>Mémoire insuffisante</translation> - </message> - <message> - <source>Not supported</source> - <translation>Non supporté</translation> - </message> - <message> - <source>Overflow</source> - <translation>Dépassement</translation> - </message> - <message> - <source>Underflow</source> - <translation>Soupassement</translation> - </message> - <message> - <source>Already exists</source> - <translation>Existe déjà</translation> - </message> - <message> - <source>Path not found</source> - <translation>Chemin introuvable</translation> - </message> - <message> - <source>In use</source> - <translation>Utilisé</translation> - </message> - <message> - <source>Not ready</source> - <translation>Pas prêt</translation> - </message> - <message> - <source>Access denied</source> - <translation>Accès refusé</translation> - </message> - <message> - <source>Could not connect</source> - <translation>Connexion impossible</translation> - </message> - <message> - <source>Disconnected</source> - <translation>Déconnecté</translation> - </message> - <message> - <source>Permission denied</source> - <translation>Autorisation refusée</translation> - </message> - <message> - <source>Insufficient bandwidth</source> - <translation>Bande passante insuffisante</translation> - </message> - <message> - <source>Network unavailable</source> - <translation>Réseau non disponible</translation> - </message> - <message> - <source>Network communication error</source> - <translation>Erreur de communication réseau</translation> - </message> - <message> - <source>Streaming not supported</source> - <translation>Streaming non supporté</translation> - </message> - <message> - <source>Server alert</source> - <translation>Alerte serveur</translation> - </message> - <message> - <source>Invalid protocol</source> - <translation>Protocole non valide</translation> - </message> - <message> - <source>Invalid URL</source> - <translation>URL non valide</translation> - </message> - <message> - <source>Multicast error</source> - <translation>Erreur multicast</translation> - </message> - <message> - <source>Proxy server error</source> - <translation>Erreur du serveur proxy</translation> - </message> - <message> - <source>Proxy server not supported</source> - <translation>Serveur proxy non supporté</translation> - </message> - <message> - <source>Audio output error</source> - <translation>Erreur de sortie audio</translation> - </message> - <message> - <source>Video output error</source> - <translation>Erreur de sortie vidéo</translation> - </message> - <message> - <source>Decoder error</source> - <translation>Erreur du décodeur</translation> - </message> - <message> - <source>Audio or video components could not be played</source> - <translation>Les composants audio ou vidéo n'ont pas pu être lus</translation> - </message> - <message> - <source>DRM error</source> - <translation>Erreur GDN</translation> - </message> - <message> - <source>Unknown error (%1)</source> - <translation>Erreur inconnue (%1)</translation> - </message> -</context> -<context> - <name>Phonon::MMF::AbstractMediaPlayer</name> - <message> - <source>Not ready to play</source> - <translation>Pas prêt pour lecture</translation> - </message> - <message> - <source>Error opening file</source> - <translation>Erreur lors de l'ouverture du fichier</translation> - </message> - <message> - <source>Error opening URL</source> - <translation>Erreur lors de l'ouverture de l'URL</translation> - </message> - <message> - <source>Setting volume failed</source> - <translation>Le réglage du volume a échoué</translation> - </message> - <message> - <source>Playback complete</source> - <translation>Lecture terminée</translation> - </message> -</context> -<context> - <name>Phonon::MMF::AudioEqualizer</name> - <message> - <source>%1 Hz</source> - <translation>%1 Hz</translation> - </message> -</context> -<context> - <name>Phonon::MMF::AudioPlayer</name> - <message> - <source>Getting position failed</source> - <translation>L'obtention de la position a échoué</translation> - </message> - <message> - <source>Opening clip failed</source> - <translation>L'ouverture du clip a échoué</translation> - </message> -</context> -<context> - <name>Phonon::MMF::EffectFactory</name> - <message> - <source>Enabled</source> - <translation>Activé</translation> - </message> -</context> -<context> - <name>Phonon::MMF::EnvironmentalReverb</name> - <message> - <source>Decay HF ratio (%)</source> - <translation>Ratio HF du déclin (%)</translation> - </message> - <message> - <source>Decay time (ms)</source> - <translation>Temps de déclin (ms)</translation> - </message> - <message> - <source>Density (%)</source> - <translation>Densité (%)</translation> - </message> - <message> - <source>Diffusion (%)</source> - <translation>Diffusion (%)</translation> - </message> - <message> - <source>Reflections delay (ms)</source> - <translation>Délai réflexions (ms)</translation> - </message> - <message> - <source>Reflections level (mB)</source> - <translation>Niveau réflexions (mB)</translation> - </message> - <message> - <source>Reverb delay (ms)</source> - <translation>Délai de réverbération (ms)</translation> - </message> - <message> - <source>Reverb level (mB)</source> - <translation>Niveau de réverbération (mB)</translation> - </message> - <message> - <source>Room HF level</source> - <translation>Niveau HF pièce</translation> - </message> - <message> - <source>Room level (mB)</source> - <translation>Niveau pièce (mB)</translation> - </message> -</context> -<context> - <name>Phonon::MMF::MediaObject</name> - <message> - <source>Error opening source: type not supported</source> - <translation>Erreur lors de l'ouverture de la source: type non supporté</translation> - </message> - <message> - <source>Error opening source: media type could not be determined</source> - <translation>Erreur lors de l'ouverture de la source: type de média non déterminé</translation> - </message> -</context> -<context> - <name>Phonon::MMF::StereoWidening</name> - <message> - <source>Level (%)</source> - <translation>Niveau (%)</translation> - </message> -</context> -<context> - <name>Phonon::MMF::VideoPlayer</name> - <message> - <source>Pause failed</source> - <translation>La mise en pause a échoué</translation> - </message> - <message> - <source>Seek failed</source> - <translation>La recherche a échoué</translation> - </message> - <message> - <source>Getting position failed</source> - <translation>L'obtention de la position a échoué</translation> - </message> - <message> - <source>Opening clip failed</source> - <translation>L'ouverture du clip a échoué</translation> - </message> - <message> - <source>Buffering clip failed</source> - <translation>La mise en mémoire tampon du clip a échoué</translation> - </message> - <message> - <source>Video display error</source> - <translation>Erreur de l'affichage vidéo</translation> - </message> -</context> -<context> - <name>QAccessibleButton</name> - <message> - <source>Press</source> - <translation>Appuyer</translation> - </message> -</context> -<context> - <name>QNetworkAccessDebugPipeBackend</name> - <message> - <source>Write error writing to %1: %2</source> - <translation>Erreur lors de l'écriture dans %1: %2</translation> - </message> -</context> -<context> - <name>QScriptBreakpointsModel</name> - <message> - <source>ID</source> - <translation>Identifiant</translation> - </message> - <message> - <source>Location</source> - <translation>Lieu</translation> - </message> - <message> - <source>Condition</source> - <translation>Condition</translation> - </message> - <message> - <source>Ignore-count</source> - <translation>Comptes d'ignorés</translation> - </message> - <message> - <source>Single-shot</source> - <translation>Un seul tir</translation> - </message> - <message> - <source>Hit-count</source> - <translation>Compte de coups</translation> - </message> -</context> -<context> - <name>QScriptBreakpointsWidget</name> - <message> - <source>New</source> - <translation>Créer</translation> - </message> - <message> - <source>Delete</source> - <translation>Supprimer</translation> - </message> -</context> -<context> - <name>QScriptDebugger</name> - <message> - <source>Go to Line</source> - <translation>Aller à la ligne</translation> - </message> - <message> - <source>Line:</source> - <translation>Ligne:</translation> - </message> - <message> - <source>Interrupt</source> - <translation>Interrompre</translation> - </message> - <message> - <source>Shift+F5</source> - <translation>Shift+F5</translation> - </message> - <message> - <source>Continue</source> - <translation>Continuer</translation> - </message> - <message> - <source>F5</source> - <translation>F5</translation> - </message> - <message> - <source>Step Into</source> - <translation>Pas à pas détaillé</translation> - </message> - <message> - <source>F11</source> - <translation>F11</translation> - </message> - <message> - <source>Step Over</source> - <translation>Pas à pas principal</translation> - </message> - <message> - <source>F10</source> - <translation>F10</translation> - </message> - <message> - <source>Step Out</source> - <translation>Pas à pas sortant</translation> - </message> - <message> - <source>Shift+F11</source> - <translation>Shift+F11</translation> - </message> - <message> - <source>Run to Cursor</source> - <translation>Exécuter au curseur</translation> - </message> - <message> - <source>Ctrl+F10</source> - <translation>Ctrl+F10</translation> - </message> - <message> - <source>Run to New Script</source> - <translation>Exécuter au nouveau script</translation> - </message> - <message> - <source>Toggle Breakpoint</source> - <translation>Basculer le point d'arrêt</translation> - </message> - <message> - <source>F9</source> - <translation>F9</translation> - </message> - <message> - <source>Clear Debug Output</source> - <translation>Effacer les résultats du débogage</translation> - </message> - <message> - <source>Clear Error Log</source> - <translation>Effacer le journal d'erreurs</translation> - </message> - <message> - <source>Clear Console</source> - <translation>Effacer la console</translation> - </message> - <message> - <source>&Find in Script...</source> - <translation>&Chercher dans le script...</translation> - </message> - <message> - <source>Ctrl+F</source> - <translation>Ctrl+F</translation> - </message> - <message> - <source>Find &Next</source> - <translation>Résultat &suivant</translation> - </message> - <message> - <source>F3</source> - <translation>F3</translation> - </message> - <message> - <source>Find &Previous</source> - <translation>Chercher &précédent</translation> - </message> - <message> - <source>Shift+F3</source> - <translation>Shift+F3</translation> - </message> - <message> - <source>Ctrl+G</source> - <translation>Ctrl+G</translation> - </message> - <message> - <source>Debug</source> - <translation>Déboguer</translation> - </message> -</context> -<context> - <name>QScriptDebuggerCodeFinderWidget</name> - <message> - <source>Close</source> - <translation>Fermer</translation> - </message> - <message> - <source>Previous</source> - <translation>Précédent</translation> - </message> - <message> - <source>Next</source> - <translation>Suivant</translation> - </message> - <message> - <source>Case Sensitive</source> - <translation>Sensible à la casse</translation> - </message> - <message> - <source>Whole words</source> - <translation>Mots entiers</translation> - </message> - <message> - <source><img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped</source> - <translation><img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début</translation> - </message> -</context> -<context> - <name>QScriptDebuggerLocalsModel</name> - <message> - <source>Name</source> - <translation>Nom</translation> - </message> - <message> - <source>Value</source> - <translation>Valeur</translation> - </message> -</context> -<context> - <name>QScriptDebuggerStackModel</name> - <message> - <source>Level</source> - <translation>Niveau</translation> - </message> - <message> - <source>Name</source> - <translation>Nom</translation> - </message> - <message> - <source>Location</source> - <translation>Lieu</translation> - </message> -</context> -<context> - <name>QScriptEdit</name> - <message> - <source>Toggle Breakpoint</source> - <translation>Basculer le point d'arrêt</translation> - </message> - <message> - <source>Disable Breakpoint</source> - <translation>Désactiver le point d'arrêt</translation> - </message> - <message> - <source>Enable Breakpoint</source> - <translation>Activer le point d'arrêt</translation> - </message> - <message> - <source>Breakpoint Condition:</source> - <translation>Condition du point d'arrêt:</translation> - </message> -</context> -<context> - <name>QScriptEngineDebugger</name> - <message> - <source>Loaded Scripts</source> - <translation>Scripts chargés</translation> - </message> - <message> - <source>Breakpoints</source> - <translation>Points d'arrêt</translation> - </message> - <message> - <source>Stack</source> - <translation>Empiler</translation> - </message> - <message> - <source>Locals</source> - <translation>Locaux</translation> - </message> - <message> - <source>Console</source> - <translation>Console</translation> - </message> - <message> - <source>Debug Output</source> - <translation>Résultats du débogage</translation> - </message> - <message> - <source>Error Log</source> - <translation>Journal d'erreurs</translation> - </message> - <message> - <source>Search</source> - <translation>Chercher</translation> - </message> - <message> - <source>View</source> - <translation>Afficher</translation> - </message> - <message> - <source>Qt Script Debugger</source> - <translation>Débogueur de script Qt</translation> - </message> -</context> -<context> - <name>QScriptNewBreakpointWidget</name> - <message> - <source>Close</source> - <translation>Fermer</translation> - </message> -</context> -<context> - <name>QSoftKeyManager</name> - <message> - <source>Ok</source> - <translation>OK</translation> - </message> - <message> - <source>Select</source> - <translation>Sélectionner</translation> - </message> - <message> - <source>Done</source> - <translation>Terminer</translation> - </message> - <message> - <source>Options</source> - <translation>Options</translation> - </message> - <message> - <source>Cancel</source> - <translation>Annuler</translation> - </message> - <message> - <source>Exit</source> - <translation>Quitter</translation> - </message> -</context> -<context> - <name>QStateMachine</name> - <message> - <source>Missing initial state in compound state '%1'</source> - <translation>État initial manquant dans l'état composé '%1'</translation> - </message> - <message> - <source>Missing default state in history state '%1'</source> - <translation>État par défaut manquant dans l'état de l'historique '%1'</translation> - </message> - <message> - <source>No common ancestor for targets and source of transition from state '%1'</source> - <translation>Aucun ancêtre commun pour les cibles et la source de transition de l'état '%1'</translation> - </message> - <message> - <source>Unknown error</source> - <translation>Erreur inconnue</translation> - </message> -</context> -<context> - <name>QXmlPatternistCLI</name> - <message> - <source>Warning in %1, at line %2, column %3: %4</source> - <translation>Avertissement dans %1, à la ligne %2, colonne %3: %4</translation> - </message> - <message> - <source>Warning in %1: %2</source> - <translation>Avertissement dans %1: %2</translation> - </message> - <message> - <source>Unknown location</source> - <translation>Lieu inconnu</translation> - </message> - <message> - <source>Error %1 in %2, at line %3, column %4: %5</source> - <translation>Erreur %1 dans %2, à la ligne %3, colonne %4: %5</translation> - </message> - <message> - <source>Error %1 in %2: %3</source> - <translation>Erreur %1 dans %2: %3</translation> - </message> -</context> </TS> diff --git a/translations/qt_help_fr.ts b/translations/qt_help_fr.ts index 3835d10..62bfccc 100644 --- a/translations/qt_help_fr.ts +++ b/translations/qt_help_fr.ts @@ -30,6 +30,14 @@ </message> </context> <context> + <name>QHelp</name> + <message> + <location filename="../tools/assistant/lib/qhelp_global.cpp" line="+64"/> + <source>Untitled</source> + <translation>Sans titre</translation> + </message> +</context> +<context> <name>QHelpCollectionHandler</name> <message> <location filename="../tools/assistant/lib/qhelpcollectionhandler.cpp" line="+79"/> @@ -44,7 +52,7 @@ </message> <message> <location line="+11"/> - <location line="+49"/> + <location line="+52"/> <source>Cannot open collection file: %1</source> <translatorcomment>collection ?</translatorcomment> <translation>Impossible d'ouvrir le fichier collection : %1</translation> @@ -65,7 +73,7 @@ <translation>Impossible de créer le répertoire : %1</translation> </message> <message> - <location line="+23"/> + <location line="+26"/> <source>Cannot copy collection file: %1</source> <translation>Impossible de copier le fichier collection : %1</translation> </message> @@ -75,7 +83,7 @@ <translation>Filtre '%1' inconnu !</translation> </message> <message> - <location line="+55"/> + <location line="+53"/> <source>Cannot register filter %1!</source> <translation>Impossible d'enregistrer le filtre %1 !</translation> </message> @@ -122,7 +130,12 @@ <context> <name>QHelpEngineCore</name> <message> - <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+524"/> + <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+122"/> + <source>Cannot open documentation file %1: %2!</source> + <translation>Impossible d'ouvrir le fichier de documentation %1 : %2 !</translation> + </message> + <message> + <location line="+404"/> <source>The specified namespace does not exist!</source> <translation>L'espace de noms spécifié n'existe pas !</translation> </message> @@ -130,15 +143,14 @@ <context> <name>QHelpEngineCorePrivate</name> <message> - <location line="-402"/> <source>Cannot open documentation file %1: %2!</source> - <translation>Impossible d'ouvrir le fichier de documentation %1 : %2 !</translation> + <translation type="obsolete">Impossible d'ouvrir le fichier de documentation %1 : %2 !</translation> </message> </context> <context> <name>QHelpGenerator</name> <message> - <location filename="../tools/assistant/lib/qhelpgenerator.cpp" line="+157"/> + <location filename="../tools/assistant/lib/qhelpgenerator.cpp" line="+158"/> <source>Invalid help data!</source> <translation>Données d'aide invalides !</translation> </message> @@ -155,7 +167,7 @@ <message> <location line="+7"/> <source>Building up file structure...</source> - <translation>Construction de la structure de fichiers en cours…</translation> + <translation>Construction de la structure de fichiers en cours...</translation> </message> <message> <location line="+11"/> @@ -163,20 +175,20 @@ <translation>Impossible d'ouvrir le fichier de base de données %1 !</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Cannot register namespace %1!</source> <translation>Impossible d'enregistrer l'espace de noms %1 !</translation> </message> <message> <location line="+6"/> <source>Insert custom filters...</source> - <translation>Insértion des filtres personnalisés…</translation> + <translation>Insértion des filtres personnalisés...</translation> </message> <message> <location line="+12"/> <source>Insert help data for filter section (%1 of %2)...</source> <translatorcomment>???</translatorcomment> - <translation>Insertion des données d'aide pour la section filtre (%1 de %2)…</translation> + <translation>Insertion des données d'aide pour la section filtre (%1 de %2)...</translation> </message> <message> <location line="+18"/> @@ -219,7 +231,7 @@ <translation>Impossible d'ouvrir le fichier %1 ! Fichier non pris en compte.</translation> </message> <message> - <location line="+131"/> + <location line="+133"/> <source>The filter %1 is already registered!</source> <translation>Le filtre %1 est déjà enregistré !</translation> </message> @@ -231,12 +243,12 @@ <message> <location line="+24"/> <source>Insert indices...</source> - <translation>Insertion des index…</translation> + <translation>Insertion des index...</translation> </message> <message> - <location line="+80"/> + <location line="+91"/> <source>Insert contents...</source> - <translation>insertion du contenu…</translation> + <translation>insertion du contenu...</translation> </message> <message> <location line="+8"/> @@ -248,64 +260,140 @@ <source>Cannot register contents!</source> <translation>Impossible de référencer le contenu !</translation> </message> + <message> + <location line="+56"/> + <source>File '%1' does not exist.</source> + <translation>Le fichier '%1' n'existe pas.</translation> + </message> + <message> + <location line="+19"/> + <source>File '%1' cannot be opened.</source> + <translation>Le fichier '%1' ne peut être ouvert.</translation> + </message> + <message> + <location line="+19"/> + <source>File '%1' contains an invalid link to file '%2'</source> + <translation>Le fichier '%1' contient un lien invalide vers le fichier '%2'</translation> + </message> + <message> + <location line="+9"/> + <source>Invalid links in HTML files.</source> + <translation>Liens invalides dans les fichiers HTML.</translation> + </message> +</context> +<context> + <name>QHelpProject</name> + <message> + <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+88"/> + <source>Unknown token.</source> + <translation>Identificateur inconnu.</translation> + </message> + <message> + <location line="+13"/> + <source>Unknown token. Expected "QtHelpProject"!</source> + <translation>Identificateur inconnu. "QtHelpProject" attendu !</translation> + </message> + <message> + <location line="+6"/> + <source>Error in line %1: %2</source> + <translation>Erreur à la ligne %1 : %2</translation> + </message> + <message> + <location line="+14"/> + <source>Virtual folder has invalid syntax.</source> + <translation>Syntaxe invalide pour le dossier virtuel.</translation> + </message> + <message> + <location line="+5"/> + <source>Namespace has invalid syntax.</source> + <translation>Syntaxe invalide pour l'espace de noms.</translation> + </message> + <message> + <location line="+19"/> + <source>Missing namespace in QtHelpProject.</source> + <translation>Espace de noms manquant dans QtHelpProject.</translation> + </message> + <message> + <location line="+3"/> + <source>Missing virtual folder in QtHelpProject</source> + <translation>Dossier virtuel manquant dans QtHelpProject</translation> + </message> + <message> + <location line="+89"/> + <source>Missing attribute in keyword at line %1.</source> + <translation>Attribut manquant pour le mot clé à la ligne %1.</translation> + </message> + <message> + <location line="+143"/> + <source>The input file %1 could not be opened!</source> + <translation>Le fichier source %1 n'a pas pu être ouvert !</translation> + </message> </context> <context> <name>QHelpSearchQueryWidget</name> <message> - <location filename="../tools/assistant/lib/qhelpsearchquerywidget.cpp" line="+411"/> + <location filename="../tools/assistant/lib/qhelpsearchquerywidget.cpp" line="+124"/> <source>Search for:</source> <translation>Rechercher :</translation> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Previous search</source> <translation>Recherche précédente</translation> </message> <message> - <location line="+4"/> + <location line="+1"/> <source>Next search</source> <translation>Recherche suivante</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Search</source> <translation>Recherche</translation> </message> <message> - <location line="+20"/> + <location line="+2"/> <source>Advanced search</source> <translation>Recherche avancée</translation> </message> <message> - <location line="+18"/> + <location line="+1"/> <source>words <B>similar</B> to:</source> <translation>mots <B>semblables</B> à :</translation> </message> <message> - <location line="+6"/> + <location line="+1"/> <source><B>without</B> the words:</source> <translation><B>sans</B> les mots :</translation> </message> <message> - <location line="+6"/> + <location line="+1"/> <source>with <B>exact phrase</B>:</source> <translation>avec la <B>phrase exacte</B> :</translation> </message> <message> - <location line="+6"/> + <location line="+1"/> <source>with <B>all</B> of the words:</source> <translation>avec <B>tous</B> les mots :</translation> </message> <message> - <location line="+6"/> + <location line="+1"/> <source>with <B>at least one</B> of the words:</source> <translation>avec <B>au moins un</B> des mots :</translation> </message> </context> <context> <name>QHelpSearchResultWidget</name> + <message numerus="yes"> + <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+174"/> + <source>%1 - %2 of %n Hits</source> + <translation> + <numerusform>%1 - %2 de %n résultat</numerusform> + <numerusform>%1 - %2 de %n résultats</numerusform> + </translation> + </message> <message> - <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+235"/> + <location line="+61"/> <source>0 - 0 of 0 Hits</source> <translation>0 - 0 de 0 résultats</translation> </message> @@ -313,63 +401,52 @@ <context> <name>QHelpSearchResultWidgetPrivate</name> <message> - <location line="-61"/> <source>%1 - %2 of %3 Hits</source> - <translation>%1 - %2 de %3 résultats</translation> + <translation type="obsolete">%1 - %2 de %3 résultats</translation> </message> </context> <context> <name>QObject</name> <message> - <location filename="../tools/assistant/lib/qhelp_global.h" line="+83"/> <source>Untitled</source> - <translation>Sans titre</translation> + <translation type="obsolete">Sans titre</translation> </message> <message> - <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+85"/> <source>Unknown token.</source> <translatorcomment>contexte peu clair...</translatorcomment> - <translation>Identificateur inconnu.</translation> + <translation type="obsolete">Identificateur inconnu.</translation> </message> <message> - <location line="+13"/> <source>Unknown token. Expected "QtHelpProject"!</source> - <translation>Identificateur inconnu. "QtHelpProject" attendu !</translation> + <translation type="obsolete">Identificateur inconnu. "QtHelpProject" attendu !</translation> </message> <message> - <location line="+5"/> <source>Error in line %1: %2</source> - <translation>Erreur à la ligne %1 : %2</translation> + <translation type="obsolete">Erreur à la ligne %1 : %2</translation> </message> <message> - <location line="+13"/> <source>A virtual folder must not contain a '/' character!</source> - <translation>Un dossier virtuel ne doit pas contenir le caractère '/' !</translation> + <translation type="obsolete">Un dossier virtuel ne doit pas contenir le caractère '/' !</translation> </message> <message> - <location line="+4"/> <source>A namespace must not contain a '/' character!</source> - <translation>Un espace de noms ne doit pas contenir le caractère '/' !</translation> + <translation type="obsolete">Un espace de noms ne doit pas contenir le caractère '/' !</translation> </message> <message> - <location line="+16"/> <source>Missing namespace in QtHelpProject.</source> - <translation>Espace de noms manquant dans QtHelpProject.</translation> + <translation type="obsolete">Espace de noms manquant dans QtHelpProject.</translation> </message> <message> - <location line="+2"/> <source>Missing virtual folder in QtHelpProject</source> - <translation>Dossier virtuel manquant dans QtHelpProject</translation> + <translation type="obsolete">Dossier virtuel manquant dans QtHelpProject</translation> </message> <message> - <location line="+88"/> <source>Missing attribute in keyword at line %1.</source> - <translation>Attribut manquant pour le mot clé à la ligne %1.</translation> + <translation type="obsolete">Attribut manquant pour le mot clé à la ligne %1.</translation> </message> <message> - <location line="+123"/> <source>The input file %1 could not be opened!</source> - <translation>Le fichier source %1 n'a pas pu être ouvert !</translation> + <translation type="obsolete">Le fichier source %1 n'a pas pu être ouvert !</translation> </message> </context> </TS> |
