diff options
121 files changed, 1315 insertions, 1010 deletions
diff --git a/doc/images/qml-toolbar-animation.png b/doc/images/qml-toolbar-animation.png Binary files differindex 6178fa58a2..28bb9a3a4f 100644 --- a/doc/images/qml-toolbar-animation.png +++ b/doc/images/qml-toolbar-animation.png diff --git a/doc/images/qml-toolbar-image-preview.png b/doc/images/qml-toolbar-image-preview.png Binary files differindex ffdc8bddfa..3f6e02d200 100644 --- a/doc/images/qml-toolbar-image-preview.png +++ b/doc/images/qml-toolbar-image-preview.png diff --git a/doc/images/qml-toolbar-image.png b/doc/images/qml-toolbar-image.png Binary files differindex e100e87c5b..43e79f5582 100644 --- a/doc/images/qml-toolbar-image.png +++ b/doc/images/qml-toolbar-image.png diff --git a/doc/images/qml-toolbar-pin.png b/doc/images/qml-toolbar-pin.png Binary files differindex b0bfcd0eca..8fce27b986 100644 --- a/doc/images/qml-toolbar-pin.png +++ b/doc/images/qml-toolbar-pin.png diff --git a/doc/images/qml-toolbar-rectangle.png b/doc/images/qml-toolbar-rectangle.png Binary files differindex a968677e7c..296fb79815 100644 --- a/doc/images/qml-toolbar-rectangle.png +++ b/doc/images/qml-toolbar-rectangle.png diff --git a/doc/images/qml-toolbar-text.png b/doc/images/qml-toolbar-text.png Binary files differindex 985a9fa204..3cbc055434 100644 --- a/doc/images/qml-toolbar-text.png +++ b/doc/images/qml-toolbar-text.png diff --git a/doc/images/qml-translate.png b/doc/images/qml-translate.png Binary files differindex 346be5fb0c..3b2228b7c8 100644 --- a/doc/images/qml-translate.png +++ b/doc/images/qml-translate.png diff --git a/doc/images/qmldesigner-borderimage.png b/doc/images/qmldesigner-borderimage.png Binary files differindex c28386bd47..d766161fb0 100644 --- a/doc/images/qmldesigner-borderimage.png +++ b/doc/images/qmldesigner-borderimage.png diff --git a/doc/images/qmldesigner-button.png b/doc/images/qmldesigner-button.png Binary files differindex 21556d56e9..faf511fb63 100644 --- a/doc/images/qmldesigner-button.png +++ b/doc/images/qmldesigner-button.png diff --git a/doc/images/qmldesigner-center-in.png b/doc/images/qmldesigner-center-in.png Binary files differindex 5d2213016e..979f9796b6 100644 --- a/doc/images/qmldesigner-center-in.png +++ b/doc/images/qmldesigner-center-in.png diff --git a/doc/images/qmldesigner-code-completion.png b/doc/images/qmldesigner-code-completion.png Binary files differindex e925a8722e..f374766e05 100644 --- a/doc/images/qmldesigner-code-completion.png +++ b/doc/images/qmldesigner-code-completion.png diff --git a/doc/images/qmldesigner-screen-design.png b/doc/images/qmldesigner-screen-design.png Binary files differindex e72e49f8cb..fc18f060bd 100644 --- a/doc/images/qmldesigner-screen-design.png +++ b/doc/images/qmldesigner-screen-design.png diff --git a/doc/images/qmldesigner-states.png b/doc/images/qmldesigner-states.png Binary files differindex 1cbd979b16..7d96ea42be 100644 --- a/doc/images/qmldesigner-states.png +++ b/doc/images/qmldesigner-states.png diff --git a/doc/images/qtcreator-add-online-doc.png b/doc/images/qtcreator-add-online-doc.png Binary files differindex 1c52c07aa9..ca9e148b42 100644 --- a/doc/images/qtcreator-add-online-doc.png +++ b/doc/images/qtcreator-add-online-doc.png diff --git a/doc/images/qtcreator-analyzer-settings.png b/doc/images/qtcreator-analyzer-settings.png Binary files differindex ee308a9ca5..f9a587947c 100644 --- a/doc/images/qtcreator-analyzer-settings.png +++ b/doc/images/qtcreator-analyzer-settings.png diff --git a/doc/images/qtcreator-back.png b/doc/images/qtcreator-back.png Binary files differindex 4d75f51a36..7d936d0515 100644 --- a/doc/images/qtcreator-back.png +++ b/doc/images/qtcreator-back.png diff --git a/doc/images/qtcreator-blockhighlighting.png b/doc/images/qtcreator-blockhighlighting.png Binary files differindex a4d73173f9..63a5cbc524 100644 --- a/doc/images/qtcreator-blockhighlighting.png +++ b/doc/images/qtcreator-blockhighlighting.png diff --git a/doc/images/qtcreator-clear.png b/doc/images/qtcreator-clear.png Binary files differindex 1fa6546ecd..f60be050c5 100644 --- a/doc/images/qtcreator-clear.png +++ b/doc/images/qtcreator-clear.png diff --git a/doc/images/qtcreator-code-style-alignment.png b/doc/images/qtcreator-code-style-alignment.png Binary files differindex 1a07f30a11..2f60c10fe7 100644 --- a/doc/images/qtcreator-code-style-alignment.png +++ b/doc/images/qtcreator-code-style-alignment.png diff --git a/doc/images/qtcreator-code-style-braces.png b/doc/images/qtcreator-code-style-braces.png Binary files differindex 1d7a1fc19d..f2d9cf19e0 100644 --- a/doc/images/qtcreator-code-style-braces.png +++ b/doc/images/qtcreator-code-style-braces.png diff --git a/doc/images/qtcreator-code-style-content.png b/doc/images/qtcreator-code-style-content.png Binary files differindex 406bb56b4c..6fd1089613 100644 --- a/doc/images/qtcreator-code-style-content.png +++ b/doc/images/qtcreator-code-style-content.png diff --git a/doc/images/qtcreator-code-style-switch.png b/doc/images/qtcreator-code-style-switch.png Binary files differindex f1bee850d3..5038c4f446 100644 --- a/doc/images/qtcreator-code-style-switch.png +++ b/doc/images/qtcreator-code-style-switch.png diff --git a/doc/images/qtcreator-codecompletion.png b/doc/images/qtcreator-codecompletion.png Binary files differindex be66651a5a..1d3b5600a9 100644 --- a/doc/images/qtcreator-codecompletion.png +++ b/doc/images/qtcreator-codecompletion.png diff --git a/doc/images/qtcreator-edit-code-snippets.png b/doc/images/qtcreator-edit-code-snippets.png Binary files differindex 4a77cc04f0..91e50ce5ba 100644 --- a/doc/images/qtcreator-edit-code-snippets.png +++ b/doc/images/qtcreator-edit-code-snippets.png diff --git a/doc/images/qtcreator-editor-casesensitive.png b/doc/images/qtcreator-editor-casesensitive.png Binary files differdeleted file mode 100644 index 82254cf49f..0000000000 --- a/doc/images/qtcreator-editor-casesensitive.png +++ /dev/null diff --git a/doc/images/qtcreator-editor-regularexpressions.png b/doc/images/qtcreator-editor-regularexpressions.png Binary files differdeleted file mode 100644 index ed8ae9c89a..0000000000 --- a/doc/images/qtcreator-editor-regularexpressions.png +++ /dev/null diff --git a/doc/images/qtcreator-editor-wholewords.png b/doc/images/qtcreator-editor-wholewords.png Binary files differdeleted file mode 100644 index 6c07406dbc..0000000000 --- a/doc/images/qtcreator-editor-wholewords.png +++ /dev/null diff --git a/doc/images/qtcreator-editortoolbar-symbols.png b/doc/images/qtcreator-editortoolbar-symbols.png Binary files differindex d966a8daed..7386697de3 100644 --- a/doc/images/qtcreator-editortoolbar-symbols.png +++ b/doc/images/qtcreator-editortoolbar-symbols.png diff --git a/doc/images/qtcreator-embedded-linux-deployment.png b/doc/images/qtcreator-embedded-linux-deployment.png Binary files differnew file mode 100644 index 0000000000..eb015b9f03 --- /dev/null +++ b/doc/images/qtcreator-embedded-linux-deployment.png diff --git a/doc/images/qtcreator-expand.png b/doc/images/qtcreator-expand.png Binary files differindex 9841e6b42a..3ee9bfe8e0 100644 --- a/doc/images/qtcreator-expand.png +++ b/doc/images/qtcreator-expand.png diff --git a/doc/images/qtcreator-fakevim-options.png b/doc/images/qtcreator-fakevim-options.png Binary files differnew file mode 100644 index 0000000000..5bcf99c10f --- /dev/null +++ b/doc/images/qtcreator-fakevim-options.png diff --git a/doc/images/qtcreator-font-colors.png b/doc/images/qtcreator-font-colors.png Binary files differindex 1df5031313..b4bcafcbd7 100644 --- a/doc/images/qtcreator-font-colors.png +++ b/doc/images/qtcreator-font-colors.png diff --git a/doc/images/qtcreator-formedit.png b/doc/images/qtcreator-formedit.png Binary files differindex ac95222093..4ac5720b64 100644 --- a/doc/images/qtcreator-formedit.png +++ b/doc/images/qtcreator-formedit.png diff --git a/doc/images/qtcreator-forward.png b/doc/images/qtcreator-forward.png Binary files differindex 4f27cdba1f..da9a9e8e83 100644 --- a/doc/images/qtcreator-forward.png +++ b/doc/images/qtcreator-forward.png diff --git a/doc/images/qtcreator-generic-highlighter.png b/doc/images/qtcreator-generic-highlighter.png Binary files differindex c1cf8844b9..322d4efe62 100644 --- a/doc/images/qtcreator-generic-highlighter.png +++ b/doc/images/qtcreator-generic-highlighter.png diff --git a/doc/images/qtcreator-gs-build-example-targets.png b/doc/images/qtcreator-gs-build-example-targets.png Binary files differindex 9047b93d20..72437f6789 100644 --- a/doc/images/qtcreator-gs-build-example-targets.png +++ b/doc/images/qtcreator-gs-build-example-targets.png diff --git a/doc/images/qtcreator-indentation.png b/doc/images/qtcreator-indentation.png Binary files differindex 65721093c6..3eaca819da 100644 --- a/doc/images/qtcreator-indentation.png +++ b/doc/images/qtcreator-indentation.png diff --git a/doc/images/qtcreator-linux-device-configurations.png b/doc/images/qtcreator-linux-device-configurations.png Binary files differindex ee271eb944..23f284726e 100644 --- a/doc/images/qtcreator-linux-device-configurations.png +++ b/doc/images/qtcreator-linux-device-configurations.png diff --git a/doc/images/qtcreator-locator-customize.png b/doc/images/qtcreator-locator-customize.png Binary files differindex 51f575b2ff..01aaab0a76 100644 --- a/doc/images/qtcreator-locator-customize.png +++ b/doc/images/qtcreator-locator-customize.png diff --git a/doc/images/qtcreator-locator-magnify.png b/doc/images/qtcreator-locator-magnify.png Binary files differindex 62c2f44972..746ff20be2 100644 --- a/doc/images/qtcreator-locator-magnify.png +++ b/doc/images/qtcreator-locator-magnify.png diff --git a/doc/images/qtcreator-locator-open.png b/doc/images/qtcreator-locator-open.png Binary files differindex 1c420cedf2..017bc31afa 100644 --- a/doc/images/qtcreator-locator-open.png +++ b/doc/images/qtcreator-locator-open.png diff --git a/doc/images/qtcreator-locator.png b/doc/images/qtcreator-locator.png Binary files differindex 8ad4d9319e..ae3b1f2b2e 100644 --- a/doc/images/qtcreator-locator.png +++ b/doc/images/qtcreator-locator.png diff --git a/doc/images/qtcreator-maemo-deb-package.png b/doc/images/qtcreator-maemo-deb-package.png Binary files differindex 3e6c084b09..7a8b6071e0 100644 --- a/doc/images/qtcreator-maemo-deb-package.png +++ b/doc/images/qtcreator-maemo-deb-package.png diff --git a/doc/images/qtcreator-maemo-deployment.png b/doc/images/qtcreator-maemo-deployment.png Binary files differindex 9987311632..e1692df4e6 100644 --- a/doc/images/qtcreator-maemo-deployment.png +++ b/doc/images/qtcreator-maemo-deployment.png diff --git a/doc/images/qtcreator-manage-definitions.png b/doc/images/qtcreator-manage-definitions.png Binary files differindex 5c8e25d7f8..9778e28d63 100644 --- a/doc/images/qtcreator-manage-definitions.png +++ b/doc/images/qtcreator-manage-definitions.png diff --git a/doc/images/qtcreator-mime-types-magic-header.png b/doc/images/qtcreator-mime-types-magic-header.png Binary files differindex 3a35ffa504..f8736d030e 100644 --- a/doc/images/qtcreator-mime-types-magic-header.png +++ b/doc/images/qtcreator-mime-types-magic-header.png diff --git a/doc/images/qtcreator-mime-types.png b/doc/images/qtcreator-mime-types.png Binary files differindex a8982e7a54..5d53b80898 100644 --- a/doc/images/qtcreator-mime-types.png +++ b/doc/images/qtcreator-mime-types.png diff --git a/doc/images/qtcreator-navigate-customfilter.png b/doc/images/qtcreator-navigate-customfilter.png Binary files differindex 2d8c30e151..bf8943d445 100644 --- a/doc/images/qtcreator-navigate-customfilter.png +++ b/doc/images/qtcreator-navigate-customfilter.png diff --git a/doc/images/qtcreator-navigate-popup.png b/doc/images/qtcreator-navigate-popup.png Binary files differindex f1e5c39ea7..7cb42aef87 100644 --- a/doc/images/qtcreator-navigate-popup.png +++ b/doc/images/qtcreator-navigate-popup.png diff --git a/doc/images/qtcreator-next.png b/doc/images/qtcreator-next.png Binary files differindex cbbb47a9b8..70d1a02311 100644 --- a/doc/images/qtcreator-next.png +++ b/doc/images/qtcreator-next.png diff --git a/doc/images/qtcreator-open-project-targets.png b/doc/images/qtcreator-open-project-targets.png Binary files differindex 524e8187c0..524bb566e8 100644 --- a/doc/images/qtcreator-open-project-targets.png +++ b/doc/images/qtcreator-open-project-targets.png diff --git a/doc/images/qtcreator-options-code-style-cpp.png b/doc/images/qtcreator-options-code-style-cpp.png Binary files differindex e1a4e5c802..ba54d09e49 100644 --- a/doc/images/qtcreator-options-code-style-cpp.png +++ b/doc/images/qtcreator-options-code-style-cpp.png diff --git a/doc/images/qtcreator-options-code-style-qml.png b/doc/images/qtcreator-options-code-style-qml.png Binary files differindex f633b1b6f9..538155eb7b 100644 --- a/doc/images/qtcreator-options-code-style-qml.png +++ b/doc/images/qtcreator-options-code-style-qml.png diff --git a/doc/images/qtcreator-pprunsettings.png b/doc/images/qtcreator-pprunsettings.png Binary files differindex fe79cfadf1..35528c761a 100644 --- a/doc/images/qtcreator-pprunsettings.png +++ b/doc/images/qtcreator-pprunsettings.png diff --git a/doc/images/qtcreator-previous.png b/doc/images/qtcreator-previous.png Binary files differindex 24f4c4934b..8d67ed89ff 100644 --- a/doc/images/qtcreator-previous.png +++ b/doc/images/qtcreator-previous.png diff --git a/doc/images/qtcreator-qt4-symbian-device-connected.png b/doc/images/qtcreator-qt4-symbian-device-connected.png Binary files differindex 56cecc7866..5d570517cc 100644 --- a/doc/images/qtcreator-qt4-symbian-device-connected.png +++ b/doc/images/qtcreator-qt4-symbian-device-connected.png diff --git a/doc/images/qtcreator-qt4-symbian-signing.png b/doc/images/qtcreator-qt4-symbian-signing.png Binary files differindex f5a3394b62..e43cd4deea 100644 --- a/doc/images/qtcreator-qt4-symbian-signing.png +++ b/doc/images/qtcreator-qt4-symbian-signing.png diff --git a/doc/images/qtcreator-refactoring-find.png b/doc/images/qtcreator-refactoring-find.png Binary files differindex 271b61c239..288b51a030 100644 --- a/doc/images/qtcreator-refactoring-find.png +++ b/doc/images/qtcreator-refactoring-find.png diff --git a/doc/images/qtcreator-refactoring-replace.png b/doc/images/qtcreator-refactoring-replace.png Binary files differindex 49d28a1b42..8cf98e94d1 100644 --- a/doc/images/qtcreator-refactoring-replace.png +++ b/doc/images/qtcreator-refactoring-replace.png diff --git a/doc/images/qtcreator-remove-deploy-step.png b/doc/images/qtcreator-remove-deploy-step.png Binary files differindex 5bd6fa8e12..efe30a4f8c 100644 --- a/doc/images/qtcreator-remove-deploy-step.png +++ b/doc/images/qtcreator-remove-deploy-step.png diff --git a/doc/images/qtcreator-remove-split-button.png b/doc/images/qtcreator-remove-split-button.png Binary files differnew file mode 100644 index 0000000000..434e31cb06 --- /dev/null +++ b/doc/images/qtcreator-remove-split-button.png diff --git a/doc/images/qtcreator-run-settings-create.png b/doc/images/qtcreator-run-settings-create.png Binary files differindex 3328eabf6d..61cdfbac6b 100644 --- a/doc/images/qtcreator-run-settings-create.png +++ b/doc/images/qtcreator-run-settings-create.png diff --git a/doc/images/qtcreator-run-settings-linux-devices.png b/doc/images/qtcreator-run-settings-linux-devices.png Binary files differindex 939c3e081e..533b51fa76 100644 --- a/doc/images/qtcreator-run-settings-linux-devices.png +++ b/doc/images/qtcreator-run-settings-linux-devices.png diff --git a/doc/images/qtcreator-screenshot-devconf-linux.png b/doc/images/qtcreator-screenshot-devconf-linux.png Binary files differindex 97ca9d6f00..cb69dca7b3 100644 --- a/doc/images/qtcreator-screenshot-devconf-linux.png +++ b/doc/images/qtcreator-screenshot-devconf-linux.png diff --git a/doc/images/qtcreator-screenshot-run-settings-maemo.png b/doc/images/qtcreator-screenshot-run-settings-maemo.png Binary files differindex 8fe3559da2..f95153d676 100644 --- a/doc/images/qtcreator-screenshot-run-settings-maemo.png +++ b/doc/images/qtcreator-screenshot-run-settings-maemo.png diff --git a/doc/images/qtcreator-search-allprojects.png b/doc/images/qtcreator-search-allprojects.png Binary files differindex e74dac67ce..8cecbf686e 100644 --- a/doc/images/qtcreator-search-allprojects.png +++ b/doc/images/qtcreator-search-allprojects.png diff --git a/doc/images/qtcreator-search-cpp-symbols.png b/doc/images/qtcreator-search-cpp-symbols.png Binary files differindex 57838cf9e8..706ec20ade 100644 --- a/doc/images/qtcreator-search-cpp-symbols.png +++ b/doc/images/qtcreator-search-cpp-symbols.png diff --git a/doc/images/qtcreator-searchresults.png b/doc/images/qtcreator-searchresults.png Binary files differindex b59fa60bd0..0b9c06cae8 100644 --- a/doc/images/qtcreator-searchresults.png +++ b/doc/images/qtcreator-searchresults.png diff --git a/doc/images/qtcreator-semanticerror.png b/doc/images/qtcreator-semanticerror.png Binary files differindex 1d8bb335d0..e6920b98ca 100644 --- a/doc/images/qtcreator-semanticerror.png +++ b/doc/images/qtcreator-semanticerror.png diff --git a/doc/images/qtcreator-split-button.png b/doc/images/qtcreator-split-button.png Binary files differnew file mode 100644 index 0000000000..8ab798c6ed --- /dev/null +++ b/doc/images/qtcreator-split-button.png diff --git a/doc/images/qtcreator-spliteditorview.png b/doc/images/qtcreator-spliteditorview.png Binary files differindex 86a5f8db93..e7d99593e5 100644 --- a/doc/images/qtcreator-spliteditorview.png +++ b/doc/images/qtcreator-spliteditorview.png diff --git a/doc/images/qtcreator-symbian-run-settings.png b/doc/images/qtcreator-symbian-run-settings.png Binary files differindex 90bd00b233..3daefc707a 100644 --- a/doc/images/qtcreator-symbian-run-settings.png +++ b/doc/images/qtcreator-symbian-run-settings.png diff --git a/doc/images/qtcreator-syntaxerror.png b/doc/images/qtcreator-syntaxerror.png Binary files differindex f7ec9c6b20..2f8916ce3b 100644 --- a/doc/images/qtcreator-syntaxerror.png +++ b/doc/images/qtcreator-syntaxerror.png diff --git a/doc/images/qtcreator-target-selector.png b/doc/images/qtcreator-target-selector.png Binary files differindex 5035cfc2ac..62ac377e9b 100644 --- a/doc/images/qtcreator-target-selector.png +++ b/doc/images/qtcreator-target-selector.png diff --git a/doc/images/qtcreator-togglebookmark.png b/doc/images/qtcreator-togglebookmark.png Binary files differindex d643df87b1..87cd120bab 100644 --- a/doc/images/qtcreator-togglebookmark.png +++ b/doc/images/qtcreator-togglebookmark.png diff --git a/doc/snippets/qml/quick-scalable-image.qml b/doc/snippets/qml/quick-scalable-image.qml index fe82b298f4..e469173876 100644 --- a/doc/snippets/qml/quick-scalable-image.qml +++ b/doc/snippets/qml/quick-scalable-image.qml @@ -1,8 +1,12 @@ Item { //! [properties and signal definitions] property string text: "" - property int fontSize: 44 + property int fontSize: 10 signal clicked + + width: 60 + height: 40 + //! [properties and signal definitions] } diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index f2e36d1ae3..7e89228dbd 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -39,38 +39,24 @@ \list - \o \l{Debugging a C++ Example Application} - - Illustrates how to debug Qt C++ applications in the \gui Debug - mode. - - \o \l{Debugging a Qt Quick Example Application} + \o \l{Setting Up Debugger} - Illustrates how to debug Qt Quick applications in the \gui Debug - mode. + The debugger plugin automatically selects a suitable + native debugger for your projects from the ones found + on your system. Manual overriding of this choice is possible. \o \l{Launching the Debugger} - To start a program under the control of the debugger, press - \key{F5}. \QC checks whether the compiled program is up-to-date, - and rebuilds it if necessary. The debugger then takes over and - starts the program. The debugger is launched in the appropriate - operating mode (plain, terminal, or on-device), based on the - build and run settings for the active project. You can also launch - the debugger in other mode. + To start an application from an open project under the control + of a debugger, press the Debug button in the lower left corner + of the main view, or press \key{F5}. Other, less common start + options are available in the \gui{Debug} > \gui{Start Debugging} + menu. \o \l{Interacting with the Debugger} - You can use the \QC \gui Debug mode to inspect the state of your - application while debugging. - - \o \l{Setting Up Debugger} - - The debugger plugin tries to automatically pick up a suitable - native debugger. You only need to set it up if the automatic setup - fails, because the native debugger is missing (as is usually the - case for the CDB debugger on Windows, which you always must install - yourself) or because the installed version is not supported. + You can use the tool views in the \gui Debug mode to inspect the + state of your application while debugging. \o \l{Using Debugging Helpers} @@ -78,12 +64,13 @@ user-extensible manner. For this purpose, it takes advantage of two technologies, collectively referred to as \e {debugging helpers}. Using the debugging helpers is not essential for - debugging with \QC, but they help you to quickly examine complex - data. + debugging with \QC, but they provide you with a powerful + tool to quickly examine complex data. \o \l{Debugging Qt Quick Projects} - In the \gui Debug mode, you can inspect the state of the + When debugging a Qt Quick application, you can inspect the state + of the application while debugging JavaScript functions. You can set breakpoints, view call stack trace, and examine locals and expressions. When the application is interrupted by a breakpoint, @@ -94,6 +81,14 @@ view to explore the object structure, debug animations, and inspect colors. + \o \l{Debugging a C++ Example Application} + + Illustrates how to debug C++ applications in \QC. + + \o \l{Debugging a Qt Quick Example Application} + + Illustrates how to debug Qt Quick applications in \QC. + \o \l{Troubleshooting Debugger} If you encounter problems while debugging, check for possible @@ -111,83 +106,129 @@ \title Launching the Debugger - To start a program under the control of the debugger, select \gui{Debug} > - \gui{Start Debugging} > \gui{Start Debugging}, or press \key{F5}. + To start an application from an open project under the control + of a debugger, press the \gui Debug button in the lower left corner + of the main view, or press \key{F5}. + \QC checks whether the compiled program is up-to-date, and rebuilds - it if necessary. The debugger then takes over and starts the program. + and deploys it if the \gui{Always build project before deploying it} and + \gui{Always deploy before running} options are selected in the + \gui{Build and Run} options. + + The debugger then takes over and starts the program with suitable + parameters. - \note Starting a program in the debugger can take a long + \note Starting a C++ program in the debugger can take a long time, typically in the range of several seconds to minutes if complex features (like QtWebKit) are used. - The debugger is launched in the appropriate operating mode (plain, terminal, - or on-device), based on the build and run settings for the active project. - Select \gui Debug menu options to launch the debugger in other modes. - - \note Debugging QML and JavaScript is supported only in plain mode. \section1 Launching the Debugger in Different Modes - The debugger plugin runs in different operating modes depending on where and - how the process is started and run. Some of the modes are only available for - a particular operating system or platform. + The debugger plugin can run the native debuggers in various operating + modes depending on where and how the process is started and run. Some + of the modes are only available for a particular operating system or + platform. + + In general, the \key{F5} and the \gui{Debug} button are set up in a way + to start operating mode that is commonly used the a given context. + So if the current project is set up as a C++ application using + the MinGW toolchain targeting desktop Windows, the GDB engine will + be started in Start Local mode. If the current project is a + QML application using C++ plugins targeting Meego + a "mixed" QML/C++ engine will be started, with the C++ parts + being handled by GDB and GDB server remote debugging. + + To select other modes of operation, change the run run configuration + parameters (such as \gui{Run in Terminal}) in the run settings of the + project, or select options from the \gui{Debug} > \gui{Start Debugging} + menu. - You can launch the debugger in the following modes: + The debugger can run in the following modes: \list - \o \bold Plain to debug locally started applications, such as a + \o \bold{Start Local} to debug locally started applications, such as a Qt based GUI application. - \o \bold Terminal to debug locally started processes that need a + \o \bold{Terminal} to debug locally started processes that need a console, typically without a GUI. - \o \bold Attach to debug local processes started outside \QC. + \o \bold{Attach Local} to debug local processes started outside \QC. - \o \bold Remote to debug a process running on a different machine. + \o \bold{Start Remote} to start and debug processes running + on a different machine. - \o \bold Core to debug crashed processes on Unix. + \o \bold{Attach Remote} to attach to a process running on a different + machine. - \o \bold Post-mortem to debug crashed processes on Windows. + \o \bold{Core} to debug crashed processes on Unix. - \o \bold On-device to debug processes running on a mobile device. + \o \bold{Post-mortem} to debug crashed processes on Windows. \endlist - \note Debugging QML and JavaScript is supported only in plain mode. + \section2 Launching in Start Local Mode - \section2 Launching in Plain Mode + Start Local mode is the default start mode for most projects, including + all projects using a desktop Qt version and plain C++ projects. + + To launch the debugger in Start Local mode, click the + \gui {Start Debugging} button for the active project. + + To lauch Start Local mode to run any executable already present in the + system without using a project, select \gui{Debug > Start Debugging + > Start and Debug External Application}. - To launch the debugger in the plain mode, click the \gui {Start Debugging} - button for the active project, or choose - \gui {Debug > Start Debugging > Start and Debug External Application} - and specify an executable. \section2 Launching in Terminal Mode - To launch the debugger in the terminal mode, select \gui {Projects > Run - Settings} and select the \gui {Run in terminal} check box. Then click the - \gui {Start Debugging} button for the active project. + Terminal mode is a variation of Start Local and creates an additional + console window to enable user-terminal interaction. This is mainly + useful for non-GUI applications using the stdin and stdout channels + for communication. To launch the debugger in the terminal mode, + go to \gui {Projects > Run + Settings} and select the \gui {Run in terminal} check box. + Then click the \gui {Start Debugging} button for the active project. - \section2 Launching in Attach Mode + \section2 Launching in Attach Local Mode - To launch the debugger in the attach mode, select - \gui {Debug > Start Debugging > Attach to Running External Application}, + To attach the debugger to an already running process, select + \gui {Debug > Start Debugging > Attach to Running Local Application}, and then select a process by its name or process ID to attach to. - You can load the source project in advance and set breakpoints in it before - attaching to an already running process. For more information, see - \l{Setting Breakpoints}. + While this mode does not strictly require a project to be opened in \QC, + it is beneficial to have open one, as it makes setting breakpoints + and stepping throught the code easier. + + For more information, see \l{Setting Breakpoints}. + + \section2 Launching Remote Modes - \section2 Launching in Remote Mode + The Remote modes allow you to debug processes that run on remote + machines. - The remote mode allows you to debug processes that run on remote machines. + In general, the setup consist of a probe running on the remote + machine and a counterpart running on the host side. + The probe is either integrated into the running process (e.g. for QML + debugging) or runs a separate process (e.g. when using GDB server + on embedded Linux, or TRK/CODA on Symbian). The host side typically + consists of \QC itself, often with help of external process such + as CDB or GDB. + + While this setup might look daunting, it is mostly invisible to + the user. With a properly loaded and configured project, pressing + \key{F5} starts up all necessary helper processes and debugging on + the selected target. + + Special use cases, such as attaching to a running process on the + target, might still require manual setup. \section3 Using GDB - In remote mode, the local GDB process talks to a GDB server - process running on the remote machine that controls the process to be - debugged. + When debugging on a target supported by GDB server, a local GDB process + talks to a GDB server running on the remote machine that controls the + process to be debugged. The GDB server process is started on the remote machines by passing a port number and the executable: @@ -206,8 +247,8 @@ \list 1 - \o Select \gui {Debug > Start Debugging > Start and Attach to Remote - Application}. + \o Select \gui {Debug > Start Debugging > Attach to Remote + Debug Server}. \o In the \gui {Host and port} field, enter the name of the remote machine and the port number to use. @@ -284,8 +325,9 @@ \section2 Launching in Core Mode - The core mode it used to debug \e {core} files (crash dumps) that are - generated from crashed processes if the system is set up to allow this. + The Core mode is used to inspect \e {core} files (crash dumps) that are + generated from crashed processes on Linux and Unix systems if the system + is set up to allow this. To enable the dumping of core files on a Unix system enter the following command in the shell from which the application will be launched: @@ -294,8 +336,12 @@ ulimit -c unlimited \endcode - To launch the debugger in the core mode, select \gui{Debug > Start Debugging - > Attach to Core}. + To launch the debugger in the core mode, select \gui{Debug > Start + Debugging > Attach to Core}. + + Also in this mode, using a properly configured project containing + the sources of the crashed program is not strictly necessary, but + helpful. \section2 Launching in Post-Mortem Mode @@ -311,17 +357,6 @@ crashes on Windows. Click the \gui {Debug in \QC} button in the error message that is displayed by the Windows operating system. - \section2 Launching in On-device Mode - - The on-device mode is a special mode available for run configurations - targeting mobile devices. It debugs processes running on mobile - devices using on-device debugging agents, such as CODA on Symbian and - gdbserver on Linux-based devices. - - To launch the debugger in the on-device mode, open the project, select a - run configuration that targets a mobile device, and click the - \gui {Start Debugging} button. - */ @@ -333,39 +368,78 @@ \title Setting Up Debugger - \note The information in this section applies only to debugging the C++ - language. + The main debugger settings are associated with the tool chains used + to build your project. - Typically, the interaction between \QC and the native debugger is set up - automatically and you do not need to do anything. However, you might have an - unsupported GDB version installed, your Linux environment might not have GDB - installed at all, or you might want to use the debugging tools for Windows. + To configure tool chains, select \gui{Tools > Options > Build and Run > + Tool Chains}. The view lists the tool chains that \QC detected automatically. + You can add tool chains. - \note To use the debugging tools for Windows, you must install them and add - the Symbol Server provided by Microsoft to the symbol search path of the - debugger. For more information, see \l{Setting the Symbol Server in Windows}. + You need to set up the debugger only if the automatic setup + fails, because the native debugger is missing (as is usually the + case for the CDB debugger on Windows, which you always must install + yourself) or because the installed version is not supported (e.g. + when your system contains no, or an outdated version of GDB and you + want to use a locally installed replacement instead). - \note To use the Free Software Foundation (FSF) GDB on Mac OS, you must - sign it and add it to \QC as a tool chain. + \note If you need to change parameters of an automatically detected + toolchain, you can \gui{Clone} the tool chain and change the + parameters in the clone. Make sure to select the cloned tool chain + in the build settings of your project. - This section explains the options you have for debugging C++ code and - provides installation notes for the supported native debuggers. + \note To use the debugging tools for Windows, you must install them + and add the Symbol Server provided by Microsoft to the symbol search + path of the debugger. For more information, see \l{Setting the Symbol + Server in Windows}. - \section1 Supported Native Debugger Versions + \note To use the Free Software Foundation (FSF) version of GDB on + Mac OS, you must sign it and modify your tool chain settings. - The debugger plugin supports different builds of the GDB debugger, both - with and without the ability to use Python scripting. Use a Python enabled - version if one is available. - On Windows, Symbian, Maemo, and MeeGo Harmattan, only the Python version is - supported. - The non-Python versions use the compiled version of the debugging helpers, - that you must enable separately. For more information, see + This section explains the options you have for debugging C++ code + and provides installation notes for the supported native debuggers. + It also applies for code in other compiled languages such as C, + FORTRAN, Ada. + + \section1 Supported Native Debugger Versions + + Qt Creator supports essentially two native debuggers when working with + compiled code. On most supported platforms, the GNU Symbolic Debugger + GDB can be used. On Microsoft Windows, when using the Microsoft tool chain + the Microsoft Console Debugger CDB, is needed. There is also an + incomplete experimental interface to LLDB on Mac OS and Linux available + when building \QC from source. + + \section2 Supported GDB Versions + + GDB comes in two varieties with common roots. One is used on + Mac OS X and does not support Python as scripting language; the + other one is the version maintained by the Free Software Foundation + that can use Python as scripting language since version 7.0 + + The Python enabled versions are very convenient to interface, + and much of \QC's advanced data display options depend on the + availability of Python scripting. Since Python enabled versions + of GDB are bundled with all recent Linux versions, active + support for non-Python builds has been dropped for platforms + other than Mac OS X. + + The non-Python versions use the compiled version of the debugging + helpers, that you must enable separately. For more information, see \l{Debugging Helpers Based on C++}. The Python version uses a script version of the debugging helpers that does not need any special setup. + FSF GDB can also be compiled for Mac OS, but the build is currently + unstable, and thererefore, this is not recommended. + + The minimal supported version is 7.2. Using GDB version 7.4 + is highly recommended with \QC 2.5. For \QC 2.6 the minimal + supported version will be raised to GDB 7.4. + + \section2 Supported CDB Versions + The CDB native debugger has similar funtionality to the non-Python GDB debugger engine. Specifically, it also uses compiled C++ code for the debugging helper library. @@ -377,62 +451,34 @@ \o Platform \o Compiler \o Native Debugger - \o Python - \o Debugger Modes \row \o Linux - \o GCC + \o GCC, ICC \o GDB - \o Yes - \o Plain, Terminal, Attach, Remote, Core \row \o Unix - \o GCC - \o GDB - \o Yes - \o Plain, Terminal, Attach, Remote, Core - \row - \o Mac OS/GDB - \o GCC + \o GCC, ICC \o GDB - \o No - \o Plain, Terminal, Attach, Core \row - \o Mac OS/FSF GDB (experimental) + \o Mac OS X \o GCC - \o FSF GDB - \o Yes - \o Plain, Terminal, Attach, Core + \o Apple GDB, FSF GDB (experimental) \row \o Windows/MinGW \o GCC \o GDB - \o Yes - \o Plain, Terminal, Attach, Remote, Core \row \o Windows/MSVC \o Microsoft Visual C++ Compiler \o Debugging Tools for Windows/CDB - \o Not applicable - \o Plain, Terminal, Attach, Post-Mortem \row \o Symbian \o GCC \o GDB - \o Yes - \o On-device - \row - \o Maemo - \o GCC - \o GDB - \o Yes - \o On-device \row - \o MeeGo Harmattan + \o Maemo, MeeGo \o GCC \o GDB - \o Yes - \o On-device \endtable For more information on the debugger modes, see @@ -462,7 +508,7 @@ \o CoreGdbAdapter debugs core files generated from crashes. - \o RemoteGdbAdapter interacts with the gdbserver running on Linux. + \o RemoteGdbAdapter interacts with the GDB server running on Linux. \o CodaGdbAdapter interacts with Symbian devices. The GDB protocol and the GDB serial protocol are used between GDB and the adapter. The @@ -667,14 +713,15 @@ \o Examine the contents of the call stack. - \o Examine and modify registers and memory contents of - the debugged program. + \o Examine and modify contents of local and global variables. \o Examine and modify registers and memory contents of - local and global variables. + the debugged program. \o Examine the list of loaded shared libraries. + \o Disassemble sections of code. + \o Create snapshots of the current state of the debugged program and re-examine them later. diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index 10ed5ef1e8..38d0984653 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -45,17 +45,17 @@ \image qtcreator-editortoolbar-symbols.png Use the toolbar to navigate between open files and symbols in use. - To browse forward or backward through your location history, click + To browse backward or forward through your location history, click \inlineimage qtcreator-back.png - and \inlineimage qtcreator-forward.png - . + (\gui {Go Back}) and \inlineimage qtcreator-forward.png + (\gui {Go Forward}). - To go to any open file, select it from the \gui{Open files} drop-down menu. + To go to any open file, select it from the \gui{Open files} drop-down menu (1). Right-click the menu title and select \gui {Copy Full Path to Clipboard} to copy the path and name of the current file to the clipboard. To jump to any symbol used in the current file, select it from the - \gui Symbols drop-down menu. By default, the symbols are displayed in the + \gui Symbols drop-down menu (2). By default, the symbols are displayed in the order in which they appear in the file. Right-click the menu title and select \gui {Sort Alphabetically} to arrange the symbols in alphabetic order. @@ -72,12 +72,15 @@ \list \o To split the editor view into a top and bottom view, select - \gui Window > \gui Split or press \key{Ctrl+E, 2}. + \gui Window > \gui Split, press \key{Ctrl+E, 2}, or select the + \inlineimage qtcreator-split-button.png + (\gui Split) button and then select \gui Split. Split command creates views below the currently active editor view. \o To split the editor view into adjacent views, select - \gui Window > \gui{Split Side by Side} or press \key{Ctrl+E, 3}. + \gui Window > \gui{Split Side by Side}, press \key{Ctrl+E, 3}, or + select \gui {Split > Split Side by Side}. Side by side split command creates views to the right of the currently active editor view. @@ -88,8 +91,11 @@ press \key{Ctrl+E, O}. To remove a split view, place the cursor within the view you want to - remove and select \gui Window > \gui{Remove Current Split} or press - \key{Ctrl+E, 0}. To remove all but the currently selected split view, + remove and select \gui Window > \gui{Remove Current Split}, press + \key{Ctrl+E, 0}, or select the + \inlineimage qtcreator-remove-split-button.png + (\gui {Remove Split}) button. To remove all but the currently selected split + view, select \gui Window > \gui{Remove All Splits} or press \key{Ctrl+E, 1}. \section1 Using Bookmarks diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 9ee0fb0b2a..ea67114e14 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -167,7 +167,7 @@ \o Semantic errors and warnings are underlined in olive. - In the following figure, the type is unknown. + In the following figure, the variable is not used. \image qtcreator-semanticerror.png @@ -783,13 +783,22 @@ \o \gui{Pastebin.Ca} + \o \gui{Paste.KDE.Org} + + \o \gui{Shared network drives} + \endlist To configure the server, select \gui{Tools} > \gui{Options} > - \gui{Code Pasting}. + \gui{Code Pasting}. In \gui CodePaster, specify the host name of the + CodePaster service. In \gui Fileshare, specify the path to a shared + network drive. The code snippets are copied to the drive as simple files. + You have to delete obsolete files from the drive manually. To paste a snippet of code onto the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Paste Snippet} or press \key{Alt+C,Alt+P}. + By default, \QC copies the URL of the snippet to the clipboard and displays + the URL in the \gui Output pane. To fetch a snippet of code from the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Fetch Snippet} or press \key{Alt+C,Alt+F}. @@ -862,14 +871,25 @@ \QC core, select \gui{Tools} > \gui{Options} > \gui{FakeVim} > \gui{Ex Command Mapping}. + To map \e {user commands} to keyboard shortcuts, select \gui{Tools > Options + > FakeVim > User Command Mapping}. The user command mapped to the shortcut + is executed by FakeVim as if you were typing it (as when replaying a macro). + To make changes to the Vim-style settings, select \gui{Tools} > \gui{Options} > \gui FakeVim > \gui{General}. + \image qtcreator-fakevim-options.png "FakeVim options" + + To preselect the indentation settings specified for the text editor, select + \gui {Copy Text Editor Settings}. To preselect the Qt coding style, select + \gui {Set Qt Style}. To preselect a simple indentation style, select + \gui {Set Plain Style}. You can then change any of the preselected settings. + To use a Vim-style color scheme, select \gui {Tools > Options > Text Editor > Fonts & Color}. In the \gui {Color Scheme} list, select \gui {Vim (dark)}. - To quit the FakeVim mode, unselect \gui{Tools} > \gui(Options} > + To quit the FakeVim mode, unselect \gui{Tools} > \gui{Options} > \gui{FakeVim} > \gui {Use FakeVim} or press \key{Alt+V,Alt+V}. You can temporarily escape FakeVim mode to access the normal \QC @@ -1108,9 +1128,10 @@ If the text is found, all occurrences are highlighted as you type. \o To go to the next occurrence, click \inlineimage qtcreator-next.png - , or press \key F3. To go to the previous occurrence click + (\gui {Find Next}), or press \key F3. To go to the previous + occurrence click \inlineimage qtcreator-previous.png - , or press \key Shift+F3. + (\gui {Find Previous}), or press \key Shift+F3. \endlist @@ -1120,16 +1141,13 @@ \list \o To make your search case sensitive, select - \inlineimage qtcreator-editor-casesensitive.png - . + \gui {Case Sensitive}. \o To search only whole words, select - \inlineimage qtcreator-editor-wholewords.png - . + \gui {Whole Words Only}. \o To search using regular expressions, select - \inlineimage qtcreator-editor-regularexpressions.png - . + \gui {Regular Expressions}. Regular expressions used in \QC are modeled on Perl regular expressions. For more information on using regular expressions, see \l {http://doc.qt.nokia.com/4.7/qregexp.html#details} @@ -1137,7 +1155,7 @@ \endlist - \note If you have selected text before selecting \gui Find/Replace, the + \note If you have selected text before selecting \gui {Find/Replace}, the search is conducted within the selection. To replace occurrences of the existing text, enter the new text in the @@ -1146,11 +1164,11 @@ \list \o To replace the selected occurrence and move to the next one, - click \inlineimage qtcreator-next.png + click \gui {Find Next} or press \key Ctrl+=. \o To replace the selected occurrence and move to the previous one, - click \inlineimage qtcreator-previous.png + click \gui {Find Previous} . \o To replace all occurrences in the file, click \gui{Replace All}. @@ -1204,11 +1222,14 @@ \o To go to an occurrence, double-click it. + \o To repeat the search after you have made changes to the + listed files, for example, select \gui {Search Again}. + \endlist \endlist - The search results are stored in the search history (1) from which you can + The search results are stored in the search history from which you can select earlier searches. \note You can use \gui{Advanced Find} also to search for symbols. For more @@ -1885,7 +1906,8 @@ \list 1 \o In the locator, click \inlineimage qtcreator-locator-magnify.png - and select \gui Configure to open the \gui Locator options. + (\gui {Options}) and select \gui Configure to open the \gui Locator + options. \o Select a filter, and then select \gui Edit. @@ -1939,8 +1961,8 @@ \list 1 - \o In the locator, click \inlineimage qtcreator-locator-magnify.png - and select \gui Configure to open the \gui Locator options. + \o In the locator, select \gui {Options > Configure} to open the + \gui Locator options. \image qtcreator-locator-customize.png @@ -1978,9 +2000,8 @@ all default filters is updated as you write your code. By default, \QC updates the filters created by you once an hour. - To update the cached information manually, click - \inlineimage qtcreator-locator-magnify.png - and select \gui Refresh. + To update the cached information manually, select \gui {Options > Refresh} + in the locator. To set a new cache update time: diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc index ac1b9a82e5..7afb6758f2 100644 --- a/doc/src/editors/creator-finding.qdoc +++ b/doc/src/editors/creator-finding.qdoc @@ -40,8 +40,10 @@ The incremental search highlights the matching strings in the window while typing and the advanced search enables you to search from currently open projects or files on the file system. + You can conduct incremental and advanced searches in parallel. + In addition, you can search for symbols when you want to - refactor code. You can also search from the search results. + refactor code. \o \l{Searching with the Locator} diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc index 9740fb2e09..81318b5b7b 100644 --- a/doc/src/linux-mobile/creator-deployment-madde.qdoc +++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc @@ -31,15 +31,16 @@ \page creator-deployment-maemo.html \nextpage creator-connecting-mobile.html - \title Deploying Applications to Maemo or MeeGo Harmattan Devices + \title Deploying Applications to Linux-Based Devices - You can specify settings for deploying applications to Maemo 5 and MeeGo - Harmattan devices in the project .pro file. You can view the settings in the + You can specify settings for deploying applications to Linux-based devices + (Embedded Linux, MeeGo Harmattan, and Maemo 5) in the project .pro file. + You can view the settings in the \gui {Run Settings}. \image qtcreator-maemo-deployment.png "Deploy to device" - The files to be installed are listed in the \gui {Deploy to Device} step, + The files to be installed are listed in the \gui {Deployment} step, the \gui {Files to install for subproject} field. The \gui {Local File Path} field displays the location of the file on the development PC. The \gui {Remote Directory} field displays the folder where the file is @@ -48,6 +49,36 @@ \l{http://doc.qt.nokia.com/4.8/qmake-variable-reference.html#installs} {INSTALLS variable} in the project .pro file to add the missing files. + When you run the application, \QC copies the necessary files to the device + and starts the application on it. + + \section1 Deploying on Embedded Linux + + \image qtcreator-embedded-linux-deployment.png "Deploy to embedded Linux" + + When you run the application on the \gui {Embedded Linux} target, \QC + deploys the application as specified by the deploy steps. By default, + \QC copies the application files to the device by using the SSH file + transfer protocol (SFTP), as specified by the \gui {Upload files via SFTP} + step. + + If you have a lot of data to copy, select \gui Details in the + \gui {Upload Files via SFTP} step, and then select the + \gui {Incremental deployment} check box. \QC takes note of the deployment + time and only copies files that have changed since the last deployment. + However, when you make major changes on the device, such as removing files + from the device manually or flashing a new disk image, or when you use + another device with the same IP address, deselect the check box once, to + have \QC deploy all files again. + + To only create a tarball and not copy the files to the device, select + \gui {Add Deploy Step > Create tarball}. Then remove all other deploy steps. + + The \gui {Deploy tarball via SFTP upload} step specifies that \QC + uploads the tarball to the device and extracts it. + + \section1 Deploying on MeeGo Harmattan and Maemo 5 + You can use desktop files to display icons on the home screen of the device. To add desktop files to the project file, select \gui {Add Desktop File}. To specify the icon file to display, select \gui {Add Launcher diff --git a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc index 64b7f0b704..ff35cae55e 100644 --- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc @@ -1,4 +1,4 @@ - \section1 Running on Generic Linux Devices + \section1 Running on Embedded Linux Devices \list 1 @@ -10,7 +10,7 @@ \list 1 \o Specify a connection to the device. For more information, see - \l{Connecting Generic Linux Devices}. + \l{Connecting Embedded Linux Devices}. \o Click the \gui Run button. @@ -21,15 +21,14 @@ \QC uses the compiler specified in the project build settings (tool chain) to build the application. - \QC generates an installation package, installs it on the - device, and executes the selected application. The application views are + \QC copies the application files to the connected device and runs the + application. The application views are displayed on the device. Command-line output is visible in the \QC \gui {Application Output} view. - Choose \gui {Projects > Desktop > Run} to view the settings for deploying - the application on the connected device and creating the installation - package. For more information, see - \l{Specifying Run Settings for Generic Linux Devices}. + Choose \gui {Projects > Embedded Linux > Run} to view the settings for deploying + the application on the connected device. For more information, see + \l{Specifying Run Settings for Linux-Based Devices}. Debugging works transparently if GDB server is installed on the device and it is compatible with the GDB on the host. diff --git a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc index bd648892ce..b3259e0d5e 100644 --- a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc +++ b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc @@ -36,6 +36,6 @@ Choose \gui {Projects > Maemo Run} to view the settings for deploying the application on the connected device and creating the installation package. For more information, see - \l{Specifying Run Settings for Maemo and MeeGo Harmattan Devices}. + \l{Specifying Run Settings for Linux-Based Devices}. Debugging also works transparently. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc deleted file mode 100644 index dd4903b736..0000000000 --- a/doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc +++ /dev/null @@ -1,17 +0,0 @@ - \section2 Specifying Run Settings for Generic Linux Devices - - To run an application on a generic Linux device (without MADDE support), - create and select a device configuration in the Desktop run settings for - your project. You can also pass command line arguments to your application. - - \image qtcreator-run-settings-linux-devices.png "Run settings for Generic Linux devices" - - In addition, you must create a connection from the development PC to the - device. Click \gui {Manage device configurations} to create connections. - For more information, see \l {Connecting Generic Linux Devices}. - - When you run the application on the \gui Desktop target, \QC - generates an installation package in the build directory. The name of the - directory is displayed in the \gui {Create tarball} step. \QC copies - the tarball to devices by using the SSH file transfer protocol (SFTP) and - extracts it. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc new file mode 100644 index 0000000000..54da042580 --- /dev/null +++ b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc @@ -0,0 +1,24 @@ + \section2 Specifying Run Settings for Linux-Based Devices + + To run an application on a Linux-based device target (embedded Linux, MeeGo + Harmattan, or Maemo), create and select a device configuration in the run + settings for the project. + You can also pass command line arguments to your application. + + \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices" + + To run and debug applications on Linux-based devices, you must + create connections from the development PC to the devices. Click + \gui {Manage device configurations} to create connections. For more + information, see \l{Configuring Connections to Maemo Devices}, + \l{Configuring Connections to Harmattan Devices}, and + \l {Connecting Embedded Linux Devices}. + + When you run the application, \QC copies the files to the connected device. + + For MeeGo Harmattan and Maemo targets, \QC also generates an + installation package in the build directory by default. You can deliver the + installation package to users for installation + on devices that are of the same type and run the same firmware as the + connected device. For more information, see + \l{Deploying Applications to Linux-Based Devices}. diff --git a/doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc deleted file mode 100644 index 31e6753de9..0000000000 --- a/doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc +++ /dev/null @@ -1,21 +0,0 @@ - \section2 Specifying Run Settings for Maemo and MeeGo Harmattan Devices - - To run an application on a Maemo or MeeGo Harmattan device, create and - select a device configuration in the Maemo 5 or Harmattan run settings for - your project. - You can also pass command line arguments to your application. - - \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Maemo devices" - - To run and debug applications on Maemo or MeeGo Harmattan devices, you must - create connections from the development PC to the devices. Click - \gui {Manage device configurations} to create connections. For more - information, see \l{Configuring Connections to Maemo Devices} and - \l{Configuring Connections to Harmattan Devices}. - - When you run the application on the \gui{Maemo5} or \gui Harmattan target, - \QC generates a Debian installation package in the build directory by - default. You can deliver the installation package to users for installation - on devices that are of the same type and run the same firmware as the - connected device. For more information, see - \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}. diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc index 66c0b6260d..9bd29b5b74 100644 --- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc +++ b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc @@ -59,7 +59,7 @@ You set the application name and installation folder in the \gui {Run Settings} for the project. For more information, see - \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}. \QC + \l{Deploying Applications to Linux-Based Devices}. \QC specifies the correct category settings by default when it creates the Debian directory and the necessary files. diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index deecbb00fe..70dedcab50 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -26,16 +26,17 @@ \page creator-developing-generic-linux.html \nextpage creator-developing-maemo.html - \title Connecting Generic Linux Devices + \title Connecting Embedded Linux Devices - You can connect generic Linux devices to the development PC to build, run, + You can connect embedded Linux devices to the development PC to build, run, debug, and analyze applications on them from \QC. - If you have the tool chain for building applications for generic Linux + If you have a tool chain for building applications for embedded Linux devices (with no MADDE support) installed on the development PC, you can add - it to \QC. + it to \QC. You can then select the \gui {Embedded Linux} target to + run applications on embedded Linux devices. - To be able to run and debug applications on generic Linux devices, you must + To be able to run and debug applications on embedded Linux devices, you must create device configurations and select them in the \QC run settings. @@ -48,7 +49,7 @@ either a password or an SSH key. If you do not have an SSH key, you can create it in \QC. For more information, see \l {Generating SSH Keys}. - To configure connections between \QC and generic Linux devices: + To configure connections between \QC and embedded Linux devices: \list 1 @@ -56,7 +57,7 @@ \o Select \gui {Tools > Options > Build & Run > Qt Versions > Add} to add the Qt version - for the generic Linux. + for the embedded Linux. \o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to add the tool @@ -100,7 +101,7 @@ \o Select \gui {Projects > Desktop > Build}. - \o Select the Qt version and tool chain for the generic Linux + \o Select the Qt version and tool chain for the embedded Linux device. \endlist @@ -109,26 +110,19 @@ \list 1 - \o Select \gui {Run > Add > Build Tarball and Deploy to Linux Host} + \o Select \gui {Run > Add > Deploy to Remote Linux Host} to add a new deploy configuration. - \image qtcreator-run-settings-linux-devices.png "Run settings for generic Linux devices" + \image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices" \o In the \gui {Device configuration} field, select the device connection. \endlist - When you run the project, \QC creates an installation package in - the build directory. The name of the directory is displayed in the - \gui {Create tarball} step. - - The \gui {Deploy tarball via SFTP upload using device} step specifies - that \QC uploads the tarball to the device and extracts it. - You can add custom deploy steps and remove the default step if - it is incompatible with your steps. - To only create a tarball and not copy the files to the device, - remove all deploy steps. + When you run the project, \QC deploys the application as specified by the + deploy steps. By default, \QC copies the application files to the device. + For more information, see \l{Deploying Applications to Linux-Based Devices}. \endlist diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index 3d3e440225..35e57834c2 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -47,12 +47,14 @@ in the project folder and copies it to the connected device. You can sign the SIS file and wrap it in a Nokia Smart Installer for Symbian package. You can test and debug the application on the device. - \o \l{Deploying Applications to Maemo or MeeGo Harmattan Devices} + \o \l{Deploying Applications to Linux-Based Devices} - When you deploy the application on the \gui{Maemo5} or - \gui Harmattan target, \QC generates a Debian installation package - in the build directory and copies it to the connected device. You + When you deploy the application on a Linux-based device target, such + as \gui {Embedded Linux}, \gui Harmattan, or \gui{Maemo5}, \QC + copies the application files to the connected device. You can test and debug the application on the device. + You can create Debian installation packages for MeeGo Harmattan and + Maemo 5 devices. \endlist \section1 Related Topics diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index bf9c9c3319..498e4964bc 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -36,8 +36,8 @@ You can connect mobile devices to the development PC to build, run, debug, and analyze applications on them from \QC. When you install mobile targets as part of the \QSDK, the build and run settings for the target devices are - set up automatically in \QC. Currently, the tool chain for building - applications for generic Linux devices is not included in \QSDK. + set up automatically in \QC. However, \QSDK does not contain a tool chain + for building applications for embedded Linux devices. You can connect the device to the development PC using a USB connection. Additionally, you can connect Linux-based devices by using a WLAN @@ -45,9 +45,9 @@ \list - \o \l{Connecting Generic Linux Devices} + \o \l{Connecting Embedded Linux Devices} - If you have the tool chain for building applications for generic + If you have a tool chain for building applications for embedded Linux devices (with no MADDE support) installed on the development PC, you can add it to \QC. Create device configurations and select them in the \QC run settings. diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index de8360c7b5..38bb559ea1 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-projects-settings-run.qdoc @@ -51,9 +51,9 @@ \if defined(qcmanual) \input projects/creator-projects-settings-run-desktop.qdocinc \input projects/creator-projects-settings-run-analyze.qdocinc + \input projects/creator-projects-settings-run-debug.qdocinc \input symbian/creator-projects-settings-run-symbian.qdocinc - \input linux-mobile/creator-projects-settings-run-madde.qdocinc - \input linux-mobile/creator-projects-settings-run-generic-linux.qdocinc + \input linux-mobile/creator-projects-settings-run-linux.qdocinc \endif \section1 Specifying a Custom Executable to Run diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index e52e073212..9df8403908 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -219,12 +219,12 @@ \o \l{Deploying to Mobile Devices} \list \o \l{Deploying Applications to Symbian Devices} - \o \l{Deploying Applications to Maemo or MeeGo Harmattan Devices} + \o \l{Deploying Applications to Linux-Based Devices} \endlist \o \l{Connecting Mobile Targets} \list \o \l{Connecting MeeGo Harmattan Devices} - \o \l{Connecting Generic Linux Devices} + \o \l{Connecting Embedded Linux Devices} \o \l{Connecting Maemo Devices} \o \l{Connecting Symbian Devices} \endlist diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index 08028fbbc3..ed5c07da44 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -37,7 +37,7 @@ \list 1 - \o Select \gui {File > New File or Project > QML > QML File > Choose} + \o Select \gui {File > New File or Project > Qt > QML File > Choose} to create a QML file called Button.qml (for example). \note Components are listed in the \gui Library pane only if the @@ -73,7 +73,8 @@ \o In the \gui Text field, type \bold Button. - You can select the text color, font, size, and style in the + You can select the text color in the \gui Color section and the + font, size, and style in the \gui Font section. \o In the \gui Alignment field, select the center buttons to align @@ -81,7 +82,8 @@ \o Click \gui {Layout}, and then click the \inlineimage qmldesigner-anchor-fill-screen.png - button to anchor the text to the whole button area. + (\gui {Fill to Parent}) button to anchor the text to the whole + button area. \endlist @@ -91,9 +93,6 @@ \endlist - \note To view the button, you must add it to a Qt Quick Application or - Qt Quick UI project. - To create a graphical button that scales beautifully without using vector graphics, use the \l{http://doc.qt.nokia.com/4.7/qml-borderimage.html} {Border Image} element. For more information, see @@ -120,7 +119,7 @@ is visible by default. You can specify that it is hidden and the other one becomes visible when the mouse is clicked. - Add a MouseArea that covers the whole area and emits the clicked signal + Add a Mouse Area that covers the whole area and emits the clicked signal (\c {parent.clicked()}) when it detects a mouse click. You can add text to the button and set it up as a property. The text can @@ -135,7 +134,7 @@ \list 1 - \o Select \gui {File > New File or Project > QML > QML File > Choose} + \o Select \gui {File > New File or Project > Qt > QML File > Choose} to create a QML file called Button.qml (for example). \o Double-click the file to open it in the code editor. @@ -158,12 +157,12 @@ \o Click \gui {Design} to edit the file in the visual editor. - \o Drag and drop two \gui BorderImage items from the \gui Library pane + \o Drag and drop two \gui {Border Image} items from the \gui Library pane to the scene. \o Drag and drop a \gui Text item to the scene. - \o Drag and drop a \gui MouseArea to the screen. + \o Drag and drop a \gui {Mouse Area} to the screen. \o In the \gui Navigator pane, select \gui border_image1 to specify settings for it in the \gui Properties pane: @@ -182,7 +181,8 @@ \o Click \gui {Layout}, and then click the \inlineimage qmldesigner-anchor-fill-screen.png - button to anchor the border image to the \gui Item. + (\gui {Fill to Parent}) button to anchor the border image to the + \gui Item. \endlist @@ -198,7 +198,7 @@ when it is clicked, for example button_down.png. \o Click \gui {Layout}, and then click the - \inlineimage qmldesigner-anchor-fill-screen.png + \gui {Fill to Parent} button to anchor the border image to the \gui Item. \endlist @@ -215,7 +215,7 @@ enter a pointer to the \c {text} property that you specified earlier: \c {parent.txt}. - \o Select the \gui Aliasing check box to enable smooth text + \o Select the \gui Smooth check box to enable smooth text rendering. \o In the \gui Size field, select \gui {Pixels} to specify the font @@ -227,6 +227,7 @@ \o Click \gui {Layout}, and then click the \inlineimage qmldesigner-center-in.png "Anchor buttons" + (\gui {Set Vertical Anchor} and \gui {Set Horizontal Anchor}) buttons to inherit the vertical and horizontal centering from the parent. @@ -247,8 +248,8 @@ \endlist - \note To view the button, you must add it to a Qt Quick Application or Qt - Quick UI project. + \note To test the button, add it to a Qt Quick Application or Qt + Quick UI project and run the application. */ diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index 01069bc6ee..af986b89c6 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -165,7 +165,8 @@ \list 1 - \o In the base state, add all elements you will need in the application. + \o In the base state, add all elements you will need in the + application (1). While you work on one screen, you can click the \inlineimage qmldesigner-show-hide-icon.png icon to hide elements on the canvas that are not part of a screen. @@ -173,7 +174,7 @@ \o In the \gui States pane, click the empty slot to create a new state and give it a name. For example, \c Normal. - \o In the \gui Properties pane, deselect the \gui Visibility check box + \o In the \gui Properties pane (2), deselect the \gui Visibility check box or set \gui Opacity to 0 for each element that is not needed in this view. If you specify the setting for the parent element, all child elements inherit it and are also hidden. diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc index 93b27641c8..8e41294edb 100644 --- a/doc/src/qtquick/qtquick-toolbars.qdoc +++ b/doc/src/qtquick/qtquick-toolbars.qdoc @@ -39,7 +39,7 @@ . Select the icon to open the toolbar. To open toolbars immediately when you select a component, select - \gui{Tools > Options > Qt Quick > Qt Quick Toolbar > Always show Quick + \gui{Tools > Options > Qt Quick > Qt Quick Toolbar > Always show Qt Quick Toolbar}. Drag the toolbar to pin it to another location. Select diff --git a/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc b/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc index df0b537656..676b3b38e0 100644 --- a/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc +++ b/doc/src/symbian/creator-projects-settings-run-symbian.qdocinc @@ -20,8 +20,8 @@ When you deploy the application for the \gui{Symbian Device} target, \QC generates a Symbian installation system (SIS) file in the project folder and copies it to the device that is connected to the development PC. If no - device is connected, you must remove the \gui {Deploy SIS Package} step, - to create the package. Click \gui {Remove Item} to skip the step. + device is connected, you must remove the \gui {Deploy SIS Package} step + to create the package. Click \gui {Remove Item} (1) to skip the step. \image qtcreator-remove-deploy-step.png "Removing deploy steps" diff --git a/share/qtcreator/dumper/dumper.py b/share/qtcreator/dumper/dumper.py index 973f80afe4..520a462314 100644 --- a/share/qtcreator/dumper/dumper.py +++ b/share/qtcreator/dumper/dumper.py @@ -1393,9 +1393,9 @@ class Dumper: format = self.typeformats.get(stripForFormat(str(self.currentType))) return format - def putSubItem(self, component, value): + def putSubItem(self, component, value, tryDynamic=True): with SubItem(self, component): - self.putItem(value) + self.putItem(value, tryDynamic) def putNamedSubItem(self, component, value, name): with SubItem(self, component): diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py index 2e61138d9c..9c3f99238d 100644 --- a/share/qtcreator/dumper/qttypes.py +++ b/share/qtcreator/dumper/qttypes.py @@ -238,6 +238,8 @@ def qdump__QFile(d, value): d.putNumChild(1) if d.isExpanded(): with Children(d): + base = value.type.fields()[0].type + d.putSubItem("[%s]" % str(base), value.cast(base), False) d.putCallItem("exists", value, "exists") diff --git a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp index 0ad497d90f..b98a144ce8 100644 --- a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp +++ b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp @@ -280,13 +280,19 @@ JSDebuggerAgent::JSDebuggerAgent(QScriptEngine *engine) : QDeclarativeDebugService("JSDebugger") , QScriptEngineAgent(engine) , d(new JSDebuggerAgentPrivate(this)) -{} +{ + if (status() == Enabled) + engine->setAgent(this); +} JSDebuggerAgent::JSDebuggerAgent(QDeclarativeEngine *engine) : QDeclarativeDebugService("JSDebugger") , QScriptEngineAgent(QDeclarativeDebugHelper::getScriptEngine(engine)) , d(new JSDebuggerAgentPrivate(this)) -{} +{ + if (status() == Enabled) + QDeclarativeDebugHelper::getScriptEngine(engine)->setAgent(this); +} /*! Destroys this QScriptDebuggerAgent. diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 2c480821dc..3a2e5cbc58 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -3576,8 +3576,12 @@ at debugger startup.</source> <translation>Speicher-Editor an 0x%1 öffnen</translation> </message> <message> + <source>Open Disassembler at Address...</source> + <translation>Disassembler an Adresse öffnen...</translation> + </message> + <message> <source>Open Disassembler at 0x%1</source> - <translation>Disassembler bei %1 öffnen</translation> + <translation>Disassembler bei 0x%1 öffnen</translation> </message> <message> <source>Memory at Frame #%1 (%2) 0x%3</source> @@ -3592,10 +3596,6 @@ at debugger startup.</source> <translation>Disassembler öffnen</translation> </message> <message> - <source>Open Disassembler at address...</source> - <translation>Disassembler an Adresse öffnen...</translation> - </message> - <message> <source>Disassemble Function...</source> <translation>Funktion disassemblieren...</translation> </message> @@ -13516,7 +13516,7 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat <translation>Warnung beim Laden der Projektdatei %1.</translation> </message> <message> - <source>File '%' does not exist or is not readable.</source> + <source>File '%1' does not exist or is not readable.</source> <translation>Die Datei '%1' existiert nicht oder ist nicht lesbar.</translation> </message> </context> @@ -18154,11 +18154,27 @@ Hinweis: Unter Umständen wird die lokale Datei gelöscht.</translation> <translation>Debugger an %1 angehangen</translation> </message> <message> + <source>gdbserver is now listening at %1</source> + <translation>gdbserver an %1</translation> + </message> + <message> <source>Cannot find local executable for remote process "%1".</source> <translation>Die lokale ausführbare Datei für den entfernten Prozess "%1" konnte nicht gefunden werden. </translation> </message> <message> + <source>Set Breakpoint at Line %1</source> + <translation>Haltepunkt bei Zeile %1 setzen</translation> + </message> + <message> + <source>Set Message Tracepoint at Line %1...</source> + <translation>Tracepoint mit Meldung bei Zeile %1 hinzufügen...</translation> + </message> + <message> + <source>Disassemble Function "%1"</source> + <translation>Funktion "%1" disassemblieren</translation> + </message> + <message> <source>Open Qt Options</source> <translation>Einstellungen zur Qt-Bibliothek öffnen</translation> </message> @@ -18222,22 +18238,10 @@ Hinweis: Unter Umständen wird die lokale Datei gelöscht.</translation> <translation>Haltepunkt bei 0x%1 setzen</translation> </message> <message> - <source>Set Breakpoint at line %1</source> - <translation>Haltepunkt bei Zeile %1 setzen</translation> - </message> - <message> <source>Set Message Tracepoint at 0x%1...</source> <translation>Tracepoint mit Meldung bei 0x%1 hinzufügen...</translation> </message> <message> - <source>Set Message Tracepoint at line %1...</source> - <translation>Tracepoint mit Meldung bei Zeile %1 hinzufügen...</translation> - </message> - <message> - <source>Disassemble '%1()'</source> - <translation>Disassembliere '%1()'</translation> - </message> - <message> <source>Start '%1' and break at function 'main()'</source> <translation>Starte '%1' und halte bei Erreichen der Funktion "main()" an</translation> </message> @@ -18374,8 +18378,8 @@ Hinweis: Unter Umständen wird die lokale Datei gelöscht.</translation> <translation>Verbinde zu Debug-Server...</translation> </message> <message> - <source>Start Remote Debug Server...</source> - <translation>Starte Debug-Server...</translation> + <source>Start Remote Debug Server Attached to Process...</source> + <translation>Starte Debug-Server an Prozess...</translation> </message> <message> <source>Attach to Running Remote Process...</source> @@ -30373,6 +30377,10 @@ Die C++- beziehungsweise QML-Codemodelle benötigen eine Qt-Version und eine Too <translation>Dateifehler</translation> </message> <message> + <source>Error while saving file: %1</source> + <translation>Fehler beim Speichern der Datei: %1</translation> + </message> + <message> <source>Overwrite?</source> <translation>Überschreiben?</translation> </message> diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 837bc8e313..2de4330799 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -46,22 +46,6 @@ <translation>Панель аналізатора</translation> </message> <message> - <source><html><head/><body><center><i>%1</i> is still running. You have to quit the Analyzer before being able to run another instance.<center/><center>Force it to quit?</center></body></html></source> - <translation><html><head/><body><center><i>%1</i> досі виконується. Ви маєте вийти з аналізатора, щоб запустити інший екземпляр.<center/><center>Завершити примусово?</center></body></html></translation> - </message> - <message> - <source>Analyzer Still Running</source> - <translation>Аналізатор ще виконується</translation> - </message> - <message> - <source>Stop Active Run</source> - <translation>Зупинити поточне виконання</translation> - </message> - <message> - <source>Keep Running</source> - <translation>Продовжувати виконання</translation> - </message> - <message> <source>Debug</source> <translation></translation> </message> @@ -254,13 +238,13 @@ <translation>Набір &інструментів:</translation> </message> <message> - <source>Override &Start script:</source> - <translation>Інший скрипт &запуску:</translation> - </message> - <message> <source>Sys&root:</source> <translation>Sys&root:</translation> </message> + <message> + <source>Override &start script:</source> + <translation>Інший скрипт &запуску:</translation> + </message> </context> <context> <name>AttachExternalDialog</name> @@ -448,11 +432,11 @@ <name>Bazaar::Internal::BazaarCommitPanel</name> <message> <source>General Information</source> - <translation type="unfinished"></translation> + <translation>Загальна інформація</translation> </message> <message> <source>Branch:</source> - <translation type="unfinished"></translation> + <translation>Гілка:</translation> </message> <message> <source>Local commit</source> @@ -464,11 +448,11 @@ </message> <message> <source>Author:</source> - <translation type="unfinished"></translation> + <translation>Автор:</translation> </message> <message> <source>Email:</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Fixed bugs:</source> @@ -495,7 +479,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Ignore blank lines</source> - <translation type="unfinished"></translation> + <translation>Ігнорувати порожні рядки</translation> </message> </context> <context> @@ -608,15 +592,15 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Add "%1"</source> - <translation type="unfinished"></translation> + <translation>Додати "%1"</translation> </message> <message> <source>Delete...</source> - <translation type="unfinished"></translation> + <translation>Видалити...</translation> </message> <message> <source>Delete "%1"...</source> - <translation type="unfinished"></translation> + <translation>Видалити "%1"...</translation> </message> <message> <source>Revert Current File...</source> @@ -664,11 +648,11 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Create Repository...</source> - <translation type="unfinished"></translation> + <translation>Створити сховище...</translation> </message> <message> <source>Update</source> - <translation type="unfinished"></translation> + <translation>Оновити</translation> </message> <message> <source>Commit</source> @@ -676,11 +660,11 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>&Undo</source> - <translation type="unfinished">&Повернути</translation> + <translation>&Повернути</translation> </message> <message> <source>&Redo</source> - <translation type="unfinished">П&овторити</translation> + <translation>П&овторити</translation> </message> <message> <source>Diff &Selected Files</source> @@ -727,7 +711,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Use existing directory</source> - <translation type="unfinished"></translation> + <translation>Використовувати існуючу теку</translation> </message> <message> <source>Stacked</source> @@ -755,7 +739,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Revision:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Ревізія:</translation> </message> <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. @@ -825,7 +809,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Конфігурація</translation> </message> <message> <source>Command:</source> @@ -833,7 +817,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>User</source> - <translation type="unfinished"></translation> + <translation>Користувач</translation> </message> <message> <source>Username to use by default on commit.</source> @@ -841,7 +825,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Default username:</source> - <translation type="unfinished"></translation> + <translation>Типове ім'я користувача:</translation> </message> <message> <source>Email to use by default on commit.</source> @@ -849,11 +833,11 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Default email:</source> - <translation type="unfinished"></translation> + <translation>Типовий email:</translation> </message> <message> <source>Miscellaneous</source> - <translation type="unfinished"></translation> + <translation>Різне</translation> </message> <message> <source>Log count:</source> @@ -861,11 +845,11 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Timeout:</source> - <translation type="unfinished"></translation> + <translation>Час очікування:</translation> </message> <message> <source>s</source> - <translation type="unfinished"></translation> + <translation> с</translation> </message> <message> <source>Prompt on submit</source> @@ -873,7 +857,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Bazaar</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>The number of recent commit logs to show. Choose 0 to see all entries.</source> @@ -884,7 +868,7 @@ The new branch will depend on the availability of the source branch for all oper <name>Bazaar::Internal::OptionsPageWidget</name> <message> <source>Bazaar Command</source> - <translation type="unfinished"></translation> + <translation>Команда Bazaar</translation> </message> </context> <context> @@ -895,19 +879,19 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Branch Location</source> - <translation type="unfinished"></translation> + <translation>Розташування гілки</translation> </message> <message> <source>Default location</source> - <translation type="unfinished"></translation> + <translation>Типове розташування</translation> </message> <message> <source>Local filesystem:</source> - <translation type="unfinished"></translation> + <translation>Локальна файлова система:</translation> </message> <message> <source>Specify URL:</source> - <translation type="unfinished"></translation> + <translation>Вкажіть URL:</translation> </message> <message> <source>Options</source> @@ -915,15 +899,15 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Remember specified location as default</source> - <translation type="unfinished"></translation> + <translation>Запам'ятати вказане розташування як типове</translation> </message> <message> <source>Overwrite</source> - <translation type="unfinished"></translation> + <translation>Перезаписати</translation> </message> <message> <source>Use existing directory</source> - <translation type="unfinished"></translation> + <translation>Використовувати існуючу теку</translation> </message> <message> <source>Create prefix</source> @@ -931,7 +915,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Revision:</source> - <translation type="unfinished"></translation> + <translation>Ревізія:</translation> </message> <message> <source>Local</source> @@ -947,12 +931,12 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>For example: https://[user[:pass]@]host[:port]/[path]</source> - <translation type="unfinished"></translation> + <translation>Наприклад: https://[user[:pass]@]host[:port]/[path]</translation> </message> <message> <source>Ignore differences between branches and overwrite unconditionally.</source> - <translation type="unfinished"></translation> + <translation>Ігнорувати різницю між гілками і перезаписувати.</translation> </message> <message> <source>By default, push will fail if the target directory exists, but does not already have a control directory. @@ -981,7 +965,7 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Revision:</source> - <translation type="unfinished"></translation> + <translation>Ревізія:</translation> </message> </context> <context> @@ -1040,7 +1024,7 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Property name:</source> - <translation type="unfinished"></translation> + <translation>Назва властивості:</translation> </message> </context> <context> @@ -1214,6 +1198,10 @@ Specifies how backspace interacts with indentation. <source>Enable &tooltips only when Shift key is down</source> <translation>Увімкнути спливаючі &підказки, коли натиснута клавіша Shift</translation> </message> + <message> + <source>Always write a newline character at the end of the file.</source> + <translation>Завжди додавати символ нового рядка в кінці файлу.</translation> + </message> </context> <context> <name>BinEditorFile</name> @@ -1295,8 +1283,8 @@ Specifies how backspace interacts with indentation. <translation>Показати закладку</translation> </message> <message> - <source>Show Bookmark in New Tab</source> - <translation>Показати закладку в новій вкладці</translation> + <source>Show Bookmark as New Page</source> + <translation>Показати закладку в новій сторінці</translation> </message> <message> <source>Delete Bookmark</source> @@ -1741,7 +1729,7 @@ Specifies how backspace interacts with indentation. <name>Cvs::Internal::CvsPlugin</name> <message> <source>Cannot find repository for '%1'</source> - <translation type="unfinished"></translation> + <translation>Неможливо знайти сховище для '%1'</translation> </message> <message> <source>Parsing of the log output failed</source> @@ -1821,11 +1809,11 @@ Specifies how backspace interacts with indentation. </message> <message> <source>Edit</source> - <translation type="unfinished"></translation> + <translation>Редагувати</translation> </message> <message> <source>Edit "%1"</source> - <translation type="unfinished"></translation> + <translation>Редагувати "%1"</translation> </message> <message> <source>Unedit</source> @@ -2018,7 +2006,7 @@ Specifies how backspace interacts with indentation. <name>Cvs::Internal::CheckoutWizardPage</name> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>Specify repository and path.</source> @@ -2026,7 +2014,7 @@ Specifies how backspace interacts with indentation. </message> <message> <source>Repository:</source> - <translation type="unfinished"></translation> + <translation>Сховище:</translation> </message> </context> <context> @@ -2037,26 +2025,26 @@ Specifies how backspace interacts with indentation. </message> <message> <source>Ignore blank lines</source> - <translation type="unfinished"></translation> + <translation>Ігнорувати порожні рядки</translation> </message> </context> <context> <name>Cvs::Internal::SettingsPage</name> <message> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation>Конфігурація</translation> </message> <message> <source>CVS command:</source> - <translation type="unfinished"></translation> + <translation>Команда CVS:</translation> </message> <message> <source>CVS root:</source> - <translation type="unfinished"></translation> + <translation>Корінь CVS:</translation> </message> <message> <source>Miscellaneous</source> - <translation type="unfinished"></translation> + <translation>Різне</translation> </message> <message> <source>Diff options:</source> @@ -2076,11 +2064,11 @@ Specifies how backspace interacts with indentation. </message> <message> <source>Timeout:</source> - <translation type="unfinished"></translation> + <translation>Час очікування:</translation> </message> <message> <source>s</source> - <translation type="unfinished"></translation> + <translation> с</translation> </message> <message> <source>CVS</source> @@ -2098,11 +2086,11 @@ Specifies how backspace interacts with indentation. <name>ChangeSelectionDialog</name> <message> <source>Repository location:</source> - <translation type="unfinished"></translation> + <translation>Розташування сховища:</translation> </message> <message> <source>Select</source> - <translation type="unfinished"></translation> + <translation>Вибрати</translation> </message> <message> <source>Change:</source> @@ -2143,20 +2131,20 @@ Specifies how backspace interacts with indentation. </message> <message> <source>CODA: v%1.%2 CODA protocol: v%3.%4</source> - <translation type="unfinished"></translation> + <translation>CODA: v%1.%2 протокол CODA: v%3.%4</translation> </message> <message> <source>%1, %2%3%4, %5</source> <extracomment>s60description description of an S60 device %1 CPU description, %2 endianness %3 default type size (if any), %4 float size (if any) %5 Coda version</extracomment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>big endian</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>little endian</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>, type size: %1</source> @@ -2180,84 +2168,84 @@ Specifies how backspace interacts with indentation. <name>CodePaster::CodePasterProtocol</name> <message> <source>No Server defined in the CodePaster preferences.</source> - <translation type="unfinished"></translation> + <translation>Не вказано сервер в налаштуваннях CodePaster.</translation> </message> <message> <source>No Server defined in the CodePaster options.</source> - <translation type="unfinished"></translation> + <translation>Не вказано сервер в налаштуваннях CodePaster.</translation> </message> <message> <source>No such paste</source> - <translation type="unfinished"></translation> + <translation>Немає такої вставки</translation> </message> </context> <context> <name>CodePaster::CodePasterSettingsPage</name> <message> <source>CodePaster</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Server:</source> - <translation type="unfinished"></translation> + <translation>Сервер:</translation> </message> <message> <source><i>Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).</i></source> - <translation type="unfinished"></translation> + <translation><i>Примітка: Задайте назву вузла сервісу, не вказуючи протокол (наприклад. codepaster.mycompany.com).</i></translation> </message> </context> <context> <name>CodePaster::CodepasterPlugin</name> <message> <source>&Code Pasting</source> - <translation type="unfinished"></translation> + <translation>Вставка &коду</translation> </message> <message> <source>Paste Snippet...</source> - <translation type="unfinished"></translation> + <translation>Вставити фрагмент...</translation> </message> <message> <source>Alt+C,Alt+P</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Paste Clipboard...</source> - <translation type="unfinished"></translation> + <translation>Вставити з буферу обміну...</translation> </message> <message> <source>Fetch Snippet...</source> - <translation type="unfinished"></translation> + <translation>Отримати фрагмент...</translation> </message> <message> <source>Alt+C,Alt+F</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Empty snippet received for "%1".</source> - <translation type="unfinished"></translation> + <translation>Отримано порожный фрагмент для "%1".</translation> </message> </context> <context> <name>CodePaster::FileShareProtocol</name> <message> <source>Cannot open %1: %2</source> - <translation type="unfinished">Неможливо відкрити %1: %2</translation> + <translation>Неможливо відкрити %1: %2</translation> </message> <message> <source>%1 does not appear to be a paster file.</source> - <translation type="unfinished"></translation> + <translation>%1 не є файлом paster.</translation> </message> <message> <source>Error in %1 at %2: %3</source> - <translation type="unfinished"></translation> + <translation>Помилка в %1, рядок %2: %3</translation> </message> <message> <source>Please configure a path.</source> - <translation type="unfinished"></translation> + <translation>Будь-ласка, налаштуйте шлях.</translation> </message> <message> <source>Pasted: %1</source> - <translation type="unfinished"></translation> + <translation>Вставлено: %1</translation> </message> </context> <context> @@ -2271,30 +2259,30 @@ Specifies how backspace interacts with indentation. <name>CodePaster::FileShareProtocolSettingsWidget</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>&Path:</source> - <translation type="unfinished">&Шлях:</translation> + <translation>&Шлях:</translation> </message> <message> <source>&Display:</source> - <translation type="unfinished"></translation> + <translation>&Відображати:</translation> </message> <message> <source>entries</source> - <translation type="unfinished"></translation> + <translation> елементів</translation> </message> <message> <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source> - <translation type="unfinished"></translation> + <translation>Протокол, на основу спільних файлів, дозволяє обмінюватись фрагментами коду, використовуючи прості файли на спільному мережевому диску. Файли ніколи не видаляються.</translation> </message> </context> <context> <name>CodePaster::NetworkProtocol</name> <message> <source>Checking connection</source> - <translation type="unfinished"></translation> + <translation>Перевірка підключення</translation> </message> <message> <source>Connecting to %1...</source> @@ -2320,23 +2308,23 @@ Specifies how backspace interacts with indentation. <name>CodePaster::PasteSelectDialog</name> <message> <source>Protocol:</source> - <translation type="unfinished"></translation> + <translation>Протокол:</translation> </message> <message> <source>Paste:</source> - <translation type="unfinished"></translation> + <translation>Вставка:</translation> </message> <message> <source>Refresh</source> - <translation type="unfinished">Оновити</translation> + <translation>Оновити</translation> </message> <message> <source>Waiting for items</source> - <translation type="unfinished"></translation> + <translation>Очікування на елементи</translation> </message> <message> <source>This protocol does not support listing</source> - <translation type="unfinished"></translation> + <translation>Цей протокол не підтримує отримання списку</translation> </message> </context> <context> @@ -2354,7 +2342,7 @@ Specifies how backspace interacts with indentation. <name>CodePaster::Protocol</name> <message> <source>%1 - Configuration Error</source> - <translation type="unfinished"></translation> + <translation>%1 - помилка конфігурації</translation> </message> <message> <source>Settings...</source> @@ -2365,23 +2353,23 @@ Specifies how backspace interacts with indentation. <name>CodePaster::SettingsPage</name> <message> <source>Display Output pane after sending a post</source> - <translation type="unfinished"></translation> + <translation>Показати панель виведення після надсилання</translation> </message> <message> <source>Copy-paste URL to clipboard</source> - <translation type="unfinished"></translation> + <translation>Скопіювати-вставити URL до буферу обміну</translation> </message> <message> <source>Username:</source> - <translation type="unfinished"></translation> + <translation>Ім'я користувача:</translation> </message> <message> <source>Default protocol:</source> - <translation type="unfinished"></translation> + <translation>Типовий протокол:</translation> </message> <message> <source>General</source> - <translation type="unfinished">Загальне</translation> + <translation>Загальне</translation> </message> </context> <context> @@ -2402,34 +2390,34 @@ Specifies how backspace interacts with indentation. <name>ColorGroupBox</name> <message> <source>Color editor</source> - <translation type="unfinished"></translation> + <translation>Редактор кольору</translation> </message> <message> <source>Hue</source> - <translation type="unfinished">Відтінок</translation> + <translation>Відтінок</translation> </message> <message> <source>Saturation</source> - <translation type="unfinished">Насиченість</translation> + <translation>Насиченість</translation> </message> <message> <source>Brightness</source> - <translation type="unfinished"></translation> + <translation>Яскравість</translation> </message> <message> <source>Alpha</source> - <translation type="unfinished">Альфа</translation> + <translation>Альфа</translation> </message> </context> <context> <name>ColorTypeButtons</name> <message> <source>Solid color</source> - <translation type="unfinished"></translation> + <translation>Суцільний колір</translation> </message> <message> <source>Gradient</source> - <translation type="unfinished">Градієнт</translation> + <translation>Градієнт</translation> </message> <message> <source>Gradient (only editable in base state)</source> @@ -2526,18 +2514,10 @@ Specifies how backspace interacts with indentation. <translation><необмежено></translation> </message> <message> - <source>Close temporary buffers on debugger exit.</source> - <translation>Закривати тимчасові буфери при виході зневаджувача.</translation> - </message> - <message> <source>Close temporary buffers on debugger exit</source> <translation>Закривати тимчасові буфери при виході зневаджувача</translation> </message> <message> - <source>Switch to previous mode on debugger exit.</source> - <translation>Повертатись до попереднього режиму при виході зневаджувача.</translation> - </message> - <message> <source>Switch to previous mode on debugger exit</source> <translation>Повертатись до попереднього режиму при виході зневаджувача</translation> </message> @@ -4667,7 +4647,7 @@ if they would align to the next line</source> <context> <name>CppTools::Internal::CppFunctionsFilter</name> <message> - <source>Methods and functions</source> + <source>Methods and Functions</source> <translation>Методи та функції</translation> </message> </context> @@ -8035,7 +8015,7 @@ Do you want to retry?</source> </message> <message> <source>Change Display for Type or Item...</source> - <translation>Змінити формат відображення для типу чи елементу...</translation> + <translation>Змінити відображення для типу чи елемента...</translation> </message> <message> <source>Open Memory Editor at Object's Address</source> @@ -8763,25 +8743,6 @@ Rebuilding the project might help.</source> </message> </context> <context> - <name>ExampleLineEdit</name> - <message> - <source>Show Examples and Demos</source> - <translation>Показати приклади та демонстрації</translation> - </message> - <message> - <source>Search in Tutorials</source> - <translation>Шукати в посібниках</translation> - </message> - <message> - <source>Search in Tutorials, Examples and Demos</source> - <translation>Шукати в посібниках, прикладах та демонстраціях</translation> - </message> - <message> - <source>Tag List</source> - <translation>Список тегів</translation> - </message> -</context> -<context> <name>ExpressionEditor</name> <message> <source>Expression</source> @@ -8792,15 +8753,15 @@ Rebuilding the project might help.</source> <name>Extended</name> <message> <source>Effect</source> - <translation type="unfinished"></translation> + <translation>Ефект</translation> </message> <message> <source>Blur Radius:</source> - <translation type="unfinished"></translation> + <translation>Радіус розмиття:</translation> </message> <message> <source>Pixel Size:</source> - <translation type="unfinished"></translation> + <translation>Розмір пікселя:</translation> </message> <message> <source>x Offset: </source> @@ -8815,7 +8776,7 @@ Rebuilding the project might help.</source> <name>ExtendedFunctionButton</name> <message> <source>Reset</source> - <translation type="unfinished">Скинути</translation> + <translation>Скинути</translation> </message> <message> <source>Set Expression</source> @@ -9057,11 +9018,11 @@ Reason: %3</source> <name>FakeVim::Internal::FakeVimExCommandsPage</name> <message> <source>Ex Command Mapping</source> - <translation type="unfinished"></translation> + <translation>Розширене відображення команд</translation> </message> <message> <source>FakeVim</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Ex Trigger Expression</source> @@ -9069,11 +9030,11 @@ Reason: %3</source> </message> <message> <source>Regular expression:</source> - <translation type="unfinished"></translation> + <translation>Регулярний вираз:</translation> </message> <message> <source>Ex Command</source> - <translation type="unfinished"></translation> + <translation>Розиширена команда</translation> </message> </context> <context> @@ -9088,15 +9049,15 @@ Reason: %3</source> </message> <message> <source>%1All</source> - <translation type="unfinished"></translation> + <translation>%1Все</translation> </message> <message> <source>Not implemented in FakeVim</source> - <translation type="unfinished"></translation> + <translation>Не реалізовано в FakeVim</translation> </message> <message> <source>Unknown option: </source> - <translation type="unfinished"></translation> + <translation>Невідома опція:</translation> </message> <message> <source>File "%1" exists (add ! to override)</source> @@ -9104,7 +9065,7 @@ Reason: %3</source> </message> <message> <source>Cannot open file "%1" for writing</source> - <translation type="unfinished"></translation> + <translation>Неможливо відкрити файл %1 для запису</translation> </message> <message> <source>"%1" %2 %3L, %4C written</source> @@ -9112,7 +9073,7 @@ Reason: %3</source> </message> <message> <source>Cannot open file "%1" for reading</source> - <translation type="unfinished"></translation> + <translation>Неможливо відкрити файл %1 для читання</translation> </message> <message> <source>"%1" %2L, %3C</source> @@ -9136,7 +9097,7 @@ Reason: %3</source> </message> <message> <source>Cannot open file %1</source> - <translation type="unfinished">Неможливо відкрити %1! {1?}</translation> + <translation>Неможливо відкрити %1! {1?}</translation> </message> <message> <source>search hit BOTTOM, continuing at TOP</source> @@ -9148,7 +9109,7 @@ Reason: %3</source> </message> <message> <source>Pattern not found: %1</source> - <translation type="unfinished"></translation> + <translation>Зразок не знайдено: %1</translation> </message> <message> <source>Already at oldest change</source> @@ -9174,16 +9135,20 @@ Reason: %3</source> <name>FakeVim::Internal::FakeVimOptionPage</name> <message> <source>General</source> - <translation type="unfinished">Загальне</translation> + <translation>Загальне</translation> </message> <message> <source>FakeVim</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> <name>FakeVim::Internal::FakeVimPluginPrivate</name> <message> + <source>Execute User Action #%1</source> + <translation type="unfinished"></translation> + </message> + <message> <source>File not saved</source> <translation type="unfinished"></translation> </message> @@ -9208,11 +9173,11 @@ Reason: %3</source> <name>FakeVim::Internal::FakeVimUserCommandsModel</name> <message> <source>Action</source> - <translation type="unfinished"></translation> + <translation>Дія</translation> </message> <message> <source>Command</source> - <translation type="unfinished">Команда</translation> + <translation>Команда</translation> </message> <message> <source>User command #%1</source> @@ -9227,26 +9192,26 @@ Reason: %3</source> </message> <message> <source>FakeVim</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> <name>FakeVimOptionPage</name> <message> <source>Use FakeVim</source> - <translation type="unfinished"></translation> + <translation>Застосувати FakeVim</translation> </message> <message> <source>Read .vimrc</source> - <translation type="unfinished">Читати .vimrc</translation> + <translation>Читати .vimrc</translation> </message> <message> <source>Vim Behavior</source> - <translation type="unfinished"></translation> + <translation>Поведінка Vim</translation> </message> <message> <source>Automatic indentation</source> - <translation type="unfinished"></translation> + <translation>Автоматичні відступи</translation> </message> <message> <source>Start of line</source> @@ -9254,7 +9219,7 @@ Reason: %3</source> </message> <message> <source>Smart indentation</source> - <translation type="unfinished"></translation> + <translation>Розумні відступи</translation> </message> <message> <source>Use search dialog</source> @@ -9718,15 +9683,15 @@ Qt Creator know about a likely URI.</source> <name>FontGroupBox</name> <message> <source>Font</source> - <translation type="unfinished">Шрифт</translation> + <translation>Шрифт</translation> </message> <message> <source>Size</source> - <translation type="unfinished">Розмір</translation> + <translation>Розмір</translation> </message> <message> <source>Style</source> - <translation type="unfinished">Стиль</translation> + <translation>Стиль</translation> </message> <message> <source>Font style</source> @@ -10267,7 +10232,7 @@ These files are preserved.</source> </message> <message> <source>Size</source> - <translation type="unfinished">Розмір</translation> + <translation>Розмір</translation> </message> <message> <source>Lock aspect ratio</source> @@ -10286,7 +10251,7 @@ These files are preserved.</source> <name>Git::CloneWizardPage</name> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>Specify repository URL, checkout directory and path.</source> @@ -10328,15 +10293,15 @@ These files are preserved.</source> <name>Git::Internal::BranchAddDialog</name> <message> <source>Dialog</source> - <translation type="unfinished">Діалог</translation> + <translation>Діалог</translation> </message> <message> <source>Branch Name:</source> - <translation type="unfinished"></translation> + <translation>Назва гілки:</translation> </message> <message> <source>CheckBox</source> - <translation type="unfinished">Прапорець</translation> + <translation>Прапорець</translation> </message> <message> <source>Track remote branch '%1'</source> @@ -10351,7 +10316,7 @@ These files are preserved.</source> <name>Git::Internal::BranchDialog</name> <message> <source>Branches</source> - <translation type="unfinished"></translation> + <translation>Гілки</translation> </message> <message> <source>Would you like to delete the <b>unmerged</b> branch '%1'?</source> @@ -10359,7 +10324,7 @@ These files are preserved.</source> </message> <message> <source>Delete Branch</source> - <translation type="unfinished"></translation> + <translation>Видалити гілку</translation> </message> <message> <source>Would you like to delete the branch '%1'?</source> @@ -10371,7 +10336,7 @@ These files are preserved.</source> </message> <message> <source>&Add...</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Додати...</translation> </message> <message> <source>&Remove</source> @@ -10409,7 +10374,7 @@ These files are preserved.</source> </message> <message> <source>Error</source> - <translation type="unfinished">Помилка</translation> + <translation>Помилка</translation> </message> <message> <source>Selected directory is not a Git repository</source> @@ -10827,10 +10792,6 @@ These files are preserved.</source> <translation>Очистити проект "%1"...</translation> </message> <message> - <source>Undo Uncommited Changes...</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Remotes...</source> <translation type="unfinished"></translation> </message> @@ -10888,6 +10849,10 @@ These files are preserved.</source> <translation type="unfinished">Статус</translation> </message> <message> + <source>Undo Uncommitted Changes...</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Clean...</source> <translation>Очистити...</translation> </message> @@ -11016,7 +10981,7 @@ These files are preserved.</source> <name>Git::Internal::GitSettings</name> <message> <source>The binary '%1' could not be located in the path '%2'</source> - <translation type="unfinished"></translation> + <translation>Не вдалось знайти виконуваний модуль '%1' в шляху '%2'</translation> </message> </context> <context> @@ -11054,23 +11019,23 @@ These files are preserved.</source> <name>Git::Internal::GitSubmitPanel</name> <message> <source>General Information</source> - <translation type="unfinished"></translation> + <translation>Загальна інформація</translation> </message> <message> <source>Repository:</source> - <translation type="unfinished"></translation> + <translation>Сховище:</translation> </message> <message> <source>repository</source> - <translation type="unfinished"></translation> + <translation>сховище</translation> </message> <message> <source>Branch:</source> - <translation type="unfinished"></translation> + <translation>Гілка:</translation> </message> <message> <source>branch</source> - <translation type="unfinished"></translation> + <translation>гілка</translation> </message> <message> <source>Commit Information</source> @@ -11078,11 +11043,11 @@ These files are preserved.</source> </message> <message> <source>Author:</source> - <translation type="unfinished"></translation> + <translation>Автор:</translation> </message> <message> <source>Email:</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> @@ -11093,11 +11058,11 @@ These files are preserved.</source> </message> <message> <source>Name:</source> - <translation type="unfinished">Назва:</translation> + <translation>Назва:</translation> </message> <message> <source>URL:</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> @@ -11112,7 +11077,7 @@ These files are preserved.</source> </message> <message> <source>&Add...</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Додати...</translation> </message> <message> <source>F&etch</source> @@ -11147,7 +11112,7 @@ These files are preserved.</source> </message> <message> <source>Miscellaneous</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Різне</translation> </message> <message> <source>Note that huge amount of commits might take some time.</source> @@ -11155,11 +11120,11 @@ These files are preserved.</source> </message> <message> <source>Timeout:</source> - <translation type="unfinished"></translation> + <translation>Час очікування:</translation> </message> <message> <source>s</source> - <translation type="unfinished"></translation> + <translation> с</translation> </message> <message> <source>Prompt on submit</source> @@ -11187,7 +11152,7 @@ These files are preserved.</source> </message> <message> <source>Arguments:</source> - <translation type="unfinished">Аргументи:</translation> + <translation>Аргументи:</translation> </message> <message> <source>Customize Environment:</source> @@ -11240,7 +11205,7 @@ instead of its installation directory when run outside git bash.</source> </message> <message> <source>Delete...</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Видалити...</translation> </message> <message> <source>Show</source> @@ -11260,7 +11225,7 @@ instead of its installation directory when run outside git bash.</source> </message> <message> <source>Repository: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Сховище: %1</translation> </message> <message> <source>Do you want to delete all stashes?</source> @@ -11310,7 +11275,7 @@ You can choose between stashing the changes or discarding them.</source> </message> <message> <source>Branch:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Гілка:</translation> </message> <message> <source>Stash Restore</source> @@ -11355,23 +11320,23 @@ You can choose between stashing the changes or discarding them.</source> <name>Gitorious::Internal::GitoriousHostWidget</name> <message> <source>...</source> - <translation type="unfinished">...</translation> + <translation>...</translation> </message> <message> <source><New Host></source> - <translation type="unfinished"></translation> + <translation><Новий вузол></translation> </message> <message> <source>Host</source> - <translation type="unfinished">Вузол</translation> + <translation>Вузол</translation> </message> <message> <source>Projects</source> - <translation type="unfinished">Проекти</translation> + <translation>Проекти</translation> </message> <message> <source>Description</source> - <translation type="unfinished"></translation> + <translation>Опис</translation> </message> </context> <context> @@ -11389,11 +11354,11 @@ You can choose between stashing the changes or discarding them.</source> <name>Gitorious::Internal::GitoriousProjectWidget</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>...</source> - <translation type="unfinished">...</translation> + <translation>...</translation> </message> <message> <source>Keep updating</source> @@ -11401,11 +11366,11 @@ You can choose between stashing the changes or discarding them.</source> </message> <message> <source>Project</source> - <translation type="unfinished">Проект</translation> + <translation>Проект</translation> </message> <message> <source>Description</source> - <translation type="unfinished"></translation> + <translation>Опис</translation> </message> </context> <context> @@ -11423,23 +11388,23 @@ You can choose between stashing the changes or discarding them.</source> <name>Gitorious::Internal::GitoriousRepositoryWizardPage</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Name</source> - <translation type="unfinished">Назва</translation> + <translation>Назва</translation> </message> <message> <source>Owner</source> - <translation type="unfinished"></translation> + <translation>Власник</translation> </message> <message> <source>Description</source> - <translation type="unfinished"></translation> + <translation>Опис</translation> </message> <message> <source>Repository</source> - <translation type="unfinished"></translation> + <translation>Сховище</translation> </message> <message> <source>Choose a repository of the project '%1'.</source> @@ -12293,10 +12258,6 @@ QML component instance objects and properties directly.</source> <translation>Встановити як типову</translation> </message> <message> - <source>&Add</source> - <translation>&Додати</translation> - </message> - <message> <source>&Remove</source> <translation>&Видалити</translation> </message> @@ -12312,6 +12273,10 @@ QML component instance objects and properties directly.</source> <source>&Generate SSH Key...</source> <translation>&Згенерувати ключ SSH...</translation> </message> + <message> + <source>&Add...</source> + <translation>&Додати...</translation> + </message> </context> <context> <name>LinuxDeviceFactorySelectionDialog</name> @@ -12689,35 +12654,35 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <name>Macros::Internal::MacroOptionsWidget</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Preferences</source> - <translation type="unfinished">Вподобання</translation> + <translation>Вподобання</translation> </message> <message> <source>Name</source> - <translation type="unfinished">Назва</translation> + <translation>Назва</translation> </message> <message> <source>Description</source> - <translation type="unfinished"></translation> + <translation>Опис</translation> </message> <message> <source>Shortcut</source> - <translation type="unfinished">Поєднання клавіш</translation> + <translation>Поєднання клавіш</translation> </message> <message> <source>Remove</source> - <translation type="unfinished">Видалити</translation> + <translation>Видалити</translation> </message> <message> <source>Macro</source> - <translation type="unfinished"></translation> + <translation>Макрос</translation> </message> <message> <source>Description:</source> - <translation type="unfinished">Опис:</translation> + <translation>Опис:</translation> </message> </context> <context> @@ -12728,61 +12693,61 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </message> <message> <source>Record Macro</source> - <translation type="unfinished"></translation> + <translation>Записати макрос</translation> </message> <message> <source>Ctrl+(</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Alt+(</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Stop Recording Macro</source> - <translation type="unfinished"></translation> + <translation>Зупинити запис макроса</translation> </message> <message> <source>Ctrl+)</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Alt+)</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Play Last Macro</source> - <translation type="unfinished"></translation> + <translation>Відтворити останній макрос</translation> </message> <message> <source>Alt+R</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Save Last Macro</source> - <translation type="unfinished"></translation> + <translation>Зберегти останній макрос</translation> </message> </context> <context> <name>Macros::Internal::SaveDialog</name> <message> <source>Save Macro</source> - <translation type="unfinished"></translation> + <translation>Зберегти макрос</translation> </message> <message> <source>Name:</source> - <translation type="unfinished">Назва:</translation> + <translation>Назва:</translation> </message> <message> <source>Description:</source> - <translation type="unfinished">Опис:</translation> + <translation>Опис:</translation> </message> </context> <context> <name>Macros::MacroManager</name> <message> <source>Playing Macro</source> - <translation type="unfinished"></translation> + <translation>Відтворення макроса</translation> </message> <message> <source>An error occurred while replaying the macro, execution stopped.</source> @@ -12794,7 +12759,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </message> <message> <source>Stop Recording Macro</source> - <translation type="unfinished"></translation> + <translation>Зупинити запис макроса</translation> </message> </context> <context> @@ -12991,11 +12956,11 @@ Do you want to add them to the project?</html></source> <translation>Тест</translation> </message> <message> - <source>Remote Processes</source> + <source>Remote Processes...</source> <translation type="unfinished"></translation> </message> <message> - <source>Deploy Public Key</source> + <source>Deploy Public Key...</source> <translation type="unfinished"></translation> </message> </context> @@ -13008,7 +12973,8 @@ Do you want to add them to the project?</html></source> <message> <source>SSH connection error: %1 </source> - <translation type="unfinished"></translation> + <translation>Помилка з'єднання SSH: %1 +</translation> </message> <message> <source>Error checking for Qt libraries: %1 @@ -13080,7 +13046,7 @@ Do you want to add them to the project?</html></source> <name>Madde::Internal::MaemoCopyFilesViaMountStep</name> <message> <source>Deploy files via UTFS mount</source> - <translation type="unfinished"></translation> + <translation>Розгорнути файли через монтування UTFS</translation> </message> </context> <context> @@ -13104,7 +13070,7 @@ Do you want to add them to the project?</html></source> </message> <message> <source>Copy files to sysroot</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Копіювати файли до sysroot</translation> </message> </context> <context> @@ -13149,7 +13115,7 @@ We will try to work around that, but you may experience problems.</source> </message> <message> <source>Could not copy file '%1' to '%2'.</source> - <translation type="unfinished">Не вдалось скопіювати файл '%1' до '%2'.</translation> + <translation>Не вдалось скопіювати файл '%1' до '%2'.</translation> </message> <message> <source>Error: Could not create file '%1'.</source> @@ -13160,7 +13126,7 @@ We will try to work around that, but you may experience problems.</source> <name>Madde::Internal::MaemoDebianPackageInstaller</name> <message> <source>Installation failed: You tried to downgrade a package, which is not allowed.</source> - <translation type="unfinished"></translation> + <translation>Збій встановлення: Ви намагались встановити пакунок нижчої версії, що не дозволено.</translation> </message> </context> <context> @@ -13205,14 +13171,14 @@ We will try to work around that, but you may experience problems.</source> <name>Madde::Internal::MaemoDeviceConfigWizard</name> <message> <source>New Device Configuration Setup</source> - <translation type="unfinished"></translation> + <translation>Налаштування нової конфігурації пристрою</translation> </message> </context> <context> <name>Madde::Internal::MaemoDeviceConfigWizardFinalPage</name> <message> <source>The new device configuration will now be created.</source> - <translation type="unfinished"></translation> + <translation>Зараз буде створено нову конфігурацію пристрою.</translation> </message> </context> <context> @@ -13281,21 +13247,21 @@ We will try to work around that, but you may experience problems.</source> <name>Madde::Internal::MaemoDeviceConfigWizardPreviousKeySetupCheckPage</name> <message> <source>Device Status Check</source> - <translation type="unfinished"></translation> + <translation>Перевірка стану пристрою</translation> </message> </context> <context> <name>Madde::Internal::MaemoDeviceConfigWizardReuseKeysCheckPage</name> <message> <source>Existing Keys Check</source> - <translation type="unfinished"></translation> + <translation>Перевірка існуючих ключів</translation> </message> </context> <context> <name>Madde::Internal::MaemoDeviceConfigWizardStartPage</name> <message> <source>General Information</source> - <translation type="unfinished"></translation> + <translation>Загальна інформація</translation> </message> <message> <source>MeeGo Device</source> @@ -13306,7 +13272,7 @@ We will try to work around that, but you may experience problems.</source> <name>Madde::Internal::MaemoInstallDebianPackageToSysrootStep</name> <message> <source>Install Debian package to sysroot</source> - <translation type="unfinished"></translation> + <translation>Встановити пакунок Debian до sysroot</translation> </message> </context> <context> @@ -13317,35 +13283,35 @@ We will try to work around that, but you may experience problems.</source> </message> <message> <source>Deploy package via UTFS mount</source> - <translation type="unfinished"></translation> + <translation>Розгорнути пакуноу через монтування UTFS</translation> </message> </context> <context> <name>Madde::Internal::MaemoInstallRpmPackageToSysrootStep</name> <message> <source>Install RPM package to sysroot</source> - <translation type="unfinished"></translation> + <translation>Встановити пакунок RPM до sysroot</translation> </message> </context> <context> <name>Madde::Internal::MaemoMakeInstallToSysrootStep</name> <message> <source>Copy files to sysroot</source> - <translation type="unfinished"></translation> + <translation>Копіювати файли до sysroot</translation> </message> </context> <context> <name>Madde::Internal::MaemoMountAndCopyFilesService</name> <message> <source>All files copied.</source> - <translation type="unfinished"></translation> + <translation>Всі файли скопійовано.</translation> </message> </context> <context> <name>Madde::Internal::MaemoMountAndInstallPackageService</name> <message> <source>Package installed.</source> - <translation type="unfinished"></translation> + <translation>Пакунок встановлено.</translation> </message> </context> <context> @@ -13376,7 +13342,7 @@ We will try to work around that, but you may experience problems.</source> </message> <message> <source>File Error</source> - <translation type="unfinished">Помилка файлу</translation> + <translation>Помилка файлу</translation> </message> <message> <source>Could not set project name.</source> @@ -13657,7 +13623,7 @@ We will try to work around that, but you may experience problems.</source> <name>Madde::Internal::MaemoQemuSettingsPage</name> <message> <source>MeeGo Qemu Settings</source> - <translation type="unfinished"></translation> + <translation>Налаштування Qemu для MeeGo</translation> </message> </context> <context> @@ -13762,7 +13728,7 @@ stderr was: %1</source> <name>Madde::Internal::MaemoRunConfiguration</name> <message> <source>Not enough free ports on the device.</source> - <translation type="unfinished"></translation> + <translation>Недостатньо вільних портів в пристрої</translation> </message> </context> <context> @@ -13809,7 +13775,7 @@ stderr was: %1</source> <name>Madde::Internal::MaemoRunControlFactory</name> <message> <source>Run on device</source> - <translation type="unfinished"></translation> + <translation>Запустити на пристрої</translation> </message> </context> <context> @@ -13839,7 +13805,7 @@ stderr was: %1</source> <name>Madde::Internal::MaemoToolChainConfigWidget</name> <message> <source><html><head/><body><table><tr><td>Path to MADDE:</td><td>%1</td></tr><tr><td>Path to MADDE target:</td><td>%2</td></tr><tr><td>Debugger:</td/><td>%3</td></tr></body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body><table><tr><td>Шлях до MADDE:</td><td>%1</td></tr><tr><td>Шлях до цілі MADDE:</td><td>%2</td></tr><tr><td>Зневаджувач:</td/><td>%3</td></tr></body></html></translation> </message> </context> <context> @@ -13902,7 +13868,7 @@ stderr was: %1</source> <name>MaemoDeployConfigurationWidget</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Add Desktop File</source> @@ -13917,7 +13883,7 @@ stderr was: %1</source> <name>MaemoDeviceConfigWizardCheckPreviousKeySetupPage</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Has a passwordless (key-based) login already been set up for this device?</source> @@ -13929,14 +13895,14 @@ stderr was: %1</source> </message> <message> <source>No</source> - <translation type="unfinished"></translation> + <translation>Ні</translation> </message> </context> <context> <name>MaemoDeviceConfigWizardKeyCreationPage</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Qt Creator will now generate a new pair of keys. Please enter the directory to save the key files in and then press "Create Keys".</source> @@ -13944,7 +13910,7 @@ stderr was: %1</source> </message> <message> <source>Directory:</source> - <translation type="unfinished"></translation> + <translation>Тека:</translation> </message> <message> <source>Create Keys</source> @@ -13955,7 +13921,7 @@ stderr was: %1</source> <name>MaemoDeviceConfigWizardKeyDeploymentPage</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>To deploy the public key to your device, please execute the following steps: @@ -13974,7 +13940,7 @@ stderr was: %1</source> </message> <message> <source>Password:</source> - <translation type="unfinished">Пароль:</translation> + <translation>Пароль:</translation> </message> <message> <source>Deploy Key</source> @@ -13985,7 +13951,7 @@ stderr was: %1</source> <name>MaemoDeviceConfigWizardReuseKeysCheckPage</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Re-use existing keys</source> @@ -14012,11 +13978,11 @@ stderr was: %1</source> <name>MaemoDeviceConfigWizardStartPage</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>The name to identify this configuration:</source> - <translation type="unfinished"></translation> + <translation>Назва для цієї конфігурації:</translation> </message> <message> <source>The system running on the device:</source> @@ -14032,7 +13998,7 @@ stderr was: %1</source> </message> <message> <source>The device's host name or IP address:</source> - <translation type="unfinished"></translation> + <translation>Назва вузла чи IP-адреса пристрою:</translation> </message> <message> <source>Emulator</source> @@ -14087,7 +14053,7 @@ stderr was: %1</source> </message> <message> <source>Edit...</source> - <translation type="unfinished">Редагувати...</translation> + <translation>Редагувати...</translation> </message> </context> <context> @@ -14106,7 +14072,7 @@ stderr was: %1</source> <name>MaemoPublishingResultPageFremantleFree</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Progress</source> @@ -14117,7 +14083,7 @@ stderr was: %1</source> <name>MaemoPublishingUploadSettingsPageFremantleFree</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Upload Settings</source> @@ -14137,7 +14103,7 @@ stderr was: %1</source> </message> <message> <source>Private key file:</source> - <translation type="unfinished"></translation> + <translation>Файл приватного ключа:</translation> </message> <message> <source>Server address:</source> @@ -14152,11 +14118,11 @@ stderr was: %1</source> <name>MaemoPublishingWizardPageFremantleFree</name> <message> <source>WizardPage</source> - <translation type="unfinished">Сторінка майстра</translation> + <translation>Сторінка майстра</translation> </message> <message> <source>Choose build configuration:</source> - <translation type="unfinished">Оберіть конфігурацію збірки:</translation> + <translation>Оберіть конфігурацію збірки:</translation> </message> <message> <source>Only create source package, do not upload</source> @@ -14167,23 +14133,23 @@ stderr was: %1</source> <name>MaemoQemuSettingsWidget</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>OpenGL Mode</source> - <translation type="unfinished"></translation> + <translation>Режим OpenGL</translation> </message> <message> <source>&Hardware acceleration</source> - <translation type="unfinished"></translation> + <translation>&Апаратне прискорення</translation> </message> <message> <source>&Software rendering</source> - <translation type="unfinished"></translation> + <translation>&Програмне відмальовування</translation> </message> <message> <source>&Auto-detect</source> - <translation type="unfinished"></translation> + <translation>А&втовизначення</translation> </message> </context> <context> @@ -14262,7 +14228,7 @@ stderr was: %1</source> <name>Mercurial::Internal::CloneWizardPage</name> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>Specify repository URL, checkout directory and path.</source> @@ -14303,23 +14269,23 @@ stderr was: %1</source> <name>Mercurial::Internal::MercurialCommitPanel</name> <message> <source>General Information</source> - <translation type="unfinished"></translation> + <translation>Загальна інформація</translation> </message> <message> <source>Repository:</source> - <translation type="unfinished"></translation> + <translation>Сховище:</translation> </message> <message> <source>repository</source> - <translation type="unfinished"></translation> + <translation>сховище</translation> </message> <message> <source>Branch:</source> - <translation type="unfinished"></translation> + <translation>Гілка:</translation> </message> <message> <source>branch</source> - <translation type="unfinished"></translation> + <translation>гілка</translation> </message> <message> <source>Commit Information</source> @@ -14327,11 +14293,11 @@ stderr was: %1</source> </message> <message> <source>Author:</source> - <translation type="unfinished"></translation> + <translation>Автор:</translation> </message> <message> <source>Email:</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> @@ -14345,11 +14311,11 @@ stderr was: %1</source> <name>Mercurial::Internal::MercurialDiffParameterWidget</name> <message> <source>Ignore whitespace</source> - <translation type="unfinished">Ігнорувати пропуски</translation> + <translation>Ігнорувати пропуски</translation> </message> <message> <source>Ignore blank lines</source> - <translation type="unfinished"></translation> + <translation>Ігнорувати порожні рядки</translation> </message> </context> <context> @@ -14399,7 +14365,7 @@ stderr was: %1</source> </message> <message> <source>Alt+H,Alt+L</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Status Current File</source> @@ -14419,15 +14385,15 @@ stderr was: %1</source> </message> <message> <source>Add "%1"</source> - <translation type="unfinished"></translation> + <translation>Додати "%1"</translation> </message> <message> <source>Delete...</source> - <translation type="unfinished"></translation> + <translation>Видалити...</translation> </message> <message> <source>Delete "%1"...</source> - <translation type="unfinished"></translation> + <translation>Видалити "%1"...</translation> </message> <message> <source>Revert Current File...</source> @@ -14487,7 +14453,7 @@ stderr was: %1</source> </message> <message> <source>Create Repository...</source> - <translation type="unfinished"></translation> + <translation>Створити сховище...</translation> </message> <message> <source>Pull Source</source> @@ -14499,7 +14465,7 @@ stderr was: %1</source> </message> <message> <source>Update</source> - <translation type="unfinished"></translation> + <translation>Оновити</translation> </message> <message> <source>Incoming Source</source> @@ -14515,11 +14481,11 @@ stderr was: %1</source> </message> <message> <source>&Undo</source> - <translation type="unfinished">&Повернути</translation> + <translation>&Повернути</translation> </message> <message> <source>&Redo</source> - <translation type="unfinished">П&овторити</translation> + <translation>П&овторити</translation> </message> <message> <source>There are no changes to commit.</source> @@ -14554,19 +14520,19 @@ stderr was: %1</source> <name>Mercurial::Internal::OptionsPage</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation>Конфігурація</translation> </message> <message> <source>Command:</source> - <translation type="unfinished">Команда:</translation> + <translation>Команда:</translation> </message> <message> <source>User</source> - <translation type="unfinished"></translation> + <translation>Користувач</translation> </message> <message> <source>Username to use by default on commit.</source> @@ -14574,7 +14540,7 @@ stderr was: %1</source> </message> <message> <source>Default username:</source> - <translation type="unfinished"></translation> + <translation>Типове ім'я користувача:</translation> </message> <message> <source>Email to use by default on commit.</source> @@ -14582,11 +14548,11 @@ stderr was: %1</source> </message> <message> <source>Default email:</source> - <translation type="unfinished"></translation> + <translation>Типовий email:</translation> </message> <message> <source>Miscellaneous</source> - <translation type="unfinished"></translation> + <translation>Різне</translation> </message> <message> <source>Log count:</source> @@ -14594,11 +14560,11 @@ stderr was: %1</source> </message> <message> <source>Timeout:</source> - <translation type="unfinished"></translation> + <translation>Час очікування:</translation> </message> <message> <source>s</source> - <translation type="unfinished"></translation> + <translation> с</translation> </message> <message> <source>Prompt on submit</source> @@ -14606,7 +14572,7 @@ stderr was: %1</source> </message> <message> <source>Mercurial</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>The number of recent commit logs to show, choose 0 to see all entries.</source> @@ -14632,30 +14598,30 @@ stderr was: %1</source> </message> <message> <source>Revision:</source> - <translation type="unfinished"></translation> + <translation>Ревізія:</translation> </message> </context> <context> <name>Mercurial::Internal::SrcDestDialog</name> <message> <source>Dialog</source> - <translation type="unfinished">Діалог</translation> + <translation>Діалог</translation> </message> <message> <source>Default Location</source> - <translation type="unfinished"></translation> + <translation>Типове розташування</translation> </message> <message> <source>Local filesystem:</source> - <translation type="unfinished"></translation> + <translation>Локальна файлова система:</translation> </message> <message> <source>e.g. https://[user[:pass]@]host[:port]/[path]</source> - <translation type="unfinished"></translation> + <translation>Наприклад: https://[user[:pass]@]host[:port]/[path]</translation> </message> <message> - <source>Specify Url:</source> - <translation type="unfinished"></translation> + <source>Specify URL:</source> + <translation>Вкажіть URL:</translation> </message> </context> <context> @@ -15168,19 +15134,19 @@ Preselects Qt for Simulator and mobile targets if available.</source> <name>PasteBinComSettingsWidget</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Server prefix:</source> - <translation type="unfinished"></translation> + <translation>Префікс сервера:</translation> </message> <message> <source><a href="http://pastebin.com">pastebin.com</a> allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source> - <translation type="unfinished"></translation> + <translation><a href="http://pastebin.com">pastebin.com</a> дозволяє надсилати дані до піддоменів користувача (наприклад. creator.pastebin.com). Вкажіть бажаний префікс.</translation> </message> <message> <source><i>Note: The plugin will use this for posting as well as fetching.</i></source> - <translation type="unfinished"></translation> + <translation><i>Примітка: Додаток буде використовувати цей префікс і для отримання даних.</i></translation> </message> </context> <context> @@ -15281,7 +15247,7 @@ Preselects Qt for Simulator and mobile targets if available.</source> </message> <message> <source>Cancel</source> - <translation type="unfinished">Скасувати</translation> + <translation>Скасувати</translation> </message> <message> <source>Change %1: %2</source> @@ -15374,7 +15340,7 @@ Preselects Qt for Simulator and mobile targets if available.</source> </message> <message> <source>Edit</source> - <translation type="unfinished">Правка</translation> + <translation>Редагувати</translation> </message> <message> <source>Edit "%1"</source> @@ -15673,11 +15639,11 @@ Preselects Qt for Simulator and mobile targets if available.</source> <name>Perforce::Internal::SettingsPage</name> <message> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation>Конфігурація</translation> </message> <message> <source>P4 command:</source> - <translation type="unfinished"></translation> + <translation>Команда P4:</translation> </message> <message> <source>Environment Variables</source> @@ -15697,15 +15663,15 @@ Preselects Qt for Simulator and mobile targets if available.</source> </message> <message> <source>Miscellaneous</source> - <translation type="unfinished"></translation> + <translation>Різне</translation> </message> <message> <source>Timeout:</source> - <translation type="unfinished"></translation> + <translation>Час очікування:</translation> </message> <message> <source>s</source> - <translation type="unfinished"></translation> + <translation> с</translation> </message> <message> <source>Prompt on submit</source> @@ -15717,11 +15683,11 @@ Preselects Qt for Simulator and mobile targets if available.</source> </message> <message> <source>Test</source> - <translation type="unfinished">Тест</translation> + <translation>Тест</translation> </message> <message> <source>Perforce</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Automatically open files when editing</source> @@ -15732,7 +15698,7 @@ Preselects Qt for Simulator and mobile targets if available.</source> <name>Perforce::Internal::SettingsPageWidget</name> <message> <source>Perforce Command</source> - <translation type="unfinished"></translation> + <translation>Команда Perforce</translation> </message> <message> <source>Testing...</source> @@ -15759,7 +15725,7 @@ Preselects Qt for Simulator and mobile targets if available.</source> </message> <message> <source>User:</source> - <translation type="unfinished">Користувач:</translation> + <translation>Користувач:</translation> </message> </context> <context> @@ -16138,6 +16104,14 @@ Preselects Qt for Simulator and mobile targets if available.</source> <translation>Деталі</translation> </message> <message> + <source>Creates a plain C project using qmake, not using the Qt library.</source> + <translation>Створює простий проект C з використанням qmake, але без бібліотеки Qt.</translation> + </message> + <message> + <source>Creates a plain C++ project using qmake, not using the Qt library.</source> + <translation>Створює простий проект C++ з використанням qmake, але без бібліотеки Qt.</translation> + </message> + <message> <source>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</source> <translation>Створює додаток C++, який дозволяє надавати розширення, які можуть бути динамічно завантажені в програми за допомогою класу QDeclarativeEngine.</translation> </message> @@ -16174,22 +16148,18 @@ Preselects Qt for Simulator and mobile targets if available.</source> <translation>Додаток Qt Creator</translation> </message> <message> - <source>Other Project</source> - <translation>Інший проект</translation> + <source>URL:</source> + <translation></translation> </message> <message> - <source>Creates a plain C project using QMake, not using the Qt library.</source> - <translation>Створює простий проект C з використанням QMake, але без бібліотеки Qt.</translation> + <source>Other Project</source> + <translation>Інший проект</translation> </message> <message> <source>Plain C Project</source> <translation>Простий проект C</translation> </message> <message> - <source>Creates a plain C++ project using QMake, not using the Qt library.</source> - <translation>Створює простий проект C++ з використанням QMake, але без бібліотеки Qt.</translation> - </message> - <message> <source>Plain C++ Project</source> <translation>Простий проект C++</translation> </message> @@ -16218,10 +16188,6 @@ Preselects Qt for Simulator and mobile targets if available.</source> <translation>Опис:</translation> </message> <message> - <source>Url:</source> - <translation>URL:</translation> - </message> - <message> <source>Qt Creator sources:</source> <translation>Коди Qt Creator:</translation> </message> @@ -16370,7 +16336,7 @@ Reason: %2</source> %2</translation> </message> <message> - <source>File &pattern:</source> + <source>Fi&le pattern:</source> <translation>&Маска файлів:</translation> </message> </context> @@ -16432,22 +16398,10 @@ Reason: %2</source> <translation>Видалити</translation> </message> <message> - <source>Rename</source> - <translation>Перейменувати</translation> - </message> - <message> <source>&Clone Selected</source> <translation>&Клонувати обрану</translation> </message> <message> - <source>Remove Build Configuration</source> - <translation>Видалити конфігурацію збірки</translation> - </message> - <message> - <source>Do you really want to delete the build configuration <b>%1</b>?</source> - <translation>Ви дійсно бажаєте видалити конфігурацію збірки <b>%1</b>?</translation> - </message> - <message> <source>Clone Configuration</source> <extracomment>Title of a the cloned BuildConfiguration window, text of the window</extracomment> <translation>Клонувати конфігурацію</translation> @@ -17197,10 +17151,6 @@ to project '%2'.</source> <translation>Видалити</translation> </message> <message> - <source>Rename</source> - <translation>Перейменувати</translation> - </message> - <message> <source>Deployment</source> <translation>Розгортання</translation> </message> @@ -17699,6 +17649,10 @@ to project '%2'.</source> <translation>Видалити проект...</translation> </message> <message> + <source>Rename...</source> + <translation>Перейменувати...</translation> + </message> + <message> <source>Collapse All</source> <translation>Згорнути все</translation> </message> @@ -17805,10 +17759,6 @@ to project '%2'.</source> <translation>Новий підпроект...</translation> </message> <message> - <source>Rename</source> - <translation>Перейменувати</translation> - </message> - <message> <source>Open Build/Run Target Selector...</source> <translation>Відкрити вибір цілі збірки/запуску...</translation> </message> @@ -17926,7 +17876,10 @@ to version control (%2)?</source> - %1 Reason: %2</source> - <translation type="unfinished"></translation> + <translation>Не вдалось зібрати qmldump в жодній з цих тек: +- %1 + +Причина: %2</translation> </message> </context> <context> @@ -18128,7 +18081,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <name>QmlDesigner::ComponentAction</name> <message> <source>Edit sub components defined in this file</source> - <translation type="unfinished"></translation> + <translation>Редагувати підкомпоненти визначені в цьому файлі</translation> </message> </context> <context> @@ -18172,6 +18125,14 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <translation type="unfinished"></translation> </message> <message> + <source>width</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>height</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Reset view (R)</source> <translation type="unfinished"></translation> </message> @@ -18188,34 +18149,34 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>&Save %1</source> - <translation type="unfinished">&Зберегти %1</translation> + <translation>&Зберегти %1</translation> </message> <message> <source>Revert %1 to Saved</source> - <translation type="unfinished">Повернути %1 до збереженого</translation> + <translation>Повернути %1 до збереженого</translation> </message> <message> <source>Close %1</source> - <translation type="unfinished">Закрити %1</translation> + <translation>Закрити %1</translation> </message> <message> <source>Close All Except %1</source> - <translation type="unfinished">Закрити все окрім %1</translation> + <translation>Закрити все окрім %1</translation> </message> <message> <source>Close Others</source> - <translation type="unfinished">Закрити інші</translation> + <translation>Закрити інші</translation> </message> </context> <context> <name>QmlDesigner::Internal::DesignModeWidget</name> <message> <source>&Undo</source> - <translation type="unfinished">&Повернути</translation> + <translation>&Повернути</translation> </message> <message> <source>&Redo</source> - <translation type="unfinished">П&овторити</translation> + <translation>П&овторити</translation> </message> <message> <source>Delete</source> @@ -18223,39 +18184,39 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>Delete "%1"</source> - <translation type="unfinished"></translation> + <translation>Видалити "%1"</translation> </message> <message> <source>Cu&t</source> - <translation type="unfinished">Вирі&зати</translation> + <translation>Вирі&зати</translation> </message> <message> <source>Cut "%1"</source> - <translation type="unfinished"></translation> + <translation>Вирізати "%1"</translation> </message> <message> <source>&Copy</source> - <translation type="unfinished">&Копіювати</translation> + <translation>&Копіювати</translation> </message> <message> <source>Copy "%1"</source> - <translation type="unfinished"></translation> + <translation>Копіювати "%1"</translation> </message> <message> <source>&Paste</source> - <translation type="unfinished">&Вставити</translation> + <translation>&Вставити</translation> </message> <message> <source>Paste "%1"</source> - <translation type="unfinished"></translation> + <translation>Вставити "%1"</translation> </message> <message> <source>Select &All</source> - <translation type="unfinished">Виділити в&се</translation> + <translation>Виділити в&се</translation> </message> <message> <source>Select All "%1"</source> - <translation type="unfinished"></translation> + <translation>Виділити все "%1"</translation> </message> <message> <source>Toggle Full Screen</source> @@ -18279,15 +18240,15 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>Projects</source> - <translation type="unfinished">Проекти</translation> + <translation>Проекти</translation> </message> <message> <source>File System</source> - <translation type="unfinished">Файлова система</translation> + <translation>Файлова система</translation> </message> <message> <source>Open Documents</source> - <translation type="unfinished">Відкрити документи</translation> + <translation>Відкриті документи</translation> </message> <message> <source>Qt Quick emulation layer crashed</source> @@ -18302,7 +18263,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>%3 (%1:%2)</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Internal error (%1)</source> @@ -18320,7 +18281,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <name>QmlDesigner::Internal::SettingsPage</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Snapping</source> @@ -18344,18 +18305,18 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>Width</source> - <translation type="unfinished"></translation> + <translation>Ширина</translation> </message> <message> <source>Height</source> - <translation type="unfinished"></translation> + <translation>Висота</translation> </message> </context> <context> <name>QmlDesigner::InvalidArgumentException</name> <message> <source>Failed to create item of type %1</source> - <translation type="unfinished"></translation> + <translation>Збій створення елемента типу %1</translation> </message> </context> <context> @@ -18363,7 +18324,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <message> <source>Library</source> <comment>Title of library view</comment> - <translation type="unfinished">Бібліотека</translation> + <translation>Бібліотека</translation> </message> <message> <source>Items</source> @@ -18373,7 +18334,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <message> <source>Resources</source> <comment>Title of library resources view</comment> - <translation type="unfinished">Ресурси</translation> + <translation>Ресурси</translation> </message> <message> <source><Filter></source> @@ -18492,7 +18453,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>Warning</source> - <translation type="unfinished">Попередження</translation> + <translation>Попередження</translation> </message> <message> <source>Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?</source> @@ -18553,7 +18514,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <name>QmlDesigner::PropertyEditor</name> <message> <source>Properties</source> - <translation type="unfinished">Властивості</translation> + <translation>Властивості</translation> </message> <message> <source>Invalid Id</source> @@ -18644,11 +18605,11 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <name>QmlDesigner::XUIFileDialog</name> <message> <source>Open File</source> - <translation type="unfinished">Відкрити файл</translation> + <translation>Відкрити файл</translation> </message> <message> <source>Save File</source> - <translation type="unfinished">Зберегти файл</translation> + <translation>Зберегти файл</translation> </message> <message> <source>Declarative UI files (*.qml)</source> @@ -18656,7 +18617,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>All files (*)</source> - <translation type="unfinished">Всі файли (*)</translation> + <translation>Всі файли (*)</translation> </message> </context> <context> @@ -18738,11 +18699,11 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>not a valid url</source> - <translation type="unfinished"></translation> + <translation>неправильний url</translation> </message> <message> <source>file or directory does not exist</source> - <translation type="unfinished"></translation> + <translation>файл або тека не існує</translation> </message> <message> <source>not a valid color</source> @@ -18754,39 +18715,39 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>unreachable</source> - <translation type="unfinished"></translation> + <translation>недосяжне</translation> </message> <message> <source>declarations should be at the start of a function</source> - <translation type="unfinished"></translation> + <translation>оголошення повинні бути на початку функції</translation> </message> <message> <source>already a formal parameter</source> - <translation type="unfinished"></translation> + <translation>вже є формальним параметром</translation> </message> <message> <source>already declared as function</source> - <translation type="unfinished"></translation> + <translation>вже оголошено як функцію</translation> </message> <message> <source>duplicate declaration</source> - <translation type="unfinished"></translation> + <translation>повторне оголошення</translation> </message> <message> <source>variable is used before being declared</source> - <translation type="unfinished"></translation> + <translation>змінна використовується до оголошення</translation> </message> <message> <source>already declared as var</source> - <translation type="unfinished"></translation> + <translation>вже оголошено як змінну</translation> </message> <message> <source>function is used before being declared</source> - <translation type="unfinished"></translation> + <translation>функція використовується до оголошення</translation> </message> <message> <source>properties can only be assigned once</source> - <translation type="unfinished"></translation> + <translation>властивості можуть бути встановленні лише один раз</translation> </message> <message> <source>unknown type</source> @@ -18794,15 +18755,15 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>could not resolve the prototype %1 of %2</source> - <translation type="unfinished"></translation> + <translation>не вдалось розв'язати прототип %1 класу %2</translation> </message> <message> <source>could not resolve the prototype of %1</source> - <translation type="unfinished"></translation> + <translation>не вдалось розв'язати прототип %1</translation> </message> <message> <source>prototype cycle, the last non-repeated object is %1</source> - <translation type="unfinished"></translation> + <translation>зацикленість прототипів, останні не повторений об'єкт %1</translation> </message> <message> <source>expected id</source> @@ -18814,75 +18775,75 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< </message> <message> <source>ids must be lower case or start with underscore</source> - <translation type="unfinished"></translation> + <translation>id має бути в нижньому регістрі або починатись з підкреслення</translation> </message> <message> <source>ids must be unique</source> - <translation type="unfinished"></translation> + <translation>id має бути унікальним</translation> </message> <message> <source>'%1' is not a valid property type</source> - <translation type="unfinished"></translation> + <translation>'%1' не є правильним типом властивості</translation> </message> <message> <source>unknown identifier</source> - <translation type="unfinished"></translation> + <translation>невідомий ідентифікатор</translation> </message> <message> <source>could not resolve</source> - <translation type="unfinished"></translation> + <translation>не вдалось розв'язати</translation> </message> <message> <source>does not have members</source> - <translation type="unfinished"></translation> + <translation>не має членів</translation> </message> <message> <source>unknown member</source> - <translation type="unfinished"></translation> + <translation>невідомий член</translation> </message> <message> <source>== and != perform type coercion, use === or !== instead to avoid</source> - <translation type="unfinished"></translation> + <translation>== та != здійснють примусове перетворення типів, щоб уникнути цього використовуйте === або !==</translation> </message> <message> <source>blocks do not introduce a new scope, avoid</source> - <translation type="unfinished"></translation> + <translation>блоки не впроваджують нової області видимості, уникайте</translation> </message> <message> <source>unintentional empty block, use ({}) for empty object literal</source> - <translation type="unfinished"></translation> + <translation>ненавмисний порожній блок, використовуйте ({}) для порожнього літерала об'єкта</translation> </message> <message> <source>use of the with statement is not recommended, use a var instead</source> - <translation type="unfinished"></translation> + <translation>використання оператора with не рекомендується, слід використати var</translation> </message> <message> <source>use of void is usually confusing and not recommended</source> - <translation type="unfinished"></translation> + <translation>використання void зазвичай заплутує і не рекомендується</translation> </message> <message> <source>avoid comma expressions</source> - <translation type="unfinished"></translation> + <translation>уникайте виразів з комою</translation> </message> <message> <source>expression statements should be assignments, calls or delete expressions only</source> - <translation type="unfinished"></translation> + <translation>виразами повинні бути лише присвоєнні, виклики та видалення</translation> </message> <message> <source>'new' should only be used with functions that start with an uppercase letter</source> - <translation type="unfinished"></translation> + <translation>'new' повинен використовуватись з функціями, що починаються з великої літери</translation> </message> <message> <source>calls of functions that start with an uppercase letter should use 'new'</source> - <translation type="unfinished"></translation> + <translation>виклики функції, що починаються з великої літери, повинні використовувати 'new'</translation> </message> <message> <source>avoid assignments in conditions</source> - <translation type="unfinished"></translation> + <translation>уникайте присвоєнь в умовах</translation> </message> <message> <source>case is not terminated and not empty</source> - <translation type="unfinished"></translation> + <translation>case не завершений і не порожній</translation> </message> <message> <source>'%1' is not a valid property name</source> @@ -18901,7 +18862,7 @@ If you choose not to continue Qt Creator will not try to load the .shared file.< <name>QmlJS::Link</name> <message> <source>file or directory not found</source> - <translation type="unfinished">файл чи тека не знайдена</translation> + <translation>файл чи тека не знайдені</translation> </message> <message> <source>QML module not found @@ -18911,11 +18872,17 @@ Import paths: For qmake projects, use the QML_IMPORT_PATH variable to add import paths. For qmlproject projects, use the importPaths property to add import paths.</source> - <translation type="unfinished"></translation> + <translation>Модуль QML не знайдено + +Шляхи імпорту: +%1 + +Для проектів qmake, використовуйте змінну QML_IMPORT_PATH, щоб додати шляхи імпорту. +Для проектів qmlproject, використовуйте властивість importPaths, щоб додати шляхи імпорту.</translation> </message> <message> <source>QML module contains C++ plugins, currently reading type information...</source> - <translation type="unfinished"></translation> + <translation>Модуль QML містить додатки C++, триває читання інформації про типи...</translation> </message> </context> <context> @@ -18923,12 +18890,14 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <message> <source>Errors while loading qmltypes from %1: %2</source> - <translation type="unfinished"></translation> + <translation>Помилки під час завантаження типів QML з %1: +%2</translation> </message> <message> <source>Warnings while loading qmltypes from %1: %2</source> - <translation type="unfinished"></translation> + <translation>Попередження під час завантаження типів QML з %1: +%2</translation> </message> </context> <context> @@ -18957,7 +18926,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>Searching</source> - <translation type="unfinished">Пошук</translation> + <translation>Пошук</translation> </message> </context> <context> @@ -19010,23 +18979,23 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>Follow Symbol Under Cursor</source> - <translation type="unfinished">Йти за символом під курсором</translation> + <translation>Йти за символом під курсором</translation> </message> <message> <source>Find Usages</source> - <translation type="unfinished">Знайти вживання</translation> + <translation>Знайти вживання</translation> </message> <message> <source>Ctrl+Shift+U</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Rename Symbol Under Cursor</source> - <translation type="unfinished">Перейменувати символ під курсором</translation> + <translation>Перейменувати символ під курсором</translation> </message> <message> <source>Ctrl+Shift+R</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Run Checks</source> @@ -19034,7 +19003,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>Ctrl+Shift+C</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Show Qt Quick Toolbar</source> @@ -19042,7 +19011,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>QML</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>QML Analysis</source> @@ -19053,18 +19022,18 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <name>QmlJSEditor::Internal::QmlJSOutlineTreeView</name> <message> <source>Expand All</source> - <translation type="unfinished">Розгорнути все</translation> + <translation>Розгорнути все</translation> </message> <message> <source>Collapse All</source> - <translation type="unfinished">Згорнути все</translation> + <translation>Згорнути все</translation> </message> </context> <context> <name>QmlJSEditor::Internal::QmlJSOutlineWidget</name> <message> <source>Show All Bindings</source> - <translation type="unfinished"></translation> + <translation>Показати усі прив'язки</translation> </message> </context> <context> @@ -19090,7 +19059,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <name>QmlJSEditor::Internal::QuickToolBarSettingsPage</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Qt Quick ToolBar</source> @@ -19128,7 +19097,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>Unused variable</source> - <translation type="unfinished">Невикористана змінна</translation> + <translation>Невикористана змінна</translation> </message> <message> <source>Refactoring</source> @@ -19222,11 +19191,11 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>Select</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Вибрати</translation> </message> <message> <source>Zoom</source> - <translation type="unfinished">Масштаб</translation> + <translation>Масштаб</translation> </message> <message> <source>Color Picker</source> @@ -19234,23 +19203,23 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> <message> <source>1x</source> - <translation type="unfinished">1x</translation> + <translation>1x</translation> </message> <message> <source>0.5x</source> - <translation type="unfinished">0.5x</translation> + <translation>0.5x</translation> </message> <message> <source>0.25x</source> - <translation type="unfinished">0.25x</translation> + <translation>0.25x</translation> </message> <message> <source>0.125x</source> - <translation type="unfinished">0.125x</translation> + <translation>0.125x</translation> </message> <message> <source>0.1x</source> - <translation type="unfinished">0.1x</translation> + <translation>0.1x</translation> </message> </context> <context> @@ -19264,17 +19233,17 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <name>QmlJSTools</name> <message> <source>Code Style</source> - <translation type="unfinished">Стиль коду</translation> + <translation>Стиль коду</translation> </message> <message> <source>Qt Quick</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> <name>QmlJSTools::Internal::FunctionFilter</name> <message> - <source>Methods and functions</source> + <source>Methods and Functions</source> <translation>Методи та функції</translation> </message> </context> @@ -19333,7 +19302,7 @@ Error: %2</source> <name>QmlJSTools::Internal::QmlJSToolsPlugin</name> <message> <source>&QML/JS</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Reset Code Model</source> @@ -19345,38 +19314,42 @@ Error: %2</source> <message> <source>Global</source> <comment>Settings</comment> - <translation type="unfinished">Глобальні</translation> + <translation>Глобальні</translation> </message> <message> <source>Qt</source> - <translation type="unfinished"></translation> + <translation></translation> + </message> + <message> + <source>Old Creator</source> + <translation>Старий Creator</translation> </message> </context> <context> <name>QmlJsDebugClient::QmlProfilerEventList</name> <message> <source><bytecode></source> - <translation type="unfinished"></translation> + <translation><байт-код></translation> </message> <message> <source>Source code not available</source> - <translation type="unfinished"></translation> + <translation>Початковий код не доступний</translation> </message> <message> <source>No data to save</source> - <translation type="unfinished"></translation> + <translation>Немає даних для збереження</translation> </message> <message> <source>Could not open %1 for writing</source> - <translation type="unfinished"></translation> + <translation>Не вдалось відкрити %1 для запису</translation> </message> <message> <source>Could not open %1 for reading</source> - <translation type="unfinished"></translation> + <translation>Не вдалось відкрити %1 для читання</translation> </message> <message> <source>Error while parsing %1</source> - <translation type="unfinished"></translation> + <translation>Помилка під час розбору %1</translation> </message> </context> <context> @@ -19417,11 +19390,11 @@ Error: %2</source> </message> <message> <source>Unterminated regular expression backslash sequence</source> - <translation type="unfinished"></translation> + <translation>Незавершена екранована послідовність в регулярному виразі</translation> </message> <message> <source>Unterminated regular expression class</source> - <translation type="unfinished"></translation> + <translation>Незавершений клас регулярного виразу</translation> </message> <message> <source>Syntax error</source> @@ -19444,15 +19417,15 @@ Error: %2</source> </message> <message> <source>&Host:</source> - <translation type="unfinished">&Вузол:</translation> + <translation>&Вузол:</translation> </message> <message> <source>localhost</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>&Порт:</translation> </message> </context> <context> @@ -19469,22 +19442,23 @@ Error: %2</source> <message> <source>The port seems to be in use.</source> <extracomment>Error message shown after 'Could not connect ... debugger:"</extracomment> - <translation type="unfinished"></translation> + <translation>Здається, порт вже використовується.</translation> </message> <message> <source>The application is not set up for QML/JS debugging.</source> <extracomment>Error message shown after 'Could not connect ... debugger:"</extracomment> - <translation type="unfinished"></translation> + <translation>Програму не налаштовано для зневадження QML/JS.</translation> </message> <message> <source>Qt Creator</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Could not connect to the in-process QML debugger: %1</source> <extracomment>%1 is detailed error message</extracomment> - <translation type="unfinished"></translation> + <translation>Не вдалось підключитись до вбудованого в процес зневаджувача QML: +%1</translation> </message> <message> <source>QML Profiler</source> @@ -19495,11 +19469,11 @@ Error: %2</source> <name>QmlProfiler::Internal::QmlProfilerEventsView</name> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>Type</source> - <translation type="unfinished">Тип</translation> + <translation>Тип</translation> </message> <message> <source>Time in Percent</source> @@ -19531,7 +19505,7 @@ Error: %2</source> </message> <message> <source>Details</source> - <translation type="unfinished">Деталі</translation> + <translation>Деталі</translation> </message> <message> <source>Paint</source> @@ -19539,7 +19513,7 @@ Error: %2</source> </message> <message> <source>Compile</source> - <translation type="unfinished">Компіляція</translation> + <translation>Компіляція</translation> </message> <message> <source>Create</source> @@ -19691,7 +19665,7 @@ Do you want to retry?</source> <name>QmlProjectManager::Internal::Manager</name> <message> <source>Failed opening project '%1': Project already open</source> - <translation type="unfinished">Збій відкриття проекту '%1': Проект вже відкритий</translation> + <translation>Збій відкриття проекту '%1': Проект вже відкритий</translation> </message> <message> <source>Failed opening project '%1': Project file is not a file</source> @@ -19705,7 +19679,7 @@ Do you want to retry?</source> <translation type="unfinished"></translation> </message> <message> - <source>Creates a Qt Quick UI project with a single QML file that contains the main view. + <source>Creates a Qt Quick UI project with a single QML file that contains the main view. You can review Qt Quick UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.</source> <translation type="unfinished"></translation> @@ -19737,11 +19711,11 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the </message> <message> <source>Qt version:</source> - <translation type="unfinished">Версія Qt:</translation> + <translation>Версія Qt:</translation> </message> <message> <source>Arguments:</source> - <translation type="unfinished">Аргументи:</translation> + <translation>Аргументи:</translation> </message> <message> <source>Main QML file:</source> @@ -19749,19 +19723,19 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the </message> <message> <source>Debugger:</source> - <translation type="unfinished">Зневаджувач:</translation> + <translation>Зневаджувач:</translation> </message> <message> <source>Run Environment</source> - <translation type="unfinished">Середовище виконання</translation> + <translation>Середовище виконання</translation> </message> <message> <source>System Environment</source> - <translation type="unfinished">Системне середовище</translation> + <translation>Системне середовище</translation> </message> <message> <source>Invalid Qt version</source> - <translation type="unfinished">Неправильна версія Qt</translation> + <translation>Неправильна версія Qt</translation> </message> </context> <context> @@ -19769,20 +19743,21 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the <message> <source>Starting %1 %2 </source> - <translation type="unfinished"></translation> + <translation>Запуск %1 %2 +</translation> </message> <message> <source>%1 exited with code %2 </source> <translation type="unfinished">%1 завершився з кодом %2 - {1 ?}</translation> +</translation> </message> </context> <context> <name>QmlProjectManager::Internal::QmlProjectRunControlFactory</name> <message> <source>Run</source> - <translation type="unfinished"></translation> + <translation>Виконати</translation> </message> </context> <context> @@ -19800,7 +19775,7 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the <name>QmlProjectManager::QmlProjectPlugin</name> <message> <source>Open Qt4 Options</source> - <translation type="unfinished">Відкрити опції Qt4</translation> + <translation>Відкрити опції Qt4</translation> </message> <message> <source>QML Observer Missing</source> @@ -19824,7 +19799,7 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the <message> <source>QML Viewer</source> <comment>QMLRunConfiguration display name.</comment> - <translation type="unfinished">Переглядач QML</translation> + <translation>Переглядач QML</translation> </message> </context> <context> @@ -20432,7 +20407,7 @@ You can build the application and deploy it on desktop and mobile target platfor <name>Qt4ProjectManager::Internal::Html5AppWizardOptionsPage</name> <message> <source>Select HTML File</source> - <translation type="unfinished"></translation> + <translation>Виберіть файл HTML</translation> </message> </context> <context> @@ -20597,8 +20572,8 @@ Adds the library and include paths to the .pro file.</source> <translation>Бібліотека C++</translation> </message> <message> - <source>Creates a C++ library based on qmake. This can be used to create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul>.</source> - <translation>Створює бібліотеку C++ за допомогою qmake. Може використовуватись, щоб створити <ul><li>динамічну бібліотеку C++ для використання з <tt>QPluginLoader</tt> та під час виконання (додаток)</li><li>динамічну або статичну бібліотеку C++ для використання з іншим проектом під час компонування</li></ul>.</translation> + <source>Creates a C++ library based on qmake. This can be used to create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul></source> + <translation>Створює бібліотеку C++ за допомогою qmake. Може використовуватись, щоб створити:<ul><li>динамічну бібліотеку C++ для використання з <tt>QPluginLoader</tt> та під час виконання (додаток)</li><li>динамічну або статичну бібліотеку C++ для використання з іншим проектом під час компонування</li></ul></translation> </message> </context> <context> @@ -20712,10 +20687,6 @@ Adds the library and include paths to the .pro file.</source> <translation>Версія Qt:</translation> </message> <message> - <source>Manage</source> - <translation>Управління</translation> - </message> - <message> <source>Tool chain:</source> <translation>Набір інструментів:</translation> </message> @@ -20795,6 +20766,10 @@ Adds the library and include paths to the .pro file.</source> <extracomment>Name of a release build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.</extracomment> <translation></translation> </message> + <message> + <source>Manage...</source> + <translation>Управління...</translation> + </message> </context> <context> <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name> @@ -20921,7 +20896,7 @@ Adds the library and include paths to the .pro file.</source> </message> <message> <source><b>IP address:</b> %1:%2</source> - <translation type="unfinished"></translation> + <translation><b>IP адреса:</b> %1:%2</translation> </message> </context> <context> @@ -20980,7 +20955,7 @@ Adds the library and include paths to the .pro file.</source> <message> <source>Creates a Qt Quick application project that can contain both QML and C++ code and includes a QDeclarativeView. -You can build the application and deploy it on desktop and mobile target platforms. For example, you can create signed Symbian Installation System (SIS) packages for this type of projects. Moreover, you can select to use a set of premade UI components in your Qt Quick application. To utilize the components, Qt 4.7.3 or newer is required.</source> +You can build the application and deploy it on desktop and mobile target platforms. For example, you can create signed Symbian Installation System (SIS) packages for this type of projects. Moreover, you can select to use a set of premade UI components in your Qt Quick application. To utilize the components, Qt 4.7.4 or newer is required.</source> <translation type="unfinished"></translation> </message> </context> @@ -21018,19 +20993,19 @@ You can build the application and deploy it on desktop and mobile target platfor </message> <message> <source>ARM &version:</source> - <translation type="unfinished"></translation> + <translation>&Версія ARM:</translation> </message> <message> <source>Version 5</source> - <translation type="unfinished"></translation> + <translation>Версія 5</translation> </message> <message> <source>Version 6</source> - <translation type="unfinished"></translation> + <translation>Версія 6</translation> </message> <message> <source>&Compiler path:</source> - <translation type="unfinished"></translation> + <translation>Шлях до &компілятора:</translation> </message> <message> <source>Environment Variables</source> @@ -21119,7 +21094,7 @@ Valid from: %2.</source> <message> <source>Running %1</source> <extracomment>%1 is a name of the Publish Step i.e. Clean Step</extracomment> - <translation type="unfinished"></translation> + <translation>Виконується %1</translation> </message> </context> <context> @@ -21189,15 +21164,15 @@ Use a developer certificate or any other signing option to prevent this patching </message> <message> <source>The process "%1" exited normally.</source> - <translation type="unfinished">Процес "%1" завершився нормально.</translation> + <translation>Процес "%1" завершився нормально.</translation> </message> <message> <source>The process "%1" exited with code %2.</source> - <translation type="unfinished">Процес "%1" завершився з кодом %2.</translation> + <translation>Процес "%1" завершився з кодом %2.</translation> </message> <message> <source>The process "%1" crashed.</source> - <translation type="unfinished">Процес "%1" завершився аварійно.</translation> + <translation>Процес "%1" завершився аварійно.</translation> </message> <message> <source>Could not start process "%1" in %2</source> @@ -21298,7 +21273,7 @@ Use a developer certificate or any other signing option to prevent this patching <name>Qt4ProjectManager::Internal::S60DeployConfigurationWidget</name> <message> <source>Device:</source> - <translation type="unfinished">Пристрій:</translation> + <translation>Пристрій:</translation> </message> <message> <source>Silent installation</source> @@ -21334,7 +21309,7 @@ Use a developer certificate or any other signing option to prevent this patching </message> <message> <source>Address:</source> - <translation type="unfinished">Адреса:</translation> + <translation>Адреса:</translation> </message> <message> <source>Connecting</source> @@ -21354,7 +21329,7 @@ Use a developer certificate or any other signing option to prevent this patching </message> <message> <source>Qt version: </source> - <translation type="unfinished"></translation> + <translation>Версія Qt:</translation> </message> <message> <source>Not installed on device</source> @@ -21362,7 +21337,7 @@ Use a developer certificate or any other signing option to prevent this patching </message> <message> <source>Qt version:</source> - <translation type="unfinished">Версія Qt:</translation> + <translation>Версія Qt:</translation> </message> <message> <source>Unrecognised Symbian version 0x%1</source> @@ -21611,11 +21586,11 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e </message> <message> <source>The .pro file is currently being parsed.</source> - <translation type="unfinished">Здійснюється розбір файлу .pro.</translation> + <translation>Здійснюється розбір файлу .pro.</translation> </message> <message> <source>The .pro file could not be parsed.</source> - <translation type="unfinished">Не вдалось розібрати файл .pro.</translation> + <translation>Не вдалось розібрати файл .pro.</translation> </message> </context> <context> @@ -21637,7 +21612,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e <message> <source>Starting %1... </source> - <translation type="unfinished">Запуск %1...</translation> + <translation>Запуск %1...</translation> </message> <message> <source>[Qt Message]</source> @@ -21646,8 +21621,8 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e <message> <source>%1 exited with code %2 </source> - <translation type="unfinished">%1 завершився з кодом %2 - {1 ?}</translation> + <translation>%1 завершився з кодом %2 +</translation> </message> </context> <context> @@ -21669,7 +21644,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e </message> <message> <source>qmake</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Build</source> @@ -21730,7 +21705,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e </message> <message> <source>Close</source> - <translation type="unfinished">Закрити</translation> + <translation>Закрити</translation> </message> </context> <context> @@ -22119,10 +22094,6 @@ Your application will also be rejected by Ovi QA if you choose an unreleased Qt <translation>Увімкнути зневадження QML:</translation> </message> <message> - <source>Link QML debugging library:</source> - <translation>Скомпонувати бібліотеку зневадження QML:</translation> - </message> - <message> <source>Might make your application vulnerable. Only use in a safe environment.</source> <translation>Може зробити вашу програму уразливою. Використовуйте лише в безпечному оточенні.</translation> </message> @@ -22139,11 +22110,11 @@ Your application will also be rejected by Ovi QA if you choose an unreleased Qt </message> <message> <source>QML Debugging</source> - <translation type="unfinished">Зневадження QML</translation> + <translation>Зневадження QML</translation> </message> <message> <source>The target directory %1 could not be created.</source> - <translation type="unfinished">Не вдалось створити цільову теку %1.</translation> + <translation>Не вдалось створити цільову теку %1.</translation> </message> <message> <source>QML Debugging library could not be built in any of the directories: @@ -22518,11 +22489,11 @@ Reason: %2</source> </message> <message> <source>The .pro file is currently being parsed.</source> - <translation type="unfinished">Здійснюється розбір файлу .pro.</translation> + <translation>Здійснюється розбір файлу .pro.</translation> </message> <message> <source>The .pro file could not be parsed.</source> - <translation type="unfinished">Не вдалось розібрати файл .pro.</translation> + <translation>Не вдалось розібрати файл .pro.</translation> </message> </context> <context> @@ -22536,7 +22507,7 @@ Reason: %2</source> <name>Qt4ProjectManager::S60RunControlBase</name> <message> <source>Launching</source> - <translation type="unfinished">Запуск</translation> + <translation>Запуск</translation> </message> <message> <source>Please finalise the installation on your device. @@ -22549,15 +22520,15 @@ Reason: %2</source> </message> <message> <source>Application Still Running</source> - <translation type="unfinished">Програма ще виконується</translation> + <translation>Програма ще виконується</translation> </message> <message> <source>Force Quit</source> - <translation type="unfinished">Примусовий вихід</translation> + <translation>Примусовий вихід</translation> </message> <message> <source>Keep Running</source> - <translation type="unfinished">Продовжувати виконання</translation> + <translation>Продовжувати виконання</translation> </message> <message> <source>Finished. @@ -22706,12 +22677,6 @@ Requires Qt 4.7.1 or newer.</source> <translation type="unfinished"></translation> </message> <message> - <source>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform. - -Requires Qt 4.7.3 or newer, and the component set installed for your Qt version.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>All files and directories that reside in the same directory as the main QML file are deployed. You can modify the contents of the directory any time before deploying.</source> <translation type="unfinished"></translation> </message> @@ -22725,6 +22690,12 @@ Requires Qt 4.7.3 or newer, and the component set installed for your Qt version. Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</source> <translation type="unfinished"></translation> </message> + <message> + <source>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform. + +Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtSupport::Internal::DebuggingHelper</name> @@ -22773,10 +22744,6 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. <translation>Показати журнал</translation> </message> <message> - <source>Compile debugging helpers that are checked.</source> - <translation>Скомпілювати відмічені помічники зневадження.</translation> - </message> - <message> <source>Build All</source> <translation>Зібрати все</translation> </message> @@ -23077,15 +23044,15 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. <name>RangeDetails</name> <message> <source>Duration</source> - <translation type="unfinished">Тривалість</translation> + <translation>Тривалість</translation> </message> <message> <source>Details</source> - <translation type="unfinished">Деталі</translation> + <translation>Деталі</translation> </message> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> </context> <context> @@ -23145,7 +23112,7 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. </message> <message> <source>Radius</source> - <translation type="unfinished">Радіус</translation> + <translation>Радіус</translation> </message> <message> <source>Border width</source> @@ -23263,7 +23230,7 @@ Continuing anyway.</source> </message> <message> <source>Could not connect to host: %1</source> - <translation type="unfinished">Не вдалось під'єднатись до вузла: %1</translation> + <translation>Не вдалось під'єднатись до вузла: %1</translation> </message> <message> <source> @@ -23277,7 +23244,7 @@ Is the device connected and set up for network access?</source> </message> <message> <source>Connection error: %1</source> - <translation type="unfinished"></translation> + <translation>Помилка з'єднання: %1</translation> </message> </context> <context> @@ -23303,7 +23270,7 @@ Is the device connected and set up for network access?</source> <name>RemoteLinux::AbstractRemoteLinuxPackageInstaller</name> <message> <source>Connection failure: %1</source> - <translation type="unfinished">Збій з'єднання: %1. {1?}</translation> + <translation>Збій з'єднання: %1</translation> </message> <message> <source>Installing package failed.</source> @@ -23322,7 +23289,7 @@ Is the device connected and set up for network access?</source> </message> <message> <source>Connection failure: %1</source> - <translation type="unfinished">Збій з'єднання: %1. {1?}</translation> + <translation>Збій з'єднання: %1</translation> </message> <message> <source>Error: Remote process failed to start: %1</source> @@ -23367,7 +23334,7 @@ Remote stderr was: %1</source> </message> <message> <source>Package installed.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Пакунок встановлено.</translation> </message> </context> <context> @@ -23431,7 +23398,7 @@ Remote stderr was: %1</source> <name>RemoteLinux::GenericDirectUploadStep</name> <message> <source>Upload files via SFTP</source> - <translation type="unfinished"></translation> + <translation>Завантажити файли через SFTP</translation> </message> </context> <context> @@ -23449,11 +23416,11 @@ Remote stderr was: %1</source> <translation type="unfinished">Тест</translation> </message> <message> - <source>Remote Processes</source> + <source>Remote Processes...</source> <translation type="unfinished"></translation> </message> <message> - <source>Deploy Public Key</source> + <source>Deploy Public Key...</source> <translation type="unfinished"></translation> </message> </context> @@ -23545,7 +23512,7 @@ In addition, device connectivity will be tested.</source> <name>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsPage</name> <message> <source>Device Configurations</source> - <translation type="unfinished"></translation> + <translation>Конфігурації пристроїв</translation> </message> </context> <context> @@ -23600,7 +23567,7 @@ In addition, device connectivity will be tested.</source> </message> <message> <source>Connection failed: %1</source> - <translation type="unfinished">Збій з'єднання: %1</translation> + <translation>Збій з'єднання: %1</translation> </message> <message> <source>SFTP error: %1</source> @@ -23626,7 +23593,7 @@ In addition, device connectivity will be tested.</source> <name>RemoteLinux::Internal::RemoteLinuxEnvironmentReader</name> <message> <source>Connection error: %1</source> - <translation type="unfinished"></translation> + <translation>Помилка з'єднання: %1</translation> </message> <message> <source>Error running remote process: %1</source> @@ -23692,7 +23659,7 @@ Remote stderr was: '%1'</source> <name>RemoteLinux::LinuxDeviceTestDialog</name> <message> <source>Close</source> - <translation type="unfinished">Закрити</translation> + <translation>Закрити</translation> </message> <message> <source>Device test finished successfully.</source> @@ -23727,7 +23694,7 @@ Remote stderr was: '%1'</source> </message> <message> <source>Close</source> - <translation type="unfinished">Закрити</translation> + <translation>Закрити</translation> </message> </context> <context> @@ -23779,7 +23746,7 @@ Remote stderr was: '%1'</source> </message> <message> <source>The .pro file could not be parsed.</source> - <translation type="unfinished">Не вдалось розібрати файл .pro.</translation> + <translation>Не вдалось розібрати файл .pro.</translation> </message> <message> <source>No device configuration set.</source> @@ -23805,11 +23772,11 @@ Remote stderr was: '%1'</source> </message> <message> <source>Clean Environment</source> - <translation type="unfinished">Чисте середовище</translation> + <translation>Чисте середовище</translation> </message> <message> <source>System Environment</source> - <translation type="unfinished">Системне середовище</translation> + <translation>Системне середовище</translation> </message> </context> <context> @@ -23828,7 +23795,7 @@ Remote stderr was: '%1'</source> </message> <message> <source>Device configuration:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Конфігурація пристрою:</translation> </message> <message> <source>Executable on host:</source> @@ -23848,7 +23815,7 @@ Remote stderr was: '%1'</source> </message> <message> <source>Arguments:</source> - <translation type="unfinished">Аргументи:</translation> + <translation>Аргументи:</translation> </message> <message> <source>C++ only</source> @@ -23872,11 +23839,11 @@ Remote stderr was: '%1'</source> </message> <message> <source>Clean Environment</source> - <translation type="unfinished">Чисте середовище</translation> + <translation>Чисте середовище</translation> </message> <message> <source>System Environment</source> - <translation type="unfinished">Системне середовище</translation> + <translation>Системне середовище</translation> </message> <message> <source>Cancel Fetch Operation</source> @@ -23895,7 +23862,7 @@ Remote stderr was: '%1'</source> <name>RemoteLinux::RemoteLinuxUsedPortsGatherer</name> <message> <source>Connection error: %1</source> - <translation type="unfinished"></translation> + <translation>Помилка з'єднання: %1</translation> </message> <message> <source>Could not start remote process: %1</source> @@ -23923,7 +23890,7 @@ Remote error output was: %1</source> </message> <message> <source>Connection failed: %1</source> - <translation type="unfinished">Збій з'єднання: %1</translation> + <translation>Збій з'єднання: %1</translation> </message> <message> <source>Key deployment failed: %1.</source> @@ -23942,7 +23909,7 @@ Remote error output was: %1</source> </message> <message> <source>Connection error: %1</source> - <translation type="unfinished"></translation> + <translation>Помилка з'єднання: %1</translation> </message> <message> <source>Starting gdbserver...</source> @@ -24019,11 +23986,11 @@ Remote error output was: %1</source> <name>RemoteLinuxDeployConfigurationWidget</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Device configuration:</source> - <translation type="unfinished"></translation> + <translation>Конфігурація пристрою:</translation> </message> <message> <source><a href="irrelevant">Manage device configurations</a></source> @@ -24109,7 +24076,7 @@ Remote error output was: %1</source> <name>S60PublishingBuildSettingsPageOvi</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Choose a build configuration:</source> @@ -24136,7 +24103,7 @@ Previous Qt versions have limitations in building suitable SIS files.</source> <name>S60PublishingSisSettingsPageOvi</name> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Global vendor name:</source> @@ -24363,7 +24330,7 @@ Server list was %2.</source> </message> <message> <source>Options</source> - <translation type="unfinished">Опції</translation> + <translation>Опції</translation> </message> <message> <source>Key &size:</source> @@ -24383,7 +24350,7 @@ Server list was %2.</source> </message> <message> <source>Key</source> - <translation type="unfinished"></translation> + <translation>Ключ</translation> </message> <message> <source>&Generate SSH Key</source> @@ -24399,7 +24366,7 @@ Server list was %2.</source> </message> <message> <source>&Close</source> - <translation type="unfinished">&Закрити</translation> + <translation>&Закрити</translation> </message> </context> <context> @@ -24535,7 +24502,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Device:</source> - <translation type="unfinished">Пристрій:</translation> + <translation>Пристрій:</translation> </message> <message> <source>&Filter by process name:</source> @@ -24654,7 +24621,7 @@ with a password, which you can enter below.</source> <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>Specify repository URL, checkout directory and path.</source> @@ -24662,42 +24629,42 @@ with a password, which you can enter below.</source> </message> <message> <source>Repository:</source> - <translation type="unfinished"></translation> + <translation>Сховище:</translation> </message> </context> <context> <name>Subversion::Internal::SettingsPage</name> <message> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation>Конфігурація</translation> </message> <message> <source>Subversion command:</source> - <translation type="unfinished"></translation> + <translation>Команда Subversion:</translation> </message> <message> <source>Authentication</source> - <translation type="unfinished"></translation> + <translation>Авторизація</translation> </message> <message> <source>Username:</source> - <translation type="unfinished"></translation> + <translation>Ім'я користувача:</translation> </message> <message> <source>Password:</source> - <translation type="unfinished">Пароль:</translation> + <translation>Пароль:</translation> </message> <message> <source>Miscellaneous</source> - <translation type="unfinished"></translation> + <translation>Різне</translation> </message> <message> <source>Timeout:</source> - <translation type="unfinished"></translation> + <translation>Час очікування:</translation> </message> <message> <source>s</source> - <translation type="unfinished"></translation> + <translation> с</translation> </message> <message> <source>Prompt on submit</source> @@ -24713,7 +24680,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Subversion</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> @@ -24777,7 +24744,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Add "%1"</source> - <translation type="unfinished"></translation> + <translation>Додати "%1"</translation> </message> <message> <source>Alt+S,Alt+A</source> @@ -24797,11 +24764,11 @@ with a password, which you can enter below.</source> </message> <message> <source>Delete...</source> - <translation type="unfinished"></translation> + <translation>Видалити...</translation> </message> <message> <source>Delete "%1"...</source> - <translation type="unfinished"></translation> + <translation>Видалити "%1"...</translation> </message> <message> <source>Revert...</source> @@ -25030,13 +24997,6 @@ with a password, which you can enter below.</source> </message> </context> <context> - <name>TagBrowser</name> - <message> - <source>Please choose a tag to filter for:</source> - <translation>Будь-ласка, оберіть тег для фільтрування:</translation> - </message> -</context> -<context> <name>TargetSettingsPanelFactory</name> <message> <source>Targets</source> @@ -25339,12 +25299,12 @@ Filter: %2 <translation type="unfinished"></translation> </message> <message> - <source>&Browse</source> - <translation>О&гляд</translation> + <source>&Browse...</source> + <translation>О&гляд...</translation> </message> <message> <source>Fi&le pattern:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Маска файлів:</translation> </message> <message> <source>Directory to search</source> @@ -26475,7 +26435,7 @@ Influences the indentation of continuation lines. <name>TimeDisplay</name> <message> <source>length: %1</source> - <translation type="unfinished"></translation> + <translation>довжина: %1</translation> </message> </context> <context> @@ -27008,8 +26968,12 @@ Influences the indentation of continuation lines. <translation>Термін дії пароля вичерпано.</translation> </message> <message> - <source>Private key error: %1</source> - <translation>Помилка приватного ключа: %1</translation> + <source>No private key file given.</source> + <translation>Файл приватного ключа не надано.</translation> + </message> + <message> + <source>Private key file error: %1</source> + <translation>Помилка файлу приватного ключа: %1</translation> </message> <message> <source>Server rejected password.</source> @@ -27267,7 +27231,7 @@ Influences the indentation of continuation lines. <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Надсилання Subversion</translation> </message> <message> <source>F&iles</source> @@ -27972,7 +27936,7 @@ Influences the indentation of continuation lines. <name>VcsBase::VcsConfigurationPage</name> <message> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Конфігурація</translation> </message> <message> <source>Please configure <b>%1</b> now.</source> @@ -28048,11 +28012,11 @@ Influences the indentation of continuation lines. <name>Valgrind::Callgrind::DataModel</name> <message> <source>Function:</source> - <translation type="unfinished">Функція:</translation> + <translation>Функція:</translation> </message> <message> <source>File:</source> - <translation type="unfinished">Файл:</translation> + <translation>Файл:</translation> </message> <message> <source>Object:</source> @@ -28088,11 +28052,11 @@ Influences the indentation of continuation lines. </message> <message> <source>%1</source> - <translation type="unfinished">%1%2% {1?}</translation> + <translation></translation> </message> <message> <source>(%1%)</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>%1 cost spent in a given function excluding costs from called functions.</source> @@ -28104,11 +28068,11 @@ Influences the indentation of continuation lines. </message> <message> <source>Function</source> - <translation type="unfinished">Функція</translation> + <translation>Функція</translation> </message> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>Called</source> @@ -28186,7 +28150,7 @@ Influences the indentation of continuation lines. </message> <message> <source>Line:</source> - <translation type="unfinished">Рядок:</translation> + <translation>Рядок:</translation> </message> <message> <source>Position:</source> @@ -28440,7 +28404,7 @@ Influences the indentation of continuation lines. <name>Valgrind::Internal::SuppressionDialog</name> <message> <source>Dialog</source> - <translation type="unfinished">Діалог</translation> + <translation>Діалог</translation> </message> <message> <source>Suppression File:</source> @@ -28470,7 +28434,7 @@ Influences the indentation of continuation lines. <name>Valgrind::Internal::ValgrindConfigWidget</name> <message> <source>Generic Settings</source> - <translation type="unfinished"></translation> + <translation>Загальні налаштування</translation> </message> <message> <source>Valgrind executable:</source> @@ -28490,11 +28454,11 @@ Influences the indentation of continuation lines. </message> <message> <source>Add...</source> - <translation type="unfinished">Додати...</translation> + <translation>Додати...</translation> </message> <message> <source>Remove</source> - <translation type="unfinished">Видалити</translation> + <translation>Видалити</translation> </message> <message> <source>Track origins of uninitialized memory</source> @@ -28514,7 +28478,7 @@ Influences the indentation of continuation lines. </message> <message> <source>%</source> - <translation type="unfinished">%</translation> + <translation></translation> </message> <message> <source>Show additional information for events in tooltips</source> @@ -28617,14 +28581,14 @@ With cache simulation, further event counters are enabled: </message> <message> <source>Application Output</source> - <translation type="unfinished">Виведення програми</translation> + <translation>Виведення програми</translation> </message> </context> <context> <name>Valgrind::Internal::ValgrindRunControlFactory</name> <message> <source>Analyzer</source> - <translation type="unfinished">Аналізатор</translation> + <translation>Аналізатор</translation> </message> </context> <context> @@ -28660,11 +28624,11 @@ With cache simulation, further event counters are enabled: <name>Valgrind::XmlProtocol</name> <message> <source>Function:</source> - <translation type="unfinished">Функція:</translation> + <translation>Функція:</translation> </message> <message> <source>Location:</source> - <translation type="unfinished">Розташування:</translation> + <translation>Розташування:</translation> </message> <message> <source>Instruction pointer:</source> @@ -28687,15 +28651,15 @@ With cache simulation, further event counters are enabled: </message> <message> <source>Location</source> - <translation type="unfinished">Розташування</translation> + <translation>Розташування</translation> </message> <message> <source>File</source> - <translation type="unfinished">Файл</translation> + <translation>Файл</translation> </message> <message> <source>Line</source> - <translation type="unfinished">Рядок</translation> + <translation>Рядок</translation> </message> <message> <source>Unique</source> @@ -28703,7 +28667,7 @@ With cache simulation, further event counters are enabled: </message> <message> <source>Thread ID</source> - <translation type="unfinished">ID нитки</translation> + <translation>ID нитки</translation> </message> <message> <source>Kind</source> @@ -28781,7 +28745,7 @@ With cache simulation, further event counters are enabled: <name>Valgrind::XmlProtocol::StackModel</name> <message> <source>Description</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Опис</translation> </message> <message> <source>Instruction Pointer</source> @@ -28793,19 +28757,19 @@ With cache simulation, further event counters are enabled: </message> <message> <source>Function</source> - <translation type="unfinished">Функція</translation> + <translation>Функція</translation> </message> <message> <source>Directory</source> - <translation type="unfinished">Тека</translation> + <translation>Тека</translation> </message> <message> <source>File</source> - <translation type="unfinished">Файл</translation> + <translation>Файл</translation> </message> <message> <source>Line</source> - <translation type="unfinished">Рядок</translation> + <translation>Рядок</translation> </message> </context> <context> @@ -28827,27 +28791,27 @@ With cache simulation, further event counters are enabled: <name>ViewDialog</name> <message> <source>Send to Codepaster</source> - <translation type="unfinished"></translation> + <translation>Надіслати до Codepaster</translation> </message> <message> <source>Protocol:</source> - <translation type="unfinished"></translation> + <translation>Протокол:</translation> </message> <message> <source>&Username:</source> - <translation type="unfinished">&Ім'я користувача:</translation> + <translation>&Ім'я користувача:</translation> </message> <message> <source><Username></source> - <translation type="unfinished"></translation> + <translation><Ім'я користувача></translation> </message> <message> <source>&Description:</source> - <translation type="unfinished"></translation> + <translation>&Опис:</translation> </message> <message> <source><Description></source> - <translation type="unfinished"></translation> + <translation><Опис></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -28855,19 +28819,23 @@ With cache simulation, further event counters are enabled: p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">&lt;Comment&gt;</span></p></body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">&lt;Коментар&gt;</span></p></body></html></translation> </message> <message> <source>Parts to Send to Server</source> - <translation type="unfinished"></translation> + <translation>Частини для надсилання на сервер</translation> </message> <message> <source>Patch 1</source> - <translation type="unfinished"></translation> + <translation>Латка 1</translation> </message> <message> <source>Patch 2</source> - <translation type="unfinished"></translation> + <translation>Латка 2</translation> </message> </context> <context> @@ -28901,11 +28869,11 @@ p, li { white-space: pre-wrap; } <name>WebViewSpecifics</name> <message> <source>WebView</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <source>Url</source> - <translation type="unfinished"></translation> + <source>URL</source> + <translation></translation> </message> <message> <source>Pref Width</source> diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index b6a6d43091..c29f95db40 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -658,7 +658,7 @@ </message> <message> <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source> - <translation>请进入你想构建项目的目录. Qt Creator 建议你不要使用源文件夹构建. 这能确保源文件夹的干净并且可以使用不同设定多次构建.</translation> + <translation>请进入你想构建项目的目录. Qt Creator 建议你不要使用源文件夹构建. 这能确保源文件夹干净，并且可以针对不同设定多次构建.</translation> </message> <message> <source>Build directory:</source> @@ -942,7 +942,7 @@ </message> <message> <source>Use Creator for post-mortem debugging</source> - <translation type="obsolete">使用Creator进行运行后调试</translation> + <translation type="obsolete">使用Creator进行崩溃后调试</translation> </message> <message> <source>GUI Behavior</source> @@ -3953,7 +3953,7 @@ Qt Creator 无法附属到进程.</translation> </message> <message> <source><html><head/><body><p>Use CDB's native console instead of Qt Creator's console for console applications. The native console does not prompt on application exit. It is suitable for diagnosing cases in which the application does not start up properly in Qt Creator's console and the subsequent attach fails.</p></body></html></source> - <translation><html><head/><body><p>使用 CDB的原生控制台来代替Qt Creator的. 原生控制台不提示程序退出. 他适合在Qt Creator没有正确运行的和子进程注入失败的情况.</p></body></html></translation> + <translation><html><head/><body><p>使用 CDB的原生控制台来代替Qt Creator的. 原生控制台不提示程序退出. 适用于调试Qt Creator没有正确运行的和子进程注入失败的情况.</p></body></html></translation> </message> <message> <source>Use CDB &console</source> @@ -7424,6 +7424,10 @@ Reason: %3</source> <translation type="obsolete">退出FakeVim </translation> </message> <message> + <source>Execute User Action #%1</source> + <translation>执行用户操作 #%1</translation> + </message> + <message> <source>File not saved</source> <translation>文件未保存</translation> </message> @@ -9628,7 +9632,7 @@ on slow machines. In this case, the value should be increased.</source> </message> <message> <source>Report Bug...</source> - <translation>汇报错误...</translation> + <translation>报告错误...</translation> </message> <message> <source>Previous</source> @@ -9660,7 +9664,7 @@ on slow machines. In this case, the value should be increased.</source> </message> <message> <source>Report Bug</source> - <translation type="obsolete">错误汇报</translation> + <translation type="obsolete">报告错误</translation> </message> <message> <source>Activate Index in Help mode</source> @@ -14211,7 +14215,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Link QML debugging library:</source> - <translation>连接QML 调试库:</translation> + <translation type="obsolete">连接QML 调试库:</translation> </message> <message> <source>Might make your application vulnerable. Only use in a safe environment.</source> @@ -17605,7 +17609,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Open compiler output pane when building</source> - <translation>编译是打开编译输出窗口</translation> + <translation>编译时打开编译输出窗口</translation> </message> <message> <source>Open application output pane when running</source> @@ -27625,6 +27629,14 @@ We will try to work around that, but you may experience problems.</source> <translation>仅选择有内容的项目 (S)</translation> </message> <message> + <source>width</source> + <translation>宽度</translation> + </message> + <message> + <source>height</source> + <translation>高度</translation> + </message> + <message> <source>Reset view (R)</source> <translation>重置窗口(R)</translation> </message> @@ -27827,11 +27839,11 @@ Id必须以小写字母开头.</translation> </message> <message> <source>Width</source> - <translation>长度</translation> + <translation>宽度</translation> </message> <message> <source>Height</source> - <translation>宽度</translation> + <translation>高度</translation> </message> <message> <source>Lock aspect ratio</source> @@ -33351,7 +33363,7 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Show in Pane</source> - <translation>显示在窗格种</translation> + <translation>显示在窗格中</translation> </message> <message> <source>Replace Selection</source> @@ -34993,7 +35005,7 @@ Specifies how backspace interacts with indentation. </message> <message> <source>Private key error: %1</source> - <translation>私钥错误: %1</translation> + <translation type="obsolete">私钥错误: %1</translation> </message> <message> <source>Password expired.</source> @@ -35023,6 +35035,14 @@ Specifies how backspace interacts with indentation. <source>Timeout waiting for reply from server.</source> <translation>等待Server响应超时.</translation> </message> + <message> + <source>No private key file given.</source> + <translation>未给出私钥文件。</translation> + </message> + <message> + <source>Private key file error: %1</source> + <translation>私钥文件错误: %1</translation> + </message> </context> <context> <name>Valgrind::XmlProtocol::ErrorListModel</name> @@ -40410,19 +40430,19 @@ With cache simulation, further event counters are enabled: </message> <message> <source><html><head/><body><center><i>%1</i> is still running. You have to quit the Analyzer before being able to run another instance.<center/><center>Force it to quit?</center></body></html></source> - <translation><html><head/><body><center><i>%1</i> 仍然在运行. 在运气其他实例前你必须先退出分析器.<center/><center>强行关闭?</center></body></html></translation> + <translation type="obsolete"><html><head/><body><center><i>%1</i> 仍然在运行. 在运行其他实例前你必须先退出分析器.<center/><center>强行关闭?</center></body></html></translation> </message> <message> <source>Analyzer Still Running</source> - <translation>分析器仍然在运行</translation> + <translation type="obsolete">分析器仍然在运行</translation> </message> <message> <source>Stop Active Run</source> - <translation>停止运行中的</translation> + <translation type="obsolete">停止运行中的</translation> </message> <message> <source>Keep Running</source> - <translation>保持运行</translation> + <translation type="obsolete">保持运行</translation> </message> <message> <source>Debug</source> @@ -41015,6 +41035,10 @@ These files are preserved.</source> <source>Qt</source> <translation>Qt</translation> </message> + <message> + <source>Old Creator</source> + <translation>旧的 Creator</translation> + </message> </context> <context> <name>QmlProfiler::Internal::QmlProfilerEngine</name> @@ -47631,7 +47655,7 @@ Filter: %2 </message> <message> <source>Start Updater</source> - <translation>启动</translation> + <translation>启动更新工具</translation> </message> <message> <source>Update</source> diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index c87ca62b46..972f6bce0a 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -57,6 +57,11 @@ MakefileParser::MakefileParser(const QString &makefile) : { } +MakefileParser::~MakefileParser() +{ + delete m_textStream.device(); +} + bool MakefileParser::parse() { m_mutex.lock(); @@ -261,11 +266,11 @@ void MakefileParser::parseSubDirs() + slash + makefileName; // Parse sub directory - QFile *file = new QFile(subDirMakefile); + QFile file(subDirMakefile); // Don't try to parse a file, that might not exist (e. g. // if SUBDIRS specifies a 'po' directory). - if (!file->exists()) + if (!file.exists()) continue; MakefileParser parser(subDirMakefile); @@ -422,15 +427,15 @@ void MakefileParser::parseIncludePaths() QFileInfo info(m_makefile); const QString dirName = info.absolutePath(); - QFile *file = new QFile(dirName + QLatin1String("/Makefile")); - if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) + QFile file(dirName + QLatin1String("/Makefile")); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) return; // TODO: The parsing is done very poor. Comments are ignored and targets // are ignored too. Whether it is worth to improve this, depends on whether // we want to parse the generated Makefile at all or whether we want to // improve the Makefile.am parsing to be aware of variables. - QTextStream textStream(file); + QTextStream textStream(&file); QString line; do { line = textStream.readLine(); diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.h b/src/plugins/autotoolsprojectmanager/makefileparser.h index d943453fec..8038f8c39f 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.h +++ b/src/plugins/autotoolsprojectmanager/makefileparser.h @@ -65,6 +65,8 @@ public: */ MakefileParser(const QString &makefile); + ~MakefileParser(); + /** * Parses the makefile. Must be invoked at least once, otherwise * the getter methods of MakefileParser will return empty values. diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 4d7d88bbc6..d8b6327f12 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -202,7 +202,8 @@ void DisassemblerAgent::resetLocation() return; if (d->resetLocationScheduled) { d->resetLocationScheduled = false; - d->editor->markableInterface()->removeMark(d->locationMark); + if (d->locationMark) + d->editor->markableInterface()->removeMark(d->locationMark); } } diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index f22c01d58e..57f03aad55 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1392,10 +1392,10 @@ void GdbEngine::handleStopResponse(const GdbMi &data) const GdbMi frame = data.findChild("frame"); const int lineNumber = frame.findChild("line").data().toInt(); - QString fullName = QString::fromUtf8(frame.findChild("fullname").data()); + QString fullName = cleanupFullName(QString::fromLocal8Bit(frame.findChild("fullname").data())); if (fullName.isEmpty()) - fullName = QString::fromUtf8(frame.findChild("file").data()); + fullName = QString::fromLocal8Bit(frame.findChild("file").data()); if (rid.isValid() && frame.isValid() && !isQmlStepBreakpoint(rid) @@ -2249,6 +2249,9 @@ void GdbEngine::handleExecuteStep(const GdbResponse &response) } else if (msg.startsWith("Cannot execute this command while the selected thread is running.")) { showExecutionError(QString::fromLocal8Bit(msg)); notifyInferiorRunFailed(); + } else if (msg.startsWith("warning: SuspendThread failed")) { + // On Win: would lead to "PC register is not available" or "\312" + continueInferiorInternal(); } else { showExecutionError(QString::fromLocal8Bit(msg)); notifyInferiorIll(); @@ -4537,7 +4540,7 @@ void GdbEngine::fetchDisassemblerByCliPointMixed(const DisassemblerAgentCookie & { DisassemblerAgentCookie ac = ac0; QTC_ASSERT(ac.agent, return); - postCommand(disassemblerCommand(ac.agent->location(), true), Discardable, + postCommand(disassemblerCommand(ac.agent->location(), true), Discardable|ConsoleCommand, CB(handleFetchDisassemblerByCliPointMixed), QVariant::fromValue(ac)); } @@ -4560,8 +4563,8 @@ void GdbEngine::fetchDisassemblerByCliRangeMixed(const DisassemblerAgentCookie & QByteArray end = QByteArray::number(address + 100, 16); const char sep = m_disassembleUsesComma ? ',' : ' '; QByteArray cmd = "disassemble /m 0x" + start + sep + "0x" + end; - postCommand(cmd, Discardable, CB(handleFetchDisassemblerByCliRangeMixed), - QVariant::fromValue(ac)); + postCommand(cmd, Discardable|ConsoleCommand, + CB(handleFetchDisassemblerByCliRangeMixed), QVariant::fromValue(ac)); } void GdbEngine::fetchDisassemblerByCliRangePlain(const DisassemblerAgentCookie &ac0) @@ -4573,8 +4576,8 @@ void GdbEngine::fetchDisassemblerByCliRangePlain(const DisassemblerAgentCookie & QByteArray end = QByteArray::number(address + 100, 16); const char sep = m_disassembleUsesComma ? ',' : ' '; QByteArray cmd = "disassemble 0x" + start + sep + "0x" + end; - postCommand(cmd, Discardable, CB(handleFetchDisassemblerByCliRangePlain), - QVariant::fromValue(ac)); + postCommand(cmd, Discardable, + CB(handleFetchDisassemblerByCliRangePlain), QVariant::fromValue(ac)); } static DisassemblerLine parseLine(const GdbMi &line) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 97393c43fa..68ceafac3f 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -2209,7 +2209,7 @@ EventResult FakeVimHandler::Private::handleCommandMode1(const Input &input) if (isNoVisualMode()) { m_submode = ShiftLeftSubMode; } else { - shiftRegionLeft(1); + shiftRegionLeft(count()); leaveVisualMode(); } } else if (input.is('>')) { @@ -2217,7 +2217,7 @@ EventResult FakeVimHandler::Private::handleCommandMode1(const Input &input) if (isNoVisualMode()) { m_submode = ShiftRightSubMode; } else { - shiftRegionRight(1); + shiftRegionRight(count()); leaveVisualMode(); } } else if (input.is('=')) { diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index f4c6854eda..7c5e74ecf1 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1119,9 +1119,19 @@ bool BaseQtVersion::queryQMakeVariables(const Utils::FileName &binary, QHash<QSt const QString line = stream.readLine(); const int index = line.indexOf(QLatin1Char(':')); if (index != -1) { + const QString name = line.left(index); const QString value = QDir::fromNativeSeparators(line.mid(index+1)); - if (value != QLatin1String("**Unknown**")) - versionInfo->insert(line.left(index), value); + if (value != QLatin1String("**Unknown**")) { + versionInfo->insert(name, value); + if (name.startsWith(QLatin1String("QT_")) && !name.contains(QLatin1Char('/'))) { + if (name.startsWith(QLatin1String("QT_INSTALL_"))) { + versionInfo->insert(name + QLatin1String("/raw"), value); + versionInfo->insert(name + QLatin1String("/get"), value); + } else if (name.startsWith(QLatin1String("QT_HOST_"))) { + versionInfo->insert(name + QLatin1String("/get"), value); + } + } + } } } return true; diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index d113448ce3..4d493b0ea8 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -113,8 +113,7 @@ void QtOptionsPage::apply() return; m_widget->finish(); - QtVersionManager *vm = QtVersionManager::instance(); - vm->setNewQtVersions(m_widget->versions()); + m_widget->apply(); } bool QtOptionsPage::matches(const QString &s) const @@ -1049,6 +1048,18 @@ void QtOptionsPageWidget::finish() fixQtVersionName(indexForTreeItem(item)); } +void QtOptionsPageWidget::apply() +{ + disconnect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)), + this, SLOT(updateQtVersions(QList<int>,QList<int>,QList<int>))); + + QtVersionManager *vm = QtVersionManager::instance(); + vm->setNewQtVersions(versions()); + + connect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)), + this, SLOT(updateQtVersions(QList<int>,QList<int>,QList<int>))); +} + /* Checks that the qt version name is unique * and otherwise changes the name * diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h index ef854bc57e..499ed77cbb 100644 --- a/src/plugins/qtsupport/qtoptionspage.h +++ b/src/plugins/qtsupport/qtoptionspage.h @@ -68,6 +68,7 @@ public: ~QtOptionsPageWidget(); QList<BaseQtVersion *> versions() const; void finish(); + void apply(); QString searchKeywords() const; virtual bool eventFilter(QObject *o, QEvent *e); diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 7a95a5fe51..1db9a36ca6 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -58,7 +58,7 @@ class QTSUPPORT_EXPORT QtVersionManager : public QObject Q_OBJECT // for getUniqueId(); friend class BaseQtVersion; - friend class Internal::QtOptionsPage; + friend class Internal::QtOptionsPageWidget; public: static QtVersionManager *instance(); QtVersionManager(); diff --git a/src/shared/proparser/profileparser.cpp b/src/shared/proparser/profileparser.cpp index c1aae00d7e..f9dc575967 100644 --- a/src/shared/proparser/profileparser.cpp +++ b/src/shared/proparser/profileparser.cpp @@ -461,7 +461,7 @@ bool ProFileParser::read(ProFile *pro, const QString &in) rtok = tok; while ((c & 0xFF00) || c == '.' || c == '_' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || - (c >= '0' && c <= '9')) { + (c >= '0' && c <= '9') || (c == '/' && term)) { *ptr++ = c; if (++cur == end) { c = 0; diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index ace4f73af2..47de98b215 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -266,8 +266,7 @@ struct SomeType namespace multibp { - // This tests multiple breakpoints. When a - // the b + // This tests multiple breakpoints. template <typename T> class Vector { public: @@ -277,7 +276,8 @@ namespace multibp { BREAK_HERE; // Check size 10 int. // Continue. - // Check there are multiple entries in the Breakpoint vie. + // Manual: Add a breakpoint in the constructor + // Manual: Check there are multiple entries in the Breakpoint view. dummyStatement(this); } ~Vector() { delete [] m_data; } @@ -394,8 +394,6 @@ namespace peekandpoke { void testComplexWatchers() { struct S { int a; double b; } s[10]; - for (int i = 0; i != 10; ++i) - s[i].a = i; BREAK_HERE; // Expand s and s[0]. // CheckType s peekandpoke::S [10]. @@ -405,6 +403,9 @@ namespace peekandpoke { // Manual: Type ['s[%d].a' % i for i in range(5)] // Manual: Expand it, continue stepping. This should result in a list // Manual: of five items containing the .a fields of s[0]..s[4]. + for (int i = 0; i != 10; ++i) + s[i].a = i; + dummyStatement(&s); } @@ -576,9 +577,6 @@ namespace qbytearray { // Check buf1 "î" QByteArray. // Check buf2 "î" QByteArray. // Check buf3 "\ee" QByteArray. - // Check buf1 "î" QByteArray. - // Check buf2 "î" QByteArray. - // Check buf3 "\ee" QByteArray. // CheckType str1 char *. // Continue. dummyStatement(&buf1, &buf2, &buf3); @@ -677,9 +675,10 @@ namespace qdatetime { // Check date.toUTC QDateTime. // Continue. + // Step, check display date = QDateTime::currentDateTime(); - date = date.addSecs(5); - date = date.addSecs(5); + date = date.addDays(5); + date = date.addDays(5); dummyStatement(&date); } @@ -3109,7 +3108,7 @@ namespace stdvector { // Expand v v.0 v.0.x. // Check v <4 items> std::vector<Foo>. // CheckType v.0 Foo. - // Check v.[1].a 1 int. + // Check v.1.a 2 int. // CheckType v.3 Foo. // Continue. dummyStatement(&v); @@ -5988,13 +5987,13 @@ namespace gdb13393 { // Check ptrConst.b 2 int. // CheckType ptrToPtr gdb13393::Derived. // CheckType ptrToPtr.[vptr] . - // Check ptrToPtr.a 1 int. + // Check ptrToPtr.@1.a 1 int. // CheckType ref gdb13393::Derived. // CheckType ref.[vptr] . - // Check ref.a 1 int. + // Check ref.@1.a 1 int. // CheckType refConst gdb13393::Derived. // CheckType refConst.[vptr] . - // Check refConst.a 1 int. + // Check refConst.@1.a 1 int. // CheckType s gdb13393::S. // CheckType s.ptr gdb13393::Derived. // CheckType s.ptrConst gdb13393::Derived. diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index f36ad93d41..a9d7123ab1 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -17,7 +17,9 @@ def openQmakeProject(projectPath, targets=QtQuickConstants.Targets.DESKTOP): selectFromFileDialog(projectPath) try: # handle update generated files dialog - waitForObject("{type='QMessageBox' unnamed='1' visible='1' windowTitle='Update of Generated Files'}", 3000) + waitForObject("{type='QLabel' name='qt_msgbox_label' visible='1' " + "text?='The following files are either outdated or have been modified*' " + "window={type='QMessageBox' unnamed='1' visible='1'}}", 3000) clickButton(waitForObject("{text='Yes' type='QPushButton' unnamed='1' visible='1'}")) except: pass @@ -345,7 +347,10 @@ def validType(sType, userDef): def __closeSubprocessByPushingStop__(sType): ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") - waitForObject(":Qt Creator.Stop_QToolButton", 5000) + try: + waitForObject(":Qt Creator.Stop_QToolButton", 5000) + except: + pass playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False) stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") if stopButton.enabled: diff --git a/tests/system/shared/suites_qtta.py b/tests/system/shared/suites_qtta.py index d435b154e7..a83ea23332 100755 --- a/tests/system/shared/suites_qtta.py +++ b/tests/system/shared/suites_qtta.py @@ -33,3 +33,8 @@ def checkSyntaxError(issuesView, expectedTextsArray, warnIfMoreIssues = True): else: return True return False + +# wait and verify if object exists/not exists +def checkIfObjectExists(name, shouldExist = True, timeout = 3000): + return waitFor("object.exists(name) == shouldExist", timeout) + diff --git a/tests/system/suite_CSUP/envvars b/tests/system/suite_CSUP/envvars new file mode 100644 index 0000000000..00aad3eab7 --- /dev/null +++ b/tests/system/suite_CSUP/envvars @@ -0,0 +1 @@ +QT_PLATFORM_PLUGIN=nonesuch diff --git a/tests/system/suite_CSUP/objects.map b/tests/system/suite_CSUP/objects.map new file mode 100644 index 0000000000..d35b66b20a --- /dev/null +++ b/tests/system/suite_CSUP/objects.map @@ -0,0 +1,17 @@ +:Behavior.Autocomplete common prefix_QCheckBox {container=':CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox' name='partiallyComplete' text='Autocomplete common prefix' type='QCheckBox' visible='1'} +:Behavior.completionTrigger_QComboBox {container=':CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox' name='completionTrigger' type='QComboBox' visible='1'} +:CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox {container=':qt_tabwidget_stackedwidget.CppTools__Internal__CompletionSettingsPage_QWidget' name='groupBox' title='Behavior' type='QGroupBox' visible='1'} +:Next_QPushButton {text~='(Next.*|Continue)' type='QPushButton' visible='1'} +:Options.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} +:Options.qt_tabwidget_stackedwidget_QStackedWidget {name='qt_tabwidget_stackedwidget' type='QStackedWidget' visible='1' window=':Options_Core::Internal::SettingsDialog'} +:Options.qt_tabwidget_tabbar_QTabBar {name='qt_tabwidget_tabbar' type='QTabBar' visible='1' window=':Options_Core::Internal::SettingsDialog'} +:Options_Core::Internal::SettingsDialog {type='Core::Internal::SettingsDialog' unnamed='1' visible='1' windowTitle~='(Options|Preferences)'} +:Options_QListView {type='QListView' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} +:Qt Creator.QtCreator.MenuBar_QMenuBar {name='QtCreator.MenuBar' type='QMenuBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Core::Internal::MainWindow {type='Core::Internal::MainWindow' unnamed='1' visible='1' windowTitle?='*Qt Creator'} +:Qt Creator_CppEditor::Internal::CPPEditorWidget {type='CppEditor::Internal::CPPEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:addToVersionControlComboBox_QComboBox {name='addToVersionControlComboBox' type='QComboBox' visible='1'} +:m_popupFrame_QListView {container=':m_popupFrame_TextEditor::GenericProposalWidget' type='QListView' unnamed='1' visible='1'} +:m_popupFrame_TextEditor::GenericProposalWidget {name='m_popupFrame' type='TextEditor::GenericProposalWidget' visible='1'} +:qt_tabwidget_stackedwidget.CppTools__Internal__CompletionSettingsPage_QWidget {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' name='CppTools__Internal__CompletionSettingsPage' type='QWidget' visible='1'} diff --git a/tests/system/suite_CSUP/suite.conf b/tests/system/suite_CSUP/suite.conf new file mode 100644 index 0000000000..9f50e3f128 --- /dev/null +++ b/tests/system/suite_CSUP/suite.conf @@ -0,0 +1,10 @@ +AUT=qtcreator +CLASS= +CLASSPATH= +ENVVARS=envvars +HOOK_SUB_PROCESSES=false +IMPLICITAUTSTART=0 +LANGUAGE=Python +TEST_CASES=tst_CSUP01 tst_CSUP02 +VERSION=2 +WRAPPERS=Qt diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py new file mode 100644 index 0000000000..8bf70f6982 --- /dev/null +++ b/tests/system/suite_CSUP/tst_CSUP01/test.py @@ -0,0 +1,78 @@ +source("../../shared/suites_qtta.py") +source("../../shared/qtcreator.py") + +# entry of test +def main(): + startApplication("qtcreator" + SettingsPath) + # create qt quick application +# Step 1: Open test .pro project. + createNewQtQuickApplication(tempDir(), "SampleApp") + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") + test.verify(waitForObjectItem(":Qt Creator_Utils::NavigationTreeView", "SampleApp"), + "Step 1: Verifying if: Project is opened.") +# Step 2: Open .cpp file in Edit mode. + doubleClickItem(":Qt Creator_Utils::NavigationTreeView", "SampleApp.Sources.main\\.cpp", 5, 5, 0, Qt.LeftButton) + test.verify(checkIfObjectExists(":Qt Creator_CppEditor::Internal::CPPEditorWidget"), + "Step 2: Verifying if: .cpp file is opened in Edit mode.") +# Step 3: Insert text "re" to new line in Editor mode and press Ctrl+Space. + editorWidget = findObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") + mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton) + type(editorWidget, "<Return>") + type(editorWidget, "<Up>") + type(editorWidget, "re") + if platform.system() == "Darwin": + type(editorWidget, "<Meta+Space>") + else: + type(editorWidget, "<Ctrl+Space>") + waitForObjectItem(":m_popupFrame_QListView", "register") + doubleClickItem(":m_popupFrame_QListView", "register", 5, 5, 0, Qt.LeftButton) + test.verify(str(editorWidget.plainText).startswith("register"), + "Step 3: Verifying if: The list of suggestions is opened. It is " + "possible to select one of the suggestions.") +# Step 4: Insert text "voi" to new line and press Tab. + mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton) + if platform.system() == "Darwin": + type(editorWidget, "<Meta+Shift+Right>") + else: + type(editorWidget, "<Shift+End>") + type(editorWidget, "<Del>") + type(editorWidget, "voi") + waitForObjectItem(":m_popupFrame_QListView", "void") + type(waitForObject(":m_popupFrame_QListView"), "<Tab>") + test.verify(str(editorWidget.plainText).startswith("void"), + "Step 4: Verifying if: Word 'void' is completed because only one option is available.") +# Step 5: From "Tools -> Options -> Text Editor -> Completion" select Activate completion Manually, +# uncheck Autocomplete common prefix and press Apply and then Ok . Return to Edit mode. + invokeMenuItem("Tools", "Options...") + waitForObjectItem(":Options_QListView", "Text Editor") + clickItem(":Options_QListView", "Text Editor", 5, 5, 0, Qt.LeftButton) + clickTab(waitForObject(":Options.qt_tabwidget_tabbar_QTabBar"), "Completion") + clickButton(waitForObject(":Behavior.Autocomplete common prefix_QCheckBox")) + selectFromCombo(":Behavior.completionTrigger_QComboBox", "Manually") + test.verify(object.exists(":Options.OK_QPushButton"), + "Step 5: Verifying if: Code completion preferences can be changed.") + clickButton(waitForObject(":Options.OK_QPushButton")) +# Step 6: Insert text "ret" and press Ctrl+Space. + editorWidget = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") + mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton) + if platform.system() == "Darwin": + type(editorWidget, "<Meta+Shift+Right>") + else: + type(editorWidget, "<Shift+End>") + type(editorWidget, "<Del>") + type(editorWidget, "ret") + if platform.system() == "Darwin": + type(editorWidget, "<Meta+Space>") + else: + type(editorWidget, "<Ctrl+Space>") + waitForObjectItem(":m_popupFrame_QListView", "return") + type(editorWidget, "<Right>") + type(editorWidget, "<Backspace>") + test.verify(str(editorWidget.plainText).startswith("ret#"), + "Step 6: Verifying if: Suggestion is displayed but text is not " + "completed automatically even there is only one suggestion.") + # exit qt creator + invokeMenuItem("File", "Save All") + invokeMenuItem("File", "Exit") +# no cleanup needed, as whole testing directory gets properly removed after test finished + diff --git a/tests/system/suite_CSUP/tst_CSUP02/test.py b/tests/system/suite_CSUP/tst_CSUP02/test.py new file mode 100644 index 0000000000..493b50bf48 --- /dev/null +++ b/tests/system/suite_CSUP/tst_CSUP02/test.py @@ -0,0 +1,55 @@ +source("../../shared/suites_qtta.py") +source("../../shared/qtcreator.py") + +# entry of test +def main(): + startApplication("qtcreator" + SettingsPath) + # create qt quick application +# Step 1: Open test .pro project. + createNewQtQuickApplication(tempDir(), "SampleApp") + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") + test.verify(waitForObjectItem(":Qt Creator_Utils::NavigationTreeView", "SampleApp"), + "Step 1: Verifying if: Project is opened.") +# Step 2: Open .cpp file in Edit mode. + doubleClickItem(":Qt Creator_Utils::NavigationTreeView", "SampleApp.Sources.main\\.cpp", 5, 5, 0, Qt.LeftButton) + test.verify(checkIfObjectExists(":Qt Creator_CppEditor::Internal::CPPEditorWidget"), + "Step 2: Verifying if: .cpp file is opened in Edit mode.") +# Steps 3&4: Insert text "class" to new line in Editor mode and press Ctrl+Space. +# Focus "class derived from QObject" in the list and press Tab or Enter to complete the code. + editorWidget = findObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") + mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton) + type(editorWidget, "<Return>") + type(editorWidget, "<Up>") + type(editorWidget, "class") + if platform.system() == "Darwin": + type(editorWidget, "<Meta+Space>") + else: + type(editorWidget, "<Ctrl+Space>") + type(waitForObject(":m_popupFrame_QListView"), "<Down>") + type(waitForObject(":m_popupFrame_QListView"), "<Down>") + listView = waitForObject(":m_popupFrame_QListView") + test.compare("class derived from QObject", str(listView.model().data(listView.currentIndex())), + "Verifying selecting the correct entry.") + type(waitForObject(":m_popupFrame_QListView"), "<Return>") + test.verify(str(editorWidget.plainText).startswith("class name : public QObject"), + "Steps 3&4: Verifying if: The list of suggestions is opened. It is " + "possible to select one of the suggestions. Code with several " + "variables is inserted.") +# Step 5: Press Tab to move between the variables and specify values for them. For example write "Myname" for variable "name". + type(editorWidget, "<Tab>") + type(editorWidget, "<Tab>") + type(editorWidget, "<Tab>") + type(editorWidget, "Myname") + pattern = "(?<=class)\s+Myname\s*:\s*public\s+QObject\s*\{\s*Q_OBJECT\s+public:\s+Myname\(\)\s*\{\}\s+virtual\s+~Myname\(\)\s*\{\}\s+\};" + result = re.search(pattern, str(editorWidget.plainText)) + if result: + test.passes("Step 5: Verifying if: A value for a variable is inserted and all " + "instances of the variable within the snippet are renamed.") + else: + test.fail("Step 5: Seems that not all instances of variable had been renamed " + "- Content of editor:\n%s" % editorWidget.plainText) + # exit qt creator + invokeMenuItem("File", "Save All") + invokeMenuItem("File", "Exit") +# no cleanup needed, as whole testing directory gets properly removed after test finished + diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py index e0ebaf9445..73a46f61ee 100644 --- a/tests/system/suite_debugger/tst_build_new_project/test.py +++ b/tests/system/suite_debugger/tst_build_new_project/test.py @@ -5,7 +5,7 @@ project = "SquishProject" def main(): startApplication("qtcreator" + SettingsPath) - createProject_Qt_GUI(projectsPath, project) + createProject_Qt_Console(projectsPath, project) for config in iterateBuildConfigs(1, 0): selectBuildConfig(1, 0, config) test.log("Testing build configuration: " + config) |
