diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index e430f35ebde..30dae550023 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -123,7 +123,8 @@ jobs: ) execute_process( COMMAND - sudo apt install libgl1-mesa-dev libvulkan-dev libxcb-xinput-dev libxcb-xinerama0-dev libxkbcommon-dev libxkbcommon-x11-dev + sudo apt install chrpath + libgl1-mesa-dev libvulkan-dev libxcb-xinput-dev libxcb-xinerama0-dev libxkbcommon-dev libxkbcommon-x11-dev libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxcb-randr0 libxcb-icccm4 xvfb RESULT_VARIABLE result @@ -458,31 +459,33 @@ jobs: string(JSON artifacts_length LENGTH "${artifacts_json}" "artifacts") math(EXPR artifacts_length "${artifacts_length} - 1") - foreach(idx RANGE 0 ${artifacts_length}) - string(JSON artifact_js GET "${artifacts_json}" "artifacts" ${idx}) - string(JSON name GET "${artifact_js}" "name") - if ("${name}" STREQUAL "${{ steps.ccache.outputs.archive_name }}") - string(JSON download_url GET "${artifact_js}" "archive_download_url") + if(${artifacts_length} GREATER_EQUAL 0) + foreach(idx RANGE 0 ${artifacts_length}) + string(JSON artifact_js GET "${artifacts_json}" "artifacts" ${idx}) + string(JSON name GET "${artifact_js}" "name") + if ("${name}" STREQUAL "${{ steps.ccache.outputs.archive_name }}") + string(JSON download_url GET "${artifact_js}" "archive_download_url") - foreach(retry RANGE 10) - file(DOWNLOAD "${download_url}" - "${{ steps.ccache.outputs.archive_name }}.zip" - NETRC_FILE "$ENV{GITHUB_WORKSPACE}/netrc.txt" - NETRC REQUIRED - SHOW_PROGRESS) - file(SIZE "${{ steps.ccache.outputs.archive_name }}.zip" fileSize) - if (fileSize GREATER 0) - break() - endif() - endforeach() + foreach(retry RANGE 10) + file(DOWNLOAD "${download_url}" + "${{ steps.ccache.outputs.archive_name }}.zip" + NETRC_FILE "$ENV{GITHUB_WORKSPACE}/netrc.txt" + NETRC REQUIRED + SHOW_PROGRESS) + file(SIZE "${{ steps.ccache.outputs.archive_name }}.zip" fileSize) + if (fileSize GREATER 0) + break() + endif() + endforeach() - execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf "${{ steps.ccache.outputs.archive_name }}.zip") - file(MAKE_DIRECTORY .ccache) - execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "../${{ steps.ccache.outputs.archive_name }}.tar" WORKING_DIRECTORY .ccache) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf "${{ steps.ccache.outputs.archive_name }}.zip") + file(MAKE_DIRECTORY .ccache) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "../${{ steps.ccache.outputs.archive_name }}.tar" WORKING_DIRECTORY .ccache) - return() - endif() - endforeach() + return() + endif() + endforeach() + endif() endforeach() - name: Build @@ -578,6 +581,7 @@ jobs: --add-config=-DIDE_REVISION_URL=https://github.com/$ENV{GITHUB_REPOSITORY}/commits/$ENV{GITHUB_SHA} --zip-infix=-${{ matrix.config.artifact }}-${{ github.run_id }} --no-qbs + --with-cpack RESULT_VARIABLE result COMMAND_ECHO STDOUT OUTPUT_VARIABLE output @@ -665,6 +669,13 @@ jobs: path: build/qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z + - name: Upload Debian package + if: runner.os == 'Linux' + uses: actions/upload-artifact@v3 + with: + path: build/build/qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.deb + name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.deb + - name: Upload disk image if: runner.os == 'macOS' && contains(github.ref, 'tags/v') uses: actions/upload-artifact@v3 @@ -761,6 +772,13 @@ jobs: name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z path: ./ + - name: Download Debian package artifact + if: matrix.config.artifact == 'Linux' + uses: actions/download-artifact@v3 + with: + name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.deb + path: ./ + - name: Download disk image artifact if: matrix.config.artifact == 'macOS' uses: actions/download-artifact@v3 @@ -820,6 +838,17 @@ jobs: asset_name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z asset_content_type: application/x-gtar + - name: Upload Debian package to Release + if: matrix.config.artifact == 'Linux' + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.set_upload_url.outputs.upload_url }} + asset_path: ./qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.deb + asset_name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.deb + asset_content_type: application/x-gtar + - name: Upload disk image to Release if: matrix.config.artifact == 'macOS' uses: actions/upload-release-asset@v1 diff --git a/README.md b/README.md index 14493d1afd1..73963e434ad 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,12 @@ optimizations but debug information with `-DCMAKE_BUILD_TYPE=RelWithDebInfo`. You can find more options in the generated CMakeCache.txt file. For instance, building of Qbs together with Qt Creator can be enabled with `-DBUILD_QBS=ON`. -Installation is not needed. It is however possible, using +Installation is not needed. You can run Qt Creator directly from the build +directory. On Windows, make sure that your `PATH` environment variable points to +all required DLLs, like Qt and LLVM. On Linux and macOS, the build already +contains the necessary `RPATH`s for the dependencies. + +If you want to install Qt Creator anyway, that is however possible using cmake --install . --prefix /path/to/qtcreator_install @@ -157,6 +162,16 @@ like Qt and LLVM, additionally run cmake --install . --prefix /path/to/qtcreator_install --component Dependencies +To install development files like headers, CMake files, and `.lib` files on +Windows, run + + cmake --install . --prefix /path/to/qtcreator_install --component Devel + +If you used the `RelWithDebInfo` configuration and want debug information to be +available to the installed Qt Creator, run + + cmake --install . --prefix /path/to/qtcreator_install --component DebugInfo + ### Perf Profiler Support Support for the [perf](https://perf.wiki.kernel.org/index.php/Main_Page) profiler diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc index 1254040e344..abc780fe195 100644 --- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc +++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc @@ -29,8 +29,8 @@ Profile builds produce optimized binaries with separate debug symbols and should generally be used for profiling. - To manually set up a build configuration to provide separate debug symbols, - edit the project build settings: + To manually set up a build configuration that generates separate debug + symbols, edit the project build settings: \list 1 \li To generate debug symbols also for applications compiled in release @@ -294,7 +294,7 @@ events to move the cursor in the code editor to the part of the code the event is associated with. - As the Perf tool only provides periodic samples, the Performance Analyzer + As the Perf tool only collects periodic samples, the Performance Analyzer cannot determine the exact time when a function was called or when it returned. You can, however, see exactly when a sample was taken in the second row of each thread. The Performance Analyzer assumes that if the same diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc index 673b9096b39..5723591dc90 100644 --- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc +++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc @@ -20,13 +20,13 @@ \list \li \l{https://clang.llvm.org/extra/clang-tidy/}{Clang-Tidy}, which - provides diagnostics and fixes for typical programming errors, + has diagnostics and fixes for typical programming errors, such as style violations or interface misuse. \li \l{https://github.com/KDE/clazy/blob/master/README.md}{Clazy}, which helps Clang understand Qt semantics. It displays Qt related compiler warnings, ranging from unnecessary memory allocation to misuse of - API and provides refactoring actions for fixing some of the issues. + API and has refactoring actions for fixing some of the issues. \endlist @@ -191,8 +191,8 @@ \section2 Selecting Clazy Check Levels The Clazy checks are divided into levels from 0 to 3. The checks at level 0 - are very stable and provide hardly any false positives, while the checks at - level 3 can be considered experimental. You can select the checks to perform + are very stable and show hardly any false positives, while the checks at + level 3 are experimental. You can select the checks to perform at each level. To include the checks from the lower levels automatically, select the \uicontrol {Enable lower levels automatically} check box. diff --git a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc index a3232b5f9f0..a77c8dfe7f9 100644 --- a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc +++ b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc @@ -49,7 +49,7 @@ \li In the \uicontrol {Ignored file patterns} field, enter a filter for ignoring files that match the pattern (wildcard). You can enter multiple patterns separated by commas. Even though Cppcheck is not - run on files that match the provided patterns, they might be + run on files that match the patterns, they might be implicitly checked if other files include them. \li Select the \uicontrol {Inconclusive errors} check box to also mark possible false positives. diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc index 01de0c237d4..a2bf118f3fb 100644 --- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc +++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc @@ -18,13 +18,13 @@ JavaScript down to the C++ and all the way to the kernel space. This enables you to measure the performance of an application and to check whether it is CPU or I/O bound or influenced by other applications - running on the same system. Tracing provides insight into what a system is + running on the same system. Tracing gives insight into what a system is doing and why an application is performing in a particular way. It indicates how the hardware is utilized and what the kernel and application are doing. - Tracing information can also provide you additional insight into the data - collected by \l{Profiling QML Applications}{QML Profiler}. For example, you - could check why a trivial binding evaluation is taking so long. This might + Tracing information can tell you more about the data that + \l{Profiling QML Applications}{QML Profiler} collects. For example, you + can check why a trivial binding evaluation is taking so long. This might be caused by C++ being executed or the disk I/O being slow. Several tracing tools (such as \c {chrome://about}) can generate information @@ -110,7 +110,7 @@ LTTng is a tracing toolkit for Linux that you can apply on embedded Linux systems to find out how to optimize the startup time of an application. - Since Qt 5.13, Qt provides a set of kernel trace points and a tracing + Since Qt 5.13, Qt has a set of kernel trace points and a tracing subsystem for custom user space trace points. \section2 Configuring the Kernel @@ -180,7 +180,7 @@ Scheduler switch trace points are reached when an application is switched out due to predemption, for example, when another process gets the chance - to run on the CPU core. Enable scheduler schwitch trace points to record + to run on the CPU core. Enable scheduler switch trace points to record the thread that is currently running and the process it belongs to, as well as the time when the process started and stopped. diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc index 26594ac7d0d..3fbd2d62285 100644 --- a/doc/qtcreator/src/analyze/creator-heob.qdoc +++ b/doc/qtcreator/src/analyze/creator-heob.qdoc @@ -44,7 +44,7 @@ \image qtcreator-heob.png - Heob raises an access violation on buffer overruns and provides stack traces + Heob raises an access violation on buffer overruns and records stack traces of the offending instruction and buffer allocation. The results are displayed when Heob exits normally. diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc index b24e077594d..2c39ce3e51e 100644 --- a/doc/qtcreator/src/android/androiddev.qdoc +++ b/doc/qtcreator/src/android/androiddev.qdoc @@ -169,9 +169,9 @@ \section2 Managing Android SDK Packages - Since Android SDK Tools version 25.3.0, only a command-line tool, - \l {sdkmanager}, is provided by Android for SDK package management. - To make SDK management easier, \QC provides an SDK Manager for + Since Android SDK Tools version 25.3.0, Android has only a command-line + tool, \l {sdkmanager}, for SDK package management. To make SDK management + easier, \QC has an SDK Manager for installing, updating, and removing SDK packages. You can still use sdkmanager for advanced SDK management. diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc index 48e83da1123..6375140fd8c 100644 --- a/doc/qtcreator/src/android/deploying-android.qdoc +++ b/doc/qtcreator/src/android/deploying-android.qdoc @@ -40,7 +40,7 @@ \section1 Packaging Applications Because bundling applications as APK packages is not - trivial, Qt 5 provides a deployment tool called \c androiddeployqt. + trivial, Qt 5 has a deployment tool called \c androiddeployqt. When you deploy an application using a \e {Qt for Android kit}, \QC uses the \c androiddeployqt tool to create the necessary files and to bundle them into an APK: @@ -51,7 +51,7 @@ that automatically load Qt and execute the native code in your application. - \li AndroidManifest.xml, which provides meta-information about your + \li AndroidManifest.xml, which has meta-information about your application. \li Other XML files, which specify the dependencies of your application. @@ -65,7 +65,7 @@ \li Gradle script that is needed by Java IDEs, such as Android Studio. It allows the user to extend the Java part without copying our Java - sources. It also allows the IDEs to provide code completion, syntax + sources. It also allows the IDEs to offer code completion, syntax highlighting, and so on. \endlist diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc index 559f34693b1..5d943b7ed7f 100644 --- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc +++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc @@ -186,8 +186,7 @@ verbose logging. \li Select the \uicontrol {Extended mode} check box to continue - listening for connection requests after after the connection - is closed. + listening for connection requests after the connection is closed. \li Select the \uicontrol {Reset on connection} check box to reset the board when the connection is created. diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc index 53ac4065900..34e98d8d309 100644 --- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc +++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc @@ -94,7 +94,7 @@ executable. \li The \uicontrol {Help file} field displays the path to the - CMake help file (.qch) provided by and installed with CMake. + CMake help file (.qch) that comes with CMake. \li Deselect the \uicontrol {Autorun CMake} check box if you do not want to automatically run CMake every time when you save changes to diff --git a/doc/qtcreator/src/conan/creator-projects-conan.qdoc b/doc/qtcreator/src/conan/creator-projects-conan.qdoc index 855e2818df7..2076a10f90b 100644 --- a/doc/qtcreator/src/conan/creator-projects-conan.qdoc +++ b/doc/qtcreator/src/conan/creator-projects-conan.qdoc @@ -28,8 +28,8 @@ sources. Because the client has a local cache for package storage, you can work offline, as long as no new packages are needed from remote servers. - To use Conan, install it by using the Qt installer or the tools provided by - your operating system. For example, on Windows, you can use the + To use Conan, install it by using the Qt installer or the tools that + your operating system has. For example, on Windows, you can use the \c {choco install conan} or \c {pip install conan} command. To enable the experimental Conan plugin, select \uicontrol Help > diff --git a/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc index d295676cfcb..ac4a2e4164d 100644 --- a/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc +++ b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc @@ -368,7 +368,7 @@ \uicontrol {Locals} and \uicontrol {Expressions} view to show unexpected data. \row - \li The debug information provided by GCC does not include enough + \li The debug information from GCC does not include enough information about the time when a variable is initialized. Therefore, \QC can not tell whether the contents of a local variable are \e {real data} or \e {initial noise}. If a QObject @@ -385,21 +385,20 @@ \section1 Inspecting Basic Qt Objects - The \uicontrol {Locals} and \uicontrol {Expressions} views also provide access - to the most powerful feature of the debugger: comprehensive display of data - belonging to Qt's basic objects. For example, in case of QObject, instead of - displaying a pointer to some private data structure, you see a list of + The most powerful feature of the debugger is that the \uicontrol {Locals} + and \uicontrol {Expressions} views show the data that belongs to + Qt's basic objects. For example, in case of QObject, instead of + a pointer to some private data structure, you see a list of children, signals, and slots. Similarly, instead of displaying many pointers and integers, \QC's debugger displays the contents of a QHash or QMap in an orderly manner. Also, the - debugger displays access data for QFileInfo and provides access to the - \e real contents of QVariant. + debugger shows access data for QFileInfo and the \e real contents of QVariant. Right-click in the \uicontrol {Locals} or the \uicontrol {Expressions} view - to open a context menu that provides additional options for viewing data. The - available options depend on the type of the current items, and are provided - by the \l{Using Debugging Helpers}{Debugging Helpers}. Typically, + to open a context menu that has more options for viewing data. The + available options depend on the type of the current items, and come from + the \l{Using Debugging Helpers}{Debugging Helpers}. Typically, string-like data, such as \c{QByteArray} and \c{std::string}, offer a selection of encodings, as well as the possibility to use a full editor window. Map-like data, such as \c{QMap}, \c{QHash}, and \c{std::map}, offer diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc index f6e5fedcf6e..0cf94c9f7dd 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc @@ -170,9 +170,8 @@ source code editor, select the \uicontrol {Correct breakpoint location} check box. For more information, see \l{Setting Breakpoints}. - To use the abstraction layer provided by Python Dumper - classes to create a description of data items displayed - in the \uicontrol Locals and \uicontrol Expressions + To use the abstraction layer of Python Dumper classes to create a description + of data items in the \uicontrol Locals and \uicontrol Expressions views, select the \uicontrol {Use Python dumper} check box. For more information, see \l{Debugging Helper Implementation}. @@ -183,7 +182,7 @@ \section2 Setting CDB Paths on Windows To obtain debugging information for the operating system libraries for - debugging Windows applications, add the Symbol Server provided by Microsoft + debugging Windows applications, add the Microsoft Symbol Server to the symbol search path of the debugger: \list 1 diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc index ec607e0f296..ca68d35d377 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc @@ -37,14 +37,14 @@ \uicontrol Debuggers > \uicontrol Add to add it. \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 + the Microsoft Symbol Server to the symbol search path of the debugger. For more information, see \l{Setting CDB Paths on Windows}. \note To use the Free Software Foundation (FSF) version of GDB on \macos, you must sign it and modify your \l{glossary-buildandrun-kit}{kit} settings. - This section explains the options you have for debugging C++ code and - provides installation notes for the supported native debuggers. It also + This section describes the options you have for debugging C++ code and + installing the supported native debuggers. It also applies for code in other compiled languages such as C, FORTRAN, Ada. For more information on the debugger modes, see @@ -145,8 +145,7 @@ \section1 Installing Native Debuggers - The following sections provide information about installing native - debuggers. + The following sections describe installing native debuggers. \section2 GDB @@ -185,12 +184,10 @@ \section3 Symbol Server - It is highly recommended that you add the Symbol Server provided - by Microsoft to the symbol search path of the debugger. The - Symbol Server provides you with debugging information for the - operating system libraries for debugging Windows applications. - For more information, see - \l{Setting CDB Paths on Windows}. + We highly recommend that you add the Microsoft Symbol Server to the + symbol search path of the debugger. The Symbol Server has debugging + information for the operating system libraries for debugging Windows + applications. For more information, see \l{Setting CDB Paths on Windows}. \section2 Debugging Tools for \macos diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc index 74ffd9c09a3..4e10efc30a3 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc @@ -14,10 +14,31 @@ \title Debugging - \QC provides a debugger plugin that acts as an interface between the \QC - core and external native debuggers such as the GNU Symbolic Debugger (GDB), - the Microsoft Console Debugger (CDB), a QML/JavaScript debugger, and the - debugger of the low level virtual machine (LLVM) project, LLDB. + A debugger lets you see what happens \e inside an application while it runs + or when it crashes. A debugger can do the following to help you find errors + in the application: + + \list + \li Start the application with parameters that specify its behavior. + \li Stop the application when conditions are met. + \li Examine what happens when the application stops. + \li Make changes in the application when you fix an error and continue + to find the next one. + \endlist + + The \QC debugger plugin acts as an interface between the \QC + core and external native debuggers that you can use to: + + \list + \li Debug executable binary files - GNU Symbolic Debugger (GDB), + the Microsoft Console Debugger (CDB), and the debugger of the + low level virtual machine (LLVM) project, LLDB. + \li Debug QML and Java code and Qt Quick applications - + QML/JavaScript debugger. + \li Debug Python source code - \c pdb. + \endlist + + For more information, see: \list @@ -325,8 +346,7 @@ \section1 Remote Debugging - \QC provides very easy access to remote debugging. - + \QC makes remote debugging easy. In general, the remote debugging 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 @@ -533,11 +553,11 @@ \endlist - \QC displays the raw information provided by the native debuggers in a clear + \QC displays the raw information from the native debuggers in a clear and concise manner with the goal to simplify the debugging process as much as possible without losing the power of the native debuggers. - In addition to the generic IDE functionality provided by stack view, views + In addition to the generic IDE functionality offered by stack view, views for locals and expressions, registers, and so on, \QC includes features to make debugging Qt-based applications easy. The debugger plugin understands the internal layout of several Qt classes, for example, QString, the Qt @@ -627,7 +647,7 @@ into one step for less noisy debugging. For more information, see \l{Specifying GDB Settings}. - The extended GDB settings provide the option to step backwards in code, + The extended GDB settings have the option to step backwards in code, but this option should be used with care, as it is slow and unstable on the GDB side. For more information, see \l{Specifying GDB Settings}. @@ -665,8 +685,8 @@ the bottom of the view. Output is displayed in the right pane of the \uicontrol {Debugger Log} view. - \note Usually, you do not need this feature because \QC provides you - with better ways to handle the task. For example, instead of using the GDB + \note Usually, you do not need this feature because \QC offers better ways to + handle the task. For example, instead of using the GDB \c print command from the command line, you can evaluate an expression in the \uicontrol {Expressions} view. @@ -1093,9 +1113,9 @@ As the format is not guaranteed to be stable, it is strongly recommended not to generate the wire format directly, but to use the abstraction - layer provided by the Python Dumper classes, specifically the \c{Dumper} + layer of the Python Dumper classes, specifically the \c{Dumper} class itself, and the \c{Dumper:Value} and \c{Dumper:Type} abstractions. - These provide a complete framework to take care of the \c iname and \c addr + These offer a complete framework to take care of the \c iname and \c addr fields, to handle children of simple types, references, pointers, enums, and known and unknown structs, as well as some convenience functions to handle common situations. @@ -1287,7 +1307,7 @@ built into or shipped alongside the debugged binary, or created on-the-fly by the debugging helper. - \QC uses the possibility to provide type information on-the-fly for most Qt + \QC offers type information on-the-fly for most Qt classes, obliterating the need to use \e Debug builds of Qt for the purpose of object introspection. diff --git a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc index 20c1f96c110..e63d09443a8 100644 --- a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc @@ -41,7 +41,7 @@ \li To look at the code that starts a new game, place a breakpoint in samegame.qml by clicking between the line number and the window - border on the line where where the \c startNewGame() function is + border on the line where the \c startNewGame() function is called (1). \image qtquick-example-setting-breakpoint1.png diff --git a/doc/qtcreator/src/editors/creator-clangformat.qdocinc b/doc/qtcreator/src/editors/creator-clangformat.qdocinc index 335f4f03de0..8e1483b85bc 100644 --- a/doc/qtcreator/src/editors/creator-clangformat.qdocinc +++ b/doc/qtcreator/src/editors/creator-clangformat.qdocinc @@ -15,7 +15,7 @@ \uicontrol {Restart Now} to restart \QC and load the plugin. \note If you enable Clang Format, do not use the \l{Beautifying Source Code} - {Beautifier} because combining them can provide unexpected results. + {Beautifier} because combining them can lead to unexpected results. You can use Clang Format to enforce a coding style for a project or the whole organization. Create a \c {.clang-format} file that has the diff --git a/doc/qtcreator/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc index 772432f9104..a7a1b17c4a2 100644 --- a/doc/qtcreator/src/editors/creator-code-completion.qdoc +++ b/doc/qtcreator/src/editors/creator-code-completion.qdoc @@ -9,7 +9,7 @@ \title Completing Code As you write code, \QC suggests properties, IDs, and code snippets to - complete the code. It provides a list of suggestions to + complete the code. It shows a list of suggestions to the statement currently under your cursor. Press \key Tab or \key Enter to accept the selected suggestion and complete the code. @@ -166,7 +166,7 @@ \image qml-snippet-editor.png - \QC provides you with built-in snippets in the following categories: + \QC has built-in snippets in the following categories: \list @@ -204,7 +204,7 @@ You can use \l{Using Qt Creator Variables}{predefined variables} in snippets. - The snippet editor provides you with: + The snippet editor offers: \list @@ -271,8 +271,8 @@ \section2 Removing Snippets - Several similar built-in snippets might be provided for different use cases. - To make the list of suggestions shorter when you write code, remove the + The list of suggestions might show several similar built-in snippets for + different use cases. To make it shorter when you write code, remove the built-in snippets that you do not need. If you need them later, you can restore them. diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc index 86ec3c0ec61..72d4595a081 100644 --- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc @@ -66,8 +66,8 @@ \l{Searching with the Locator}{locator}. Enter the line number and column number in the locator, separated by a colon (:). - \note Other convenient ways of navigating in \QC are provided - by the \l{Browsing Project Contents}{sidebars}. + \note You can also use the \l{Browsing Project Contents}{sidebars} to + move around in \QC. \if defined(qtcreator) \section2 Selecting Parse Context diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc index d08f8dcc932..9a45600f791 100644 --- a/doc/qtcreator/src/editors/creator-coding.qdoc +++ b/doc/qtcreator/src/editors/creator-coding.qdoc @@ -70,7 +70,7 @@ \li \l{Using Language Servers} - The language client provides code completion, highlighting of the + The language client offers code completion, highlighting of the symbol under cursor, and jumping to the symbol definition for other programming languages besides C++. In addition, it integrates diagnostics from the language server. @@ -85,7 +85,7 @@ You can use the model editor to create Universal Modeling Language (UML) style models with structured and behavioral diagrams that - provide different views of your system and store them in XML format. + show your system in many ways and store them in XML format. \li \l{Editing State Charts} diff --git a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc index 7b88c1aaf1d..05853ad0d3d 100644 --- a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc @@ -91,8 +91,8 @@ \if defined(qtcreator) \li \l{Parsing C++ Files with the Clang Code Model} - The Clang code model provides some of the services previously - provided by the built-in C/C++ code model, such as code + The Clang code model offers some of the same services as the + built-in C/C++ code model, such as code completion, syntactic and semantic highlighting, diagnostics, tooltips, outline of symbols, and renaming of local symbols. \endif diff --git a/doc/qtcreator/src/editors/creator-finding.qdoc b/doc/qtcreator/src/editors/creator-finding.qdoc index af07b0e2e80..71bdd340085 100644 --- a/doc/qtcreator/src/editors/creator-finding.qdoc +++ b/doc/qtcreator/src/editors/creator-finding.qdoc @@ -33,7 +33,7 @@ \li \l{Searching with the Locator} - The locator provides one of the easiest ways in \QC to browse + Use the locator to browse through projects, files, classes, functions, documentation and file systems. diff --git a/doc/qtcreator/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc index c375a31d404..cefef039c4f 100644 --- a/doc/qtcreator/src/editors/creator-locator.qdoc +++ b/doc/qtcreator/src/editors/creator-locator.qdoc @@ -8,6 +8,9 @@ \title Searching with the Locator + The locator is the fastest way to find a particular project, file, class, or + function, or almost anything else in your project. + By default, you can find the locator in the bottom left of the \QC window. To open it as a centered popup, click \inlineimage icons/magnifier.png (\uicontrol Options) in it and select \uicontrol {Open as Centered Popup}. @@ -343,7 +346,7 @@ \section1 Executing JavaScript - The locator provides access to a JavaScript interpreter, that can be used to + The locator has a JavaScript interpreter that you can use to perform calculations. Beside simple mathematical operations, like ((1 + 2) * 3), the following diff --git a/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc index bdf837a8e10..a8caaf169e1 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc @@ -134,7 +134,7 @@ then \uicontrol Add to define your own style. Define code formatting in the - \uicontrol {Add Configuration} dialog. It provides syntax + \uicontrol {Add Configuration} dialog. It offers syntax highlighting, auto-completion, and context-sensitive help. For these features, you must have the tool installed. @@ -152,14 +152,13 @@ \endlist - In addition, - ClangFormat provides the \uicontrol {Format at Cursor} command. If you + In addition, ClangFormat has the \uicontrol {Format at Cursor} command. If you select it when no text is selected, the syntactic entity under the cursor is formatted. The \uicontrol {Disable Formatting for Selected Text} command wraps selected lines within \c {// clang-format off} and \c {// clang-format on}. - Uncrustify provides the \uicontrol {Format Selected Text} command. If you + Uncrustify has the \uicontrol {Format Selected Text} command. If you select it when no text is selected, the whole file is formatted by default. To disable this behavior, deselect the \uicontrol {Format entire file if no text was selected} check box. diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc index d74678152f8..fc761984f2e 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc @@ -16,7 +16,7 @@ The \e {code model} is the part of an IDE that understands the language you are using to write your application. It is the framework that allows \QC - to provide the following services: + to offer the following services: \list @@ -42,12 +42,12 @@ \endlist - \QC comes with a plugin that provides some of these services + The Clang code model plugin offers some of these services for C++ on top of \l{https://clangd.llvm.org/}{Clangd}. \section1 About the Clang Code Model - The Clang project provides libraries for parsing + The Clang project has libraries for parsing C language family source files. The feedback you get through warning and error markers is the same as a compiler will give you, not an incomplete set or a close approximation, as when using the built-in \QC code model. @@ -67,9 +67,8 @@ include several files, processing a single file and all the included files can take a while. - The Clang code model plugin now provides some of the services that were - previously provided by the built-in C/C++ code model. Currently, the - following services are implemented: + The Clang code model plugin now offers some of the same services as the + built-in C/C++ code model: \list @@ -87,7 +86,7 @@ To use the built-in code model instead, select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ > \uicontrol clangd, and deselect the \uicontrol {Use clangd} check box. This setting also exists on the project level, so that you can have the clang-based - services generally enabled, but switch them off for for certain projects, or vice versa. + services generally enabled, but switch them off for certain projects, or vice versa. You can configure Clang diagnostics either globally or separately for: diff --git a/doc/qtcreator/src/editors/creator-only/creator-compilation-database.qdocinc b/doc/qtcreator/src/editors/creator-only/creator-compilation-database.qdocinc index eaf1b893cb7..8b779607368 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-compilation-database.qdocinc +++ b/doc/qtcreator/src/editors/creator-only/creator-compilation-database.qdocinc @@ -23,7 +23,7 @@ You can use the experimental Compilation Database Project Manager to open the files in a compilation database with access to all the editing features - provided by the Clang code model. + of the Clang code model. To switch between header and source files, select \uicontrol Tools > \uicontrol C++ > \uicontrol {Switch Header/Source}. diff --git a/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc index 83317675532..e6f910b22a1 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc @@ -70,7 +70,7 @@ \list \li \c :map, \c :unmap, \c :inoremap, and so on - \li \c :source provides very basic line-by-line sourcing of vimrc files + \li \c :source sources vimrc files line-by-line \li \c :substitute substitutes an expression in a range \li \c :'<,'>!cmd filters through an external command (for example, sorts the lines in a file with \c :%!sort) diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc index dd38af1e382..358a4b33b46 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc @@ -8,11 +8,11 @@ \title Using Language Servers - For several programming languages, a \e {language server} is available - that provides information about the code to IDEs as long as they support + For several programming languages, a \e {language server} offers + information about the code to IDEs as long as they support communication via the \l{Language Server Protocol} {language server protocol (LSP)}. This enables the - IDE to provide the following services: + IDE to offer the following services: \list \li \l{Completing Code}{Code completion} @@ -145,8 +145,8 @@ \section2 QML Language Server - Qt 6.4 ships with the \c qmlls language server that provides completion and - warnings for QML. To set it up as a \l {Generic StdIO Language Server}, + Qt 6.4 ships with the \c qmlls language server that offers completion and + issues warnings for QML. To set it up as a \l {Generic StdIO Language Server}, select \c {text/x-qml} and \c {application/x-qt.ui+qml} as MIME types, and \c {/bin/qmlls} as executable. diff --git a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc index 0f828a7cfff..a5a48c8c7bb 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc @@ -15,10 +15,9 @@ \title Modeling You can use the model editor to create Universal Modeling Language (UML) - style models with structured and behavioral diagrams that provide different - views of your system. However, the editor uses a variant of UML and only a - subset of properties are provided for specifying the appearance of model - elements. + style models with structured and behavioral diagrams that offer different + views to your system. However, the editor uses a variant of UML and has only + a subset of properties for specifying the appearance of model elements. Structural diagrams represent the static aspect of the system and are therefore stable, whereas behavioral diagrams have both static and dynamic @@ -31,9 +30,9 @@ and visualize how the system is packaged. \li Class diagrams, which consists of classes, dependencies, inheritance, associations, aggregation, and composition, and - provide an object-oriented view of a system. + show a system in an object-oriented way. \li Component diagrams, which represent a set of components and their - relationships, and provide an implementation view of a system. + relationships, and show the implementation of a system. \li Deployment diagrams, which represent a set of software and hardware components and their relationships, and visualize the deployment of a system. @@ -388,7 +387,7 @@ \section1 Adding Custom Elements - The model editor provides the following built-in element types: package, + The model editor has the following built-in element types: package, component, class, and item. For package, component, and class elements, you can specify custom icons. The color, size, and form of the icon are determined by a stereotype. If you attach the stereotype to an element, the @@ -432,7 +431,7 @@ You can add your own definition file and save it with the file extension \e .def to add custom colors and icons for stereotypes, elements, or tool - bars. Either store this file in the the same directory as the + bars. Either store this file in the same directory as the \e standard.def file or select the root element of a model and apply your \e .def file to the property \uicontrol {Config path}. diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc index bc20206ea2b..fbfbd3df294 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc @@ -14,15 +14,15 @@ \title Editing State Charts - State charts provide a graphical way of modeling how a system reacts to - stimuli. This is done by defining the possible \e states that the system can + State charts are a graphical way of modeling how a system reacts to + stimuli. They define the \e states that the system can be in, and how the system can move from one state to another (\e transitions - between states). A key characteristic of event-driven systems (such as Qt - applications) is that behavior often depends not only on the last or current - \e event, but also the events that preceded it. With state charts, this - information is easy to express. + between states). The behavior of event-driven systems (such as Qt + applications) often depends not only on the last or current + \e event, but also on earlier events. With state charts, you + can easily share this information. - \QC provides a project wizard for adding \l{https://www.w3.org/TR/scxml/} + \QC has a project wizard for adding \l{https://www.w3.org/TR/scxml/} {State Chart XML (SCXML)} files with boilerplate code to projects and an experimental SCXML editor for editing the state charts. You can use the SCXML editor to add \e states and \e transitions to the files. You can then diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc index df133e18054..3ef73484ab3 100644 --- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc +++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc @@ -28,7 +28,7 @@ \section1 Generic Highlighting - Generic highlighting is provided by + \QC uses \l{https://api.kde.org/frameworks/syntax-highlighting/html/index.html} {KSyntaxHighlighting}, which is the syntax highlighting engine for Kate syntax definitions. \QC comes with most of the commonly used syntax files, @@ -62,7 +62,7 @@ \image qtcreator-syntax-highlighter.png "Generic Highlighter preferences" If you have written your own syntax definition files, you - can provide an additional definition search path in the + can add a definition search path in the \uicontrol {User Highlight Definition Files} field. To apply the changes you make to the definition files, select \uicontrol {Reload Definitions}. diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index 5731f9bcca6..f998700eaac 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -19,7 +19,7 @@ \title Keyboard Shortcuts - \QC provides various keyboard shortcuts to speed up your development + \QC has various keyboard shortcuts that speed up your development process. You can add more shortcuts if your favorite combination is missing. In addition, you can specify your own keyboard shortcuts for some functions that can be easily performed with a mouse, and therefore do not diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc index b6778a95def..48ba10de30d 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc @@ -9,7 +9,7 @@ \title Running Autotests \QC supports both \e {code based tests} and \e {build system based tests}. - Code based testing provides special handling for particular testing + Code based testing offers special handling for particular testing frameworks that is strongly tied to the underlying code models or specialized parsers. Build system based testing is independent from any testing frameworks. It retrieves information directly from the underlying @@ -27,7 +27,7 @@ \li \l{Qt Test} framework \endlist - Additional build system based support is provided for + \QC offers additional build system based support for \l{https://cmake.org/cmake/help/latest/manual/ctest.1.html}{CTest}. You can use \QC to create, build, and run code based tests for your @@ -44,7 +44,7 @@ The detection of tests is usually much faster for build system based tests as this normally does not involve scanning or parsing. - The information provided inside the tests tree is usually more detailed + The information in the tests tree is usually more detailed when using code based tests. If you have enabled code based and build system based tests together you @@ -199,8 +199,8 @@ \section2 Creating Catch2 Tests To build and run Catch2 tests, you either must have Catch2 libraries and - headers installed, or you can use the single include header file provided - by the Catch2 repository. + headers installed, or you can use the single include header file in the + Catch2 repository. If the Catch2 headers can be found by the used compiler and build system automatically, you do not need to specify the include directory when @@ -239,7 +239,7 @@ \section2 Creating CTest Based Tests - CTest provides capabilities to execute tests for CMake based projects + CTest can execute tests for CMake based projects and is not limited to a special test framework. You simply configure tests inside the project files, usually CMakeLists.txt. Basically this is done by enabling testing for the project and registering @@ -643,7 +643,7 @@ \endtable - Since Qt 5.4, you can provide a BLACKLIST file for tests. It is mainly used + Since Qt 5.4, you can add a BLACKLIST file for tests. It is mainly used internally by the Qt CI system. \table diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index ea72d61d547..7e18ac95e9e 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -94,7 +94,7 @@ \section1 View output - The \l{Viewing Output}{taskbar} provides different views to output from + The \l{Viewing Output}{taskbar} shows output from several sources, such as a list of errors and warnings encountered during a build, detailed output from the compiler, status of a program when it is executed, debug output, or search results. @@ -119,7 +119,7 @@ \section1 Find keyboard shortcuts - \QC provides \l{Keyboard Shortcuts}{many useful keyboard shortcuts}. + \QC has \l{Keyboard Shortcuts}{many useful keyboard shortcuts}. You can see the keyboard shortcut for a menu command in the menu or the tooltip for a button. @@ -227,7 +227,7 @@ \section1 Quickly locate files using the keyboard - The \uicontrol Locator provides one of the easiest ways in \QC to browse + Use the \uicontrol Locator to browse through projects, files, classes, functions, documentation, and file systems. To quickly access files not directly mentioned in your project, you can create your own locator filters. That way you can locate files in a diff --git a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc index a9a94cd3df8..27918da3e48 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc @@ -290,7 +290,7 @@ maximum time to wait after the main AUT has exited. This is useful for AUTs invoked through launcher applications, such as shell scripts or batch files. - \li Select the \uicontrol {Animate mouse cursor} check box to to animate + \li Select the \uicontrol {Animate mouse cursor} check box to animate the mouse cursor when playing back a test. \endlist diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc index 13b813abb6b..6a883fe37af 100644 --- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc +++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc @@ -196,8 +196,8 @@ following value, where \c{} is the amount of cores in your CPU: \c{-j } - On Windows, nmake does not support the \c{-j} parameter. Instead, we - provide a drop-in replacement called jom. You can download a precompiled + On Windows, nmake does not support the \c{-j} parameter. Instead, you can use + \e jom. You can download a precompiled version of jom from \l{https://download.qt.io/official_releases/jom/}{Qt Downloads}. Put jom.exe in a location in the %PATH%. Go to the \uicontrol {Build Settings} and set jom.exe as the make command. @@ -306,7 +306,7 @@ In fact, developers do not want to switch editors, but might have to do so to accomplish their tasks. We need to figure out what the tasks are to - provide developers with better ways to navigate while performing the tasks. + offer developers better ways to navigate while performing the tasks. One common factor in many use cases is switching editors while working on a set of open files. While working on files A and B, users sometimes need to @@ -316,7 +316,7 @@ Typically, users also work on multiple classes or functions that are related, even though they are defined or declared in different files. - \QC provides two shortcuts for that: \key F2 to follow the symbol under + \QC offers two shortcuts for that: \key F2 to follow the symbol under cursor and \key Ctrl+Shift+U to find references to it. In addition, developers can: diff --git a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc index d87cadf88c0..2d892cb1086 100644 --- a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc +++ b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc @@ -62,8 +62,8 @@ \li \uicontrol {Profile.xml} defines how Automatic Interception Interface handles processes in a distributed job. It is not necessary for Visual Studio or Make and Build tools builds, but can - be used to provide configuration options if those builds use - additional processes that are not included in those packages. It is + be used to add configuration options if those builds use + processes that are not included in those packages. It is required to configure distributable processes in Dev Tools builds. \li \uicontrol {Avoid local task execution} frees up resources on the initiator machine. This might be beneficial for distribution if the diff --git a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc index cd6a7bd9447..c441981d3b8 100644 --- a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc +++ b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc @@ -39,12 +39,12 @@ \section1 Boot2Qt - The Boot2Qt stack can be made to run on a variety of hardware. For - license holders, tooling is provided to customize the contents of the stack - as well as to take it into desired production hardware. + The Boot2Qt stack runs on a variety of hardware. License holders can use + tools to customize the contents of the stack and to take it into + production hardware. - Either Windows 10 64-bit or later or Ubuntu Linux 64-bit 20.04 LTS - or later is required to install and use Boot2Qt. + You need either Windows 10 64-bit or later or Ubuntu Linux 64-bit 20.04 LTS + or later to install and use Boot2Qt. The following topics have more information about developing applications for Boot2Qt devices: @@ -95,7 +95,7 @@ \section1 QNX - The QNX Neutrino RTOS should provide a few additional command line tools + The QNX Neutrino RTOS has more command line tools and services, as described in \l {Qt for QNX}. \note In Qt 6, \QC support for QNX is considered experimental. diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc index 3dfe546f60b..661c72f9f06 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc @@ -49,7 +49,7 @@ \li \l{Keyboard Shortcuts} - \QC provides various keyboard shortcuts to speed up your development + \QC has keyboard shortcuts that speed up your development process. You can change the keyboard shortcuts, as well as import and export keyboard shortcut mapping schemes. diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc index 1158c037e2b..631e7e879c7 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc @@ -105,7 +105,7 @@ For more information, see \l{Defining Color Schemes}. \l{https://api.kde.org/frameworks/syntax-highlighting/html/index.html} - {KSyntaxHighlighting} provides generic highlighting. It is the syntax + {KSyntaxHighlighting} offers generic highlighting. It is the syntax highlighting engine for Kate syntax definitions. \QC comes with most of the commonly used syntax files, and you can download additional files. @@ -117,7 +117,7 @@ \section1 Adding Your Own Code Snippets As you write code, \QC suggests properties, IDs, and code snippets to - complete the code. It provides a list of context-sensitive suggestions to + complete the code. It lists context-sensitive suggestions for the statement currently under your cursor. You can add, modify, and remove snippets in the snippet editor. diff --git a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc index fff838b030f..2eed8eb1e21 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc @@ -16,7 +16,7 @@ \image front-ui.png - \QC provides an integrated visual editor designing widget-based applications + \QC has an integrated visual editor designing widget-based applications in the \uicontrol Design mode. The integration includes project management and code completion. diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc index c9c3d16bf1f..7a20f1fa876 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc @@ -79,10 +79,10 @@ \row \li Mode \target glossary-mode - \li Adapts the \QC user interface to the different application - development tasks at hand. Each mode has its own view that shows - only the information required for performing a particular task, - and provides only the most relevant features and functions + \li Adapts the \QC user interface to the application + development task at hand. Each mode has its own view that shows + only the information you need for performing a particular task, + and has only the most relevant features and functions related to it. As a result, the majority of the \QC window area is always dedicated to actual application development tasks. diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc index 65886733716..befd689d089 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc @@ -14,14 +14,13 @@ \title IDE Overview - \QC is an integrated development environment (IDE) that provides you with - tools to design and develop applications with the Qt application framework. + \QC is an integrated development environment (IDE) that has tools for + designing and developing applications with the Qt application framework. With Qt you can develop applications and user interfaces once and deploy them to several desktop, embedded, and mobile operating systems or - web browsers (experimental). \QC - provides you with tools for accomplishing your tasks throughout the whole - application development life-cycle, from creating a project to deploying the - application to the target platforms. + web browsers (experimental). \QC has the tools for accomplishing your tasks + throughout the whole application development life-cycle, from creating a + project to deploying the application to the target platforms. \table \row @@ -52,8 +51,8 @@ As an IDE, \QC differs from a text editor in that it knows how to build and run applications. It understands the C++ and QML - languages as code, not just as plain text. This enables it to - provide you with useful features, such as semantic highlighting, + languages as code, not just as plain text. Therefore, it can + offer useful features, such as semantic highlighting, checking code syntax, code completion, and refactoring actions. \QC supports some of these services also for other programming languages, such as Python, for which a \e {language server} is diff --git a/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc index 6444a07b9de..646fdce899b 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc @@ -39,7 +39,7 @@ \li Model \li Universal Modeling Language (UML) style model with a structured diagram. However, the model editor uses a variant of UML and - provides only a subset of properties for specifying the + has only a subset of properties for specifying the appearance of model elements. For more information, see \l {Modeling}. \row @@ -189,7 +189,7 @@ \section1 Creating OpenGL Fragment and Vertex Shaders - Qt provides support for integration with OpenGL implementations on all + Qt supports integration with OpenGL implementations on all platforms, which allows you to display hardware accelerated 3D graphics alongside a more conventional user interface. For more information, see \l{Qt GUI}. @@ -201,7 +201,7 @@ compiling and linking vertex and fragment shaders. You can use \QC code editor to write fragment and vertex shaders - in GLSL or GLSL/ES. The code editor provides syntax highlighting and code + in GLSL or GLSL/ES. The code editor offers syntax highlighting and code completion for the files. \image qtcreator-new-opengl-file.png "New OpenGL file wizard" diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc index 700e08bd8de..25951a3e804 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc @@ -16,8 +16,8 @@ \image front-preview.png - \QC provides support for running and deploying Qt applications built - for different target platforms, or using different compilers, debuggers, or + \QC supports running and deploying Qt applications that you build + for different target platforms or with different compilers, debuggers, or Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools, \l{glossary-device}{device} type and other settings to use when building and running your project. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc index a2f85d010e5..525e4e2f04d 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc @@ -66,7 +66,7 @@ \endlist - In addition, the \QC Bare Metal Device plugin provides support for the + In addition, the \QC Bare Metal Device plugin supports the following compilers: \list @@ -161,12 +161,12 @@ \image qtcreator-options-qcc-compilers.png "Adding a QCC compiler" - \li In the \uicontrol ABI field, provide an identification for the + \li In the \uicontrol ABI field, enter an identifier for the target architecture. This is used to warn about ABI mismatches within the kits. \li In the \uicontrol {Target triple} field, specify the GCC target - architecture. If services provided by the code model fail because + architecture. If code model services fail because Clang does not understand the target architecture, select \uicontrol {Override for code model}. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc index f54122ce529..d4c0009db17 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc @@ -116,8 +116,8 @@ \li \c supportedProjectTypes is an optional setting that can be used to filter wizards when adding a new build - target to an existing project. For example, only wizards - that produce qmake projects should be provided when + target to an existing project. For example, show only + wizards that produce qmake projects when adding a new target to an existing qmake project. Possible values are the build systems supported by \QC @@ -457,7 +457,7 @@ \li \c projectFilePath with the path to the project file. \li \c requiredFeatures with a list of strings or objects that describe - the features that a kit must provide to be listed on the page. + the features that a kit must have to appear on the page. When a string is found, this feature must be set. When using an object instead, the following settings are checked: @@ -574,8 +574,8 @@ \li \c arguments with the arguments to pass to \c command. - \li \c timeOutFactor can be used to provide for longer than - default timeouts for long-running commands. + \li \c timeOutFactor extends default timeouts for long-running + commands. \li \c enabled which will be evaluated to decide whether or not to actually execute this job. @@ -605,7 +605,7 @@ \li Text Edit \endlist - \note Wizards support only the the settings documented in the following + \note Wizards support only the settings documented in the following sections. Specify the following settings for each widget: @@ -634,7 +634,7 @@ \li \c persistenceKey makes the user choice persistent. The value is taken to be a settings key. If the user changes the default - value of the widget, the user-provided value is stored and will + value of the widget, the user's value is stored and will become the new default value the next time the wizard is run. \li \c visible is set to \c true if the widget is visible, otherwise diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc index f447ef82e00..c4ebbdb3e62 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc @@ -131,7 +131,7 @@ If you want to run your application on a remote Linux device, you first need to deploy your executable and possibly other files. - \QC does that for you automatically if you provide the necessary + \QC does that for you automatically if you enter the necessary information. This works the same way as explained for CMake in \l {Deploying to Remote Linux}, except that you also need to include your application binary in the list. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc index 7573f3c9076..b183eec8917 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc @@ -30,7 +30,7 @@ \list 1 \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits \uicontrol Compilers > \uicontrol Add > \uicontrol Nim to specify - the path to the the Nim compiler. + the path to the Nim compiler. \li Select \uicontrol Apply to add the compiler. \li Select \uicontrol Kits > \uicontrol Add to add a kit for building applications with Nimble: diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc index 6451b3ad5a4..d22e6f4266d 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc @@ -17,7 +17,7 @@ Most \QC project wizards enable you to choose the build system to use for building the project: qmake, CMake, Meson, or Qbs. qmake is installed and configured when you install Qt. To use one of the other supported build - systems, you need to set it up, as described in the the following sections: + systems, you need to set it up, as described in the following sections: \list diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc index bddad912d27..9d3af4d82c7 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc @@ -15,7 +15,7 @@ \title Adding Qt Versions You can install multiple versions of Qt development PC and use them to build - your projects. For example, \l{glossary-device}{device} manufacturers provide + your projects. For example, \l{glossary-device}{device} manufacturers offer special Qt versions for developing applications for their devices. \section1 Registering Installed Qt Versions diff --git a/doc/qtcreator/src/python/creator-python-project.qdocinc b/doc/qtcreator/src/python/creator-python-project.qdocinc index 5c5fcc2eb33..3ba1ec89f20 100644 --- a/doc/qtcreator/src/python/creator-python-project.qdocinc +++ b/doc/qtcreator/src/python/creator-python-project.qdocinc @@ -13,7 +13,7 @@ If you have not installed PySide6, \QC prompts you to install it after you create the project. Further, it prompts you to install the - \l {Python Language Server}{Python language server} that provides services + \l {Python Language Server}{Python language server} that offers services such as code completion and annotations. Select \uicontrol Install to install PySide6 and the language server. @@ -39,12 +39,12 @@ The \uicontrol {Window UI} wizard enables you to create a Python project that has the source file for a class. Specify - the PySide version, class name, base class, and and source file for the + the PySide version, class name, base class, and source file for the class. \image qtcreator-python-wizard-app-window.png "Qt for Python wizard for creating a widget-based UI" - The wizard adds the imports to the source file to provide + The wizard adds the imports to the source file for access to the QApplication, the base class you selected in the Qt Widgets module, and Qt UI tools: @@ -117,7 +117,7 @@ Python application. Select \uicontrol REPL on the toolbar to start the \l{https://pythonprogramminglanguage.com/repl/}{Python interactive shell}. To start the shell and import the current file as a module, select - select \uicontrol {REPL Import File}. To also import all functions from + \uicontrol {REPL Import File}. To also import all functions from the file, select \uicontrol {REPL Import *}. Always regenerate the Python code after modifying a UI file. @@ -152,7 +152,7 @@ \image qtcreator-python-wizard-qml.png "Qt for Python wizard for creating an empty Qt Quick application" - The wizard adds the following imports to the source file to provide access + The wizard adds the following imports to the source file for access to QGuiApplication and QQmlApplicationEngine: \badcode diff --git a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc index d6da86d0eef..6f5361c2c4d 100644 --- a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc +++ b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc @@ -10,9 +10,8 @@ \title Connecting QNX Devices You can connect QNX devices to the development PC to deploy, run and debug - applications on them from within \QC. The QNX Neutrino RTOS should provide - a few additional command line tools and services, as described in - \l {Qt for QNX}. + applications on them from within \QC. The QNX Neutrino RTOS has additional + command line tools and services, as described in \l {Qt for QNX}. \note In Qt 6, \QC support for QNX is considered experimental. diff --git a/doc/qtcreator/src/qnx/creator-projects-running-qnx.qdocinc b/doc/qtcreator/src/qnx/creator-projects-running-qnx.qdocinc index 9f0071e1dc4..4413be5d1dd 100644 --- a/doc/qtcreator/src/qnx/creator-projects-running-qnx.qdocinc +++ b/doc/qtcreator/src/qnx/creator-projects-running-qnx.qdocinc @@ -28,8 +28,8 @@ \section2 Troubleshooting Errors To support running, debugging, and stopping applications from \QC, the QNX - Neutrino RTOS should provide a few additional command line tools and - services, as described in \l {Qt for QNX}. + Neutrino RTOS has additional command line tools and services, as described + in \l {Qt for QNX}. \section3 Debug Output Cannot Be Shown diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index fe7e2c788d1..50cbe7024e6 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -13,7 +13,7 @@ \title Qt Creator Manual - \QC provides a cross-platform, complete integrated development environment + \QC is a cross-platform, complete integrated development environment (IDE) for application developers to create applications for multiple \l{Desktop Platforms}{desktop}, \l {Embedded Platforms}{embedded}, and \l{Mobile Platforms}{mobile device} platforms, such as \l Android and diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc index 06396ceb5cf..da87315bd5c 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc @@ -106,7 +106,7 @@ \printuntil border.color We anchor the rectangles to their parent to position them in its - top-left and and bottom-left corners, as well as the vertical center + top-left and bottom-left corners, as well as the vertical center of its right edge. The following code snippet anchors a rectangle to the top-left corner of its parent: diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-designer-plugin.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-designer-plugin.qdoc index aa4e3b8b59d..7e95c03bb20 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-designer-plugin.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-designer-plugin.qdoc @@ -16,7 +16,7 @@ UI files. The functionality is restricted and not all \QDS features are supported. - To use \QMLD, switch to the \uicontrol Design mode when a ui.qml or or .qml + To use \QMLD, switch to the \uicontrol Design mode when a ui.qml or .qml file is open. For more information about using \QMLD, see \l{Qt Design Studio Manual}. diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc index 6b77748e455..61033ee685d 100644 --- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc @@ -659,7 +659,7 @@ To view the total amount of memory allocated by the functions, select \uicontrol Memory in the drop-down menu. - To view the the number of memory allocations performed by the functions, + To view the number of memory allocations performed by the functions, select \uicontrol Allocations. Double-click an item in a view to zoom into it. Double-click an empty diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc index 416e32e02fc..e47328e744d 100644 --- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc @@ -11,6 +11,11 @@ If you cannot see a file in the \l Projects view, switch to the \uicontrol {File System} view, which shows all the files in the file system. + \note Usually, \l{Searching with the Locator}{searching with the locator} + is the fastest way to find a particular project, file, class, or function, + or almost anything else in your project. Use the \e {file system (f)} filter + to open files from anywhere in the file system. + \if defined(qtdesignstudio) The following image displays the \uicontrol {File System} view in the \uicontrol Design mode: diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index 4e2577cf7ca..85bdb4f1a51 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -18,6 +18,10 @@ the build system structure of the project and lists all files that are part of the project. + \note Usually, \l{Searching with the Locator}{searching with the locator} + is the fastest way to find a particular project, file, class, or function, + or almost anything else in your project. + \if defined(qtdesignstudio) The following image displays the \uicontrol Projects view in the \uicontrol Design mode: diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index c39513a13c5..1e233283fdc 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -50,17 +50,20 @@ \endif \if defined(qtcreator) - Use the \l{Selecting Modes}{mode selector} (1) to change to another \QC mode. + Do you want to perform a particular task, such as designing the UI, + writing code, or debugging the application? Select the appropriate mode in + the \l{Selecting Modes}{mode selector} (1). - Use the kit selector (2) to select the \l{glossary-buildandrun-kit}{kit} for - running (3), debugging (4), or building (5) the application. The task bar (7) + Are you ready to build the application for particular hardware or (5) + run (3) or debug (4) it on a device? Use the kit selector (2) to select + the appropriate \l{glossary-buildandrun-kit}{kit}. The task bar (7) displays output from these actions. - Use the \l{Searching with the Locator}{locator} (6) to browse through - projects, files, classes, functions, documentation, and file systems. + Are you looking for a particular project, file, class, or function? + Start typing its name in the \l{Searching with the Locator}{locator} (6). - For a quick tour of the user interface that takes you to the locations of - these controls, select \uicontrol Help > \uicontrol {UI Tour}. + To see where the above controls are in the user interface, select + \uicontrol Help > \uicontrol {UI Tour}. The following sections describe some \QC controls in more detail: @@ -455,7 +458,7 @@ \section1 Issues - \uicontrol{Issues} provides lists of following types of issues: + \uicontrol{Issues} lists the following types of issues: \list @@ -580,7 +583,7 @@ \section1 Compile Output - \uicontrol{Compile Output} provides all output from the compiler. + \uicontrol{Compile Output} shows all output from the compiler. The \uicontrol{Compile Output} is a more detailed version of information displayed in \l Issues. diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc index 789c622f725..12faa3bb0d7 100644 --- a/doc/qtcreator/src/user-interface/creator-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-views.qdoc @@ -22,6 +22,10 @@ {mode} you are working in. Only views that are relevant to a mode are available in it. + \note Usually, \l{Searching with the Locator}{searching with the locator} + is the fastest way to find a particular project, file, class, or function, + or almost anything else in your project. + Manage projects and files in the following views: \list diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc index bc685047e35..ce4dce91095 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc @@ -124,7 +124,7 @@ \section2 Viewing Diff Output - All version control systems provide menu options to \e{diff} the current + All version control systems have menu options to \e{diff} the current file or project: to compare it with the latest version stored in the repository and to display the differences. In \QC, a diff is displayed in a read-only editor. If the file is accessible, you can double-click on a diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 0cc5c936379..47682e787b8 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -563,7 +563,7 @@ \l{https://curl.haxx.se/}{curl} tool are used for HTTP connections. Select the \uicontrol HTTPS check box to prepend \c https to the Gerrit URL - if Gerrit does not provide it. + if Gerrit does not add it. \image qtcreator-gerrit-options.png "Gerrit preferences" diff --git a/doc/qtcreatordev/config/qtcreator-developer.qdocconf b/doc/qtcreatordev/config/qtcreator-developer.qdocconf index b59835b8adb..417b1ffd426 100644 --- a/doc/qtcreatordev/config/qtcreator-developer.qdocconf +++ b/doc/qtcreatordev/config/qtcreator-developer.qdocconf @@ -16,12 +16,14 @@ headerdirs = . \ ../src \ ../../../src/libs/aggregation \ ../../../src/libs/extensionsystem \ + ../../../src/libs/utils \ ../../../src/plugins/coreplugin sourcedirs = . \ ../src \ ../../../src/libs/aggregation \ ../../../src/libs/extensionsystem \ + ../../../src/libs/utils \ ../../../src/plugins/coreplugin diff --git a/doc/qtcreatordev/src/qtcreator-module.qdoc b/doc/qtcreatordev/src/qtcreator-module.qdoc index 4f79cceba79..6a6b1a62f10 100644 --- a/doc/qtcreatordev/src/qtcreator-module.qdoc +++ b/doc/qtcreatordev/src/qtcreator-module.qdoc @@ -34,11 +34,10 @@ for plugins and basic mechanisms for plugin interaction like an object pool. - \omit \row \li \l{Utils} - \li General utility library. - + \li Useful classes that are reused in a lot of places in Qt Creator code. + \omit \row \li \l{QmlJS} \li QML and JavaScript language support library. diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index d3b2cafa1c3..eca4f33508e 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -6,15 +6,21 @@ Module { Depends { name: "cpp" } Properties { - condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang") - && Utilities.versionCompare(cpp.compilerVersion, "9") >= 0 - cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"] - } - - Properties { - condition: qbs.toolchain.contains("clang") && !qbs.hostOS.contains("darwin") - && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0 - cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-constant-logical-operand"] + condition: qbs.toolchain.contains("gcc") + cpp.cxxFlags: { + var flags = ["-Wno-missing-field-initializers"]; + function isClang() { return qbs.toolchain.contains("clang"); } + function versionAtLeast(v) { + return Utilities.versionCompare(cpp.compilerVersion, v) >= 0; + }; + if (isClang()) + flags.push("-Wno-constant-logical-operand"); + if ((!isClang() && versionAtLeast("9")) + || (isClang() && !qbs.hostOS.contains("darwin") && versionAtLeast("10"))) { + flags.push("-Wno-deprecated-copy"); + } + return flags; + } } priority: 1 diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt index 63e2498dff2..1f196bef178 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt @@ -11,9 +11,7 @@ find_package(Qt6 %{MinimumSupportedQtVersion} REQUIRED COMPONENTS Quick) @if %{HasQSPSetup} @if %{UsesAutoResourcePrefix} -qt_standard_project_setup( - MIN_VERSION 6.5 -) +qt_standard_project_setup(REQUIRES 6.5) @else qt_standard_project_setup() @endif diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index e7f565c2f3a..fcfac6a2a09 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -234,11 +234,7 @@ - BreakCondition - - Condition: - Podmínka: - + ::Debugger Ignore count: Zastavit teprve po: @@ -702,7 +698,7 @@ - CompletionSettingsPage + ::TextEditor Code Completion Doplnění kódu @@ -731,10 +727,6 @@ &Automatically insert brackets &Automaticky vložit závorky - - Behavior - Chování - &Case-sensitivity: &Rozlišování velkých a malých písmen: @@ -743,10 +735,6 @@ Full Plné - - None - Žádné - First Letter První písmeno @@ -767,10 +755,6 @@ When Triggered Na žádost - - Always - Vždy - Automatically insert brackets and semicolons when appropriate. Automaticky vkládat závorky a středníky na odpovídající místa. @@ -793,11 +777,7 @@ - ContentWindow - - Open Link - Otevřít adresu odkazu - + ::Help Open Link as New Page Otevřít odkaz jako novou stránku @@ -4566,29 +4546,6 @@ Pokuste se projekt sestavit znovu. Nepodařilo se přidat definici metody. - - DocSettingsPage - - Registered Documentation - Zapsaná dokumentace - - - Add... - Přidat... - - - Remove - Odstranit - - - Add and remove compressed help files, .qch. - Přidat a odstranit stlačené soubory s nápovědou, .qch. - - - Add - Přidat - - EmbeddedPropertiesPage @@ -5404,7 +5361,7 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur - Find::Internal::FindDialog + ::Core Search for... Hledání... @@ -5441,10 +5398,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Use regular e&xpressions Používat regulární &výrazy - - Cancel - Zrušit - Search && &Replace Hledat a &nahradit @@ -5469,24 +5422,10 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Sco&pe: &Oblast: - - - Find::Internal::FindPlugin - - &Find/Replace - &Hledat/Nahradit - Find... Hledat... - - Ctrl+Shift+F - Ctrl+Shift+F - - - - Find::Internal::FindToolBar Current Document Nynější dokument @@ -5575,9 +5514,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Preserve Case when Replacing Zachovat při nahrazování velikost - - - Find::Internal::FindWidget Find Hledat @@ -5598,25 +5534,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur ... ... - - Replace - Nahradit - - - Replace && Find - Nahradit a hledat - - - Replace All - Nahradit vše - - - Advanced... - Pokročilé... - - - - Find::SearchResultWindow Search Results Výsledky hledání @@ -5637,22 +5554,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur %1 %2 %1 %2 - - Replace with: - Nahradit: - - - Replace all occurrences - Nahradit všechny výskyty - - - Replace - Nahradit - - - This change cannot be undone. - Tuto změnu nelze vrátit zpět. - Do not warn again Nevarovat znovu @@ -5663,7 +5564,7 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur - GdbOptionsPage + ::Debugger Gdb interaction Výměna informací Gdb @@ -5741,31 +5642,15 @@ Výchozí hodnota, jíž je 20 sekund, by měla postačovat v případě větši kdy na pomalých strojích nahrávání velkých knihoven nebo výpis zdrojových souborů zabere mnohem více času, než je nastaveno. V takovém případě by se měla hodnota zvýšit. - - Gdb - Gdb - When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. Tato volba má za následek, že v určitých situacích sloučí 'Jednotlivý krok do' více kroků do jednoho, čímž se ladění uspíší. Například se přeskočí kód počítání atomárních odkazů; a jednotlivý 'Krok do' pro vyslání signálu skončí přímo v otvoru s ním spojeném. - - Skip known frames when stepping - Přeskočit při provádění jednotlivého kroku známá místa - - - Show a message box when receiving a signal - Při obdržení signálu ukázat okno se zprávami - Behavior of Breakpoint Setting in Plugins Chování nastavení bodu přerušení v přídavných modulech - - GDB - GDB - This is either empty or points to a file containing GDB commands that will be executed immediately after GDB starts up. Toto je buď prázdné nebo ukazuje na soubor obsahující příkazy, které jsou provedeny bezprostředně po spuštění GDB. @@ -5774,21 +5659,6 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš GDB startup script: Skript pro spuštění GDB: - - This is the number of seconds Qt Creator will wait before -it terminates a non-responsive GDB process. The default value of 20 seconds -should be sufficient for most applications, but there are situations when -loading big libraries or listing source files takes much longer than that -on slow machines. In this case, the value should be increased. - Toto je počet sekund, po které bude Qt Creator čekat, předtím než ukončí neodpovídající procesy GDB. -Výchozí hodnota, jíž je 20 sekund, by měla postačovat v případě většiny programů. Ale jsou situace, -kdy na pomalých strojích nahrávání velkých knihoven nebo výpis zdrojových souborů zabere mnohem -více času, než je nastaveno. V takovém případě by se měla hodnota zvýšit. - - - GDB timeout: - Překročení času u GDB: - Allows 'Step Into' to compress several steps into one step for less noisy debugging. For example, the atomic reference counting code is skipped, and a single 'Step Into' for a signal emission ends up directly in the slot connected to it. @@ -5802,30 +5672,10 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš <html><head/></body><p>GDB allows setting breakpoints on source lines for which no code was generated. In such situations the breakpoint is shifted to the next source code line for which code was actually generated. This option reflects such temporary change by moving the breakpoint markers in the source code editor.</p></body></html> <html><head/></body><p>Ne všechny řádky zdrojového kódu způsobují vytvoření spustitelného kódu. GDB však dovoluje, aby byl takových situacích pro takové řádky, pro něž nebyl vytvořen žádný kód, nastaven bod přerušení. Tento bod přerušení je pak posunut na další řádek se zdrojovým kódem, pro který byl kód skutečně vytvořen. Toto nastavení odráží takovou dočasnou změnu a způsobuje, že značky pro body přerušení jsou odpovídajícím způsobem posunuty v editoru zdrojového kódu.</p></body></html> - - Adjust breakpoint locations - Upravit umístění bodů přerušení - This allows or inhibits reading the user's default .gdbinit file on debugger startup. Dovolí nebo potlačí čtení výchozího uživatelského souboru-.gdbinit při spuštění ladiče. - - Load .gdbinit file on startup - Nahrát soubor .gdbinit na začátku - - - Use asynchronous mode to control the inferior - Použít asynchronní režim k ovládání laděného procesu - - - Stop when a qWarning is issued - Zastavit při qWarning - - - Stop when a qFatal is issued - Zastavit při qFatal - <html><head/><body><p>Selecting this enables reverse debugging.</p><.p><b>Note:</b>This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session.</p><body></html> <html><head/><body><p>Zapnout zpětné ladění. Poznámka: Tato funkcionalita je na straně GDB velmi pomalá a nestabilní. Může se vyskytnout nepředvídatelné chování, když se jde přes systémová volání zpět, a vaše ladicí sezení může být velice snadno zničeno.</p><body></html> @@ -5848,7 +5698,7 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš - GenericMakeStep + ::ProjectExplorer Override %1: Přepsat %1: @@ -8114,10 +7964,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Open Link Otevřít odkaz - - Open Link as New Page - Otevřít odkaz jako novou stránku - Copy Link Kopírovat odkaz @@ -8130,10 +7976,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Reload Nahrát znovu - - Open Link in New Tab - Otevřít odkaz v nové kartě - <title>about:blank</title> <title>about:blank</title> @@ -8184,32 +8026,10 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur <li>If your computer or network is protected by a firewall or proxy, make sure the application is permitted to access the network.</li> <li>Pokud je váš počítač nebo síť chráněn firewallem nebo proxy, ujistěte se, že programu je povoleno přistupovat k síti.</li> - - - IndexWindow &Look for: &Hledat: - - Open Link - Otevřít adresu odkazu - - - Open Link as New Page - Otevřít odkaz jako novou stránku - - - Open Link in New Tab - Otevřít odkaz v nové kartě - - - - InputPane - - Type Ctrl-<Return> to execute a line. - Řádek můžete provést pomocí <Ctrl-Return>. - ::Core @@ -8468,15 +8288,7 @@ ve svém .pro souboru. - MakeStep - - Override %1: - Přepsat %1: - - - Make arguments: - Argumenty příkazového řádku pro 'make': - + ::ProjectExplorer MyMain @@ -8504,17 +8316,6 @@ ve svém .pro souboru. Přezdívky - - OpenWithDialog - - Open File With... - Otevřít soubor s... - - - Open file extension with: - Otevřít souborovou příponu s: - - ::Perforce @@ -9054,29 +8855,6 @@ ve svém .pro souboru. Uživatel: - - PluginDialog - - Details - Podrobnosti - - - Error Details - Podrobnosti o chybě - - - Installed Plugins - Nainstalované přídavné moduly - - - Plugin Details of %1 - Popis přídavného modulu %1 - - - Plugin Errors of %1 - Chyby přídavného modulu %1 - - ::ExtensionSystem @@ -9523,10 +9301,6 @@ ve svém .pro souboru. Do you really want to delete build configuration <b>%1</b>? Opravdu chcete smazat nastavení sestavování <b>%1</b>? - - Rename - Přejmenovat - Remove Build Configuration Odstranit nastavení sestavování @@ -10919,10 +10693,6 @@ přidat do správy verzí (%2)? Location: Umístění: - - <Current File> - <Nynější soubor> - QML Viewer arguments: Argumenty pro prohlížeč QML: @@ -10933,7 +10703,7 @@ přidat do správy verzí (%2)? - QrcEditor + ::ResourceEditor Add Přidat @@ -10954,10 +10724,6 @@ přidat do správy verzí (%2)? Language: Jazyk: - - Alias: - Alias: - ::QmakeProjectManager @@ -12520,9 +12286,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Recheck existence of referenced files Znovu ověřit existenci odkazovaných souborů - - - ::ResourceEditor Open File Otevřít soubor @@ -12544,21 +12307,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf bez názvu - - SaveItemsDialog - - Save Changes - Uložit změny - - - The following files have unsaved changes: - Následující soubory byly změněny: - - - Automatically save all files before building - Automaticky uložit všechny změněné soubory před sestavováním - - SettingsDialog @@ -12571,55 +12319,15 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf - SharedTools::QrcEditor - - Add Files - Přidat soubory - - - Add Prefix - Přidat předponu - - - Choose Copy Location - Vyberte umístění cíle pro kopírování - - - Overwriting Failed - Chyba při přepsání - - - Copying Failed - Kopírování se nezdařilo - + ::ResourceEditor Invalid file Neplatný soubor - - Copy - Kopírovat - - - Skip - Přeskočit - - - Abort - Zrušit - The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file. Soubor %1 se nenachází v podadresáři zdrojového souboru. Přidáním by vznikl nepkatný zdrojový soubor. - - Invalid file location - Neplatné umístění souboru - - - The file %1 is not in a subdirectory of the resource file. You now have the option to copy this file to a valid location. - Soubor %1 se nenachází v podadresáři souboru s prostředky. Nyní máte možnost zkopírovat tento soubor do platného umístění. - Choose copy location Vyberte umístění cíle pro kopírování @@ -12628,21 +12336,10 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Overwrite failed Chyba při přepsání - - Could not overwrite file %1. - Soubor %1 se nepodařilo přepsat. - Copying failed Kopírování se nezdařilo - - Could not copy the file to %1. - Soubor se nepodařilo zkopírovat do %1. - - - - SharedTools::ResourceView Add Files... Přidat soubory... @@ -12651,14 +12348,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Change Alias... Změnit přezdívku... - - Add Prefix... - Přidat předponu... - - - Change Prefix... - Změnit předponu... - Change Language... Změnit jazyk... @@ -12675,10 +12364,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Open file Otevřít soubor - - All files (*) - Všechny soubory (*) - Change Prefix Změnit předponu @@ -12691,53 +12376,21 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Change Language Změnit jazyk - - Language: - Jazyk: - Change File Alias Změnit soubor s přezdívkou Alias: - Přezdívka: + Přezdívka: - ShortcutSettings - - Keyboard Shortcuts - Klávesové zkratky - - - Filter: - Filtr: - - - Command - Příkaz - - - Label - Popis - - - Shortcut - Zkratka - + ::Core Defaults Výchozí - - Import... - Zavést... - - - Export... - Vyvést... - Key Sequence Pořadí kláves @@ -12746,14 +12399,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Shortcut: Klávesová zkratka: - - Reset - Nastavit znovu - - - Remove - Odstranit - ShowBuildLog @@ -12763,11 +12408,7 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf - StartExternalDialog - - Start Debugger - Spustit ladicí program - + ::Debugger Executable: Spustitelný soubor: @@ -12788,14 +12429,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf &Arguments: &Argumenty: - - Run in &terminal: - Spustit v &terminálu: - - - &Working directory: - &Pracovní adresář: - &Tool chain: Sada &nástrojů: @@ -12804,13 +12437,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Break at '&main': Bod přerušení při 'main': - - - StartRemoteDialog - - Start Debugger - Spustit ladicí program - Architecture: Architektura: @@ -12827,10 +12453,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf Server start script: Spouštěcí skript k serveru: - - Debugger: - Ladič: - Local executable: Místní spustitelný soubor: @@ -12843,10 +12465,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf &Debugger: &Ladič: - - Local &executable: - &Místní spustitelný soubor: - &Host and port: &Hostitelský počítač a číslo přípojky: @@ -12871,10 +12489,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf &Use server start script: &Použít spouštěcí skript k serveru: - - &Server start script: - Spouštěcí skript k &serveru: - Location of debugging information: Umístění informací o ladění: @@ -14517,7 +14131,7 @@ Nepoužije se na mezeru v poznámkách a řetězcích. - TopicChooser + ::Help Filter Filtr @@ -14976,11 +14590,7 @@ p, li { white-space: pre-wrap; } - PasteBinComSettingsWidget - - Form - Formulář - + ::CodePaster Server Prefix: Předpona serveru: @@ -14999,10 +14609,6 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://pastebin.com"><span style=" text-decoration: underline; color:#0000ff;">pastebin.com</span></a><span style=" font-size:8pt;"> umožňuje posílat poštu vlastním podřízeným doménám (např. qtcreator.pastebin.com). Vyplňte požadovanou předponu.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Všimněte si, že přídavný modul to bude používat jak pro zasílání tak pro natahování.</span></p></body></html> - - Server prefix: - Předpona serveru: - <html><head/><body> <p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</p> @@ -15011,17 +14617,9 @@ p, li { white-space: pre-wrap; } <p><a href="http://pastebin.com">pastebin.com</a> dovoluje posílání záznamů do uživatelsky stanovených poddomén (např. creator.pastebin.com). Zadejte požadovanou předponu.</p> <p>Všimněte si, že přídavný modul ji použije jak pro posílání tak pro natahování.</p></body></html> - - <a href="http://pastebin.com">pastebin.com</a> allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix. - <a href="http://pastebin.com">pastebin.com</a> dovoluje posílání uživatelsky stanovených subdomén (například creator.pastebin.com). Zadejte požadovanou předponu. - - - <i>Note: The plugin will use this for posting as well as fetching.</i> - <i>Poznámka: Přídavný modul toto použije pro posílání a stejně tak natahování.</i> - - Cvs + ::CVS Prompt to submit Potvrdit předložení @@ -15236,35 +14834,7 @@ p, li { white-space: pre-wrap; } - GeneralSettingsPage - - Form - Formulář - - - Font - Písmo - - - Family: - Písmová rodina: - - - Style: - Styl: - - - Size: - Velikost: - - - Startup - Spuštění - - - On context help: - Související nápověda: - + ::Help Show side-by-side if possible Ukázat, je-li to možné, vedle sebe @@ -15277,10 +14847,6 @@ p, li { white-space: pre-wrap; } Always start full help Vždy spustit plnou nápovědu - - On help start: - Na začátek nápovědy: - Show my home page Ukázat moji domovskou stránku @@ -15297,14 +14863,6 @@ p, li { white-space: pre-wrap; } Home Page: Domovská stránka: - - Use &Current Page - Použít &nynější stranu - - - Use &Blank Page - Použít &prázdnou stranu - Restore to Default Obnovit výchozí nastavení @@ -15313,66 +14871,6 @@ p, li { white-space: pre-wrap; } Help Bookmarks Záložky v nápovědě - - Import... - Zavést... - - - Export... - Vyvést... - - - Show Side-by-Side if Possible - Ukázat, je-li to možné, vedle sebe - - - Always Show Side-by-Side - Ukázat vždy vedle sebe - - - Always Start Full Help - Vždy spustit plnou nápovědu - - - Show My Home Page - Ukázat moji domovskou stránku - - - Show a Blank Page - Ukázat prázdnou stránku - - - Show My Tabs from Last Session - Ukázat mé karty z posledního sezení - - - Home page: - Domovská stránka: - - - Always Show Help in External Window - Vždy ukazovat nápovědu v odděleném okně - - - Reset to default - Nastavit znovu výchozí - - - Reset - Nastavit znovu - - - Behaviour - Chování - - - Switch to editor context after last help page is closed. - Přepnout do editoru po zavření poslední stránky s nápovědou. - - - Return to editor on closing the last page - Vrátit se do editoru po zavření poslední stránky s nápovědou - ::Core @@ -15609,14 +15107,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Resume Session Pokračování v sezení - - %1 (last session) - %1 (poslední sezení) - - - %1 (current session) - %1 (nynější sezení) - Open Project... Otevřít projekt... @@ -16604,43 +16094,14 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com). Poznámka: Zadejte název hostitelského počítače (serveru) pro službu CodePaster bez protokolové předpony (například: codepaster.mycompany.com). - - - PasteBinDotComProtocol Error during paste Chyba při vkládání - - - PasteBinDotComSettings Pastebin.com Pastebin.com - - Code Pasting - Vkládání kódu - - - - PasteView - - Paste - Vložit - - - <Username> - <Uživatelské jméno> - - - <Description> - <Popis> - - - <Comment> - <Poznámka> - ::CppEditor @@ -16726,7 +16187,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás - Cvs + ::CVS Checks out a project from a CVS repository. Odhlásí projekt ze skladiště CVS. @@ -17460,17 +16921,13 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Reset Nastavit znovu - - Help Bookmarks - Záložky v nápovědě - Import... - Importovat... + Importovat... Export... - Exportovat... + Exportovat... Behaviour @@ -20553,69 +20010,18 @@ a předpokladem je, že vzdálený spustitelný soubor bude v adresáři zmiňov Cleaning %1 Uklízí se %1 - - - CommonSettingsPage - - Wrap submit message at: - Zalomit popis předložení na: - - - characters - znacích - - - An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. - Spustitelný soubor, který je zavolán s popisem předložení v dočasném souboru jako první argument příkazového řádku. Při neúspěchu by měl vrátit zpět hodnotu rozdílnou od nuly (!= 0) a odpovídající zprávu o obvyklé chybě kvůli poukázání na selhání. - Submit message check script: Skript k ověření popisu předložení: - - A file listing user names and email addresses in a 4-column mailmap format: -name <email> alias <email> - Soubor, který obsahuje jména uživatelů a e-mailové adresy ve čtyřsloupcovém formátu (mailmap): -Jméno <E-mail> Přezdívka <E-mail> - User/alias configuration file: Soubor s nastavením uživatele/přezdívky: - - A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. - Soubor, který obsahuje řádky s názvy polí (například "Reviewed-By:"), který bude bude přidán pod okno editoru předložení. - User fields configuration file: Soubor s nastavením polí uživatele: - - Submit message &check script: - Skript k ověření popisu předložení: - - - User/&alias configuration file: - Soubor s nastavením uživatele/&přezdívky: - - - User &fields configuration file: - Soubor s nastavením p&olí uživatele: - - - &Patch command: - &Příkaz pro opravný soubor: - - - Specifies a command that is executed to graphically prompt for a password, -should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS). - Určuje příkaz, který je spuštěn, aby graficky vyzval k zadání hesla, které je požadováno při ověření pravosti SSH skladiště -(podívejte se na dokumentaci k SSH k proměnné prostředí SSH-ASKPASS). - - - &SSH prompt command: - &Příkaz pro výzvu o heslo k SSH: - BorderImageSpecifics @@ -21425,10 +20831,6 @@ should a repository require SSH-authentication (see documentation on SSH and the blocks do not introduce a new scope, avoid Bloky neuvádějí novou oblast, a mělo by se jich z toho důvodu vyvarovat - - unintentional empty block, use ({}) for empty object literal - nezamýšlený prázdný blok, použijte ({}) jako prázdný objekt tvořený písmeny - use of the with statement is not recommended, use a var instead od použití s-příkazem se zrazuje, místo toho by se mělo použít var @@ -21441,18 +20843,10 @@ should a repository require SSH-authentication (see documentation on SSH and the avoid comma expressions od použití výrazů s čárkou se zrazuje - - expression statements should be assignments, calls or delete expressions only - Příkazy s výrazy by měly být jen přiřazení, volání funkcí nebo výrazy delete - 'new' should only be used with functions that start with an uppercase letter 'new' by se měl používat jen s funkcemi, které začínají velkým písmenem - - calls of functions that start with an uppercase letter should use 'new' - Funkce, které začínají velkým písmenem, by se měly volat s 'new' - avoid assignments in conditions od přiřazení v podmínkách se zrazuje @@ -22217,7 +21611,7 @@ heslem, jež můžete zadat níže. - Cvs + ::CVS Annotate revision "%1" Opatřit anotacemi revizi "%1" @@ -22382,7 +21776,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - Find::FindPlugin + ::Core &Find/Replace &Hledat/Nahradit @@ -23488,34 +22882,10 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Qt Application Program Qt - - - TargetSettingsPanelFactory Targets Cíle - - Build & Run - Sestavení a spuštění - - - - RunSettingsPanelFactory - - Run Settings - Nastavení spuštění - - - - RunSettingsPanel - - Run Settings - Nastavení spuštění - - - - ::ProjectExplorer Enter the name of the session: Zadejte název sezení: @@ -23990,7 +23360,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - FileWidget + ::QmlEditorWidgets Open File Otevřít soubor @@ -24971,16 +24341,10 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v Debugging Port: Přípojka pro ladění: - - - QmlManager <Current File> <Nynější soubor> - - - ::QmlProjectManager Run QML Script Spustit skript QML @@ -25596,7 +24960,7 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné - ContextPaneTextWidget + ::QmlEditorWidgets Text Text @@ -25634,7 +24998,7 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné - ContextPaneWidgetBorderImage + ::QmlEditorWidgets Form Formulář @@ -25663,13 +25027,6 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné 10 x 10 10 x 10 - - - ContextPaneWidgetImage - - Form - Formulář - The image is scaled to fit Velikost obrázku je změněna tak, že vyplní plochu @@ -25694,10 +25051,6 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné The image is scaled uniformly to fill, cropping if necessary Velikost obrázku je změněna rovnoměrně, ořezání, pokud je potřeba - - 10 x 10 - 10 x 10 - The image is scaled to fit. Velikost obrázku je změněna tak, že vyplní plochu. @@ -25722,13 +25075,6 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné The image is scaled uniformly to fill, cropping if necessary. Velikost obrázku je změněna rovnoměrně, ořezání, pokud je potřeba. - - - ContextPaneWidgetRectangle - - Form - Formulář - Gradient Přechod @@ -25737,17 +25083,10 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné Color Barva - - ... - ... - Border Okraj - - - EasingContextPane Dialog Dialog @@ -26789,33 +26128,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Použít pomocné knihovny pro výstup dat Python GDB - - StartRemoteEngineDialog - - Start Remote Engine - Spustit vzdálený stroj - - - &Host: - &Hostitel: - - - &Username: - &Uživatelské jméno: - - - &Password: - He&slo: - - - &Engine path: - Cesta ke &stroji: - - - &Inferior path: - &Podřízená cesta: - - ::Git @@ -27033,22 +26345,15 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap - ComponentNameDialog + ::QmlJSEditor Dialog Dialog - - Component name: - Název součástky: - Choose... Vybrat... - - - ::QmlJSEditor Form Formulář @@ -27074,25 +26379,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Panel nástrojů Qt Quick - - StatusDisplay - - No QML events recorded - Nebyly nahrány žádné události QML - - - Profiling application - Profiluje se aplikace - - - Loading data - Nahrávají se data - - - Application stopped before loading all data - Program zastaven před nahráním všech dat - - TimeDisplay @@ -27598,9 +26884,6 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto Compiler: Překladač: - - - ::QtSupport Version name: Název verze: @@ -27613,9 +26896,6 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto Edit Upravit - - - ::QtSupport Name Název @@ -27641,45 +26921,6 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto Přidat... - - GenericLinuxDeviceConfigurationWizardSetupPage - - WizardPage - Stránka průvodce - - - The name to identify this configuration: - Název nastavení: - - - The device's host name or IP address: - Název hostitelského počítače nebo IP adresa zařízení: - - - The user name to log into the device: - Uživatelské jméno pro přihlášení se k zařízení: - - - The authentication type: - Druh ověření pravosti: - - - Password - Heslo - - - Key - Klíč - - - The user's password: - Heslo uživatele: - - - The file containing the user's private key: - Soubor se soukromým klíčem uživatele: - - LinuxDeviceFactorySelectionDialog @@ -28079,9 +27320,6 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto Save Suppression Uložit soubor vyloučení - - - ::Valgrind Generic Settings Obecná nastavení @@ -28865,7 +28103,7 @@ With cache simulation, further event counters are enabled: - ExampleDelegate + ::Core Tags: Klíčová slova: @@ -28913,26 +28151,15 @@ With cache simulation, further event counters are enabled: - RecentProjects + ::ProjectExplorer Recently Edited Projects Naposledy upravované projekty - - - RecentSessions Recently Used Sessions Naposledy používaná sezení - - %1 (last session) - %1 (poslední sezení) - - - %1 (current session) - %1 (nynější sezení) - TagBrowser @@ -28942,7 +28169,7 @@ With cache simulation, further event counters are enabled: - QmlEditorWidgets::ContextPaneWidget + ::QmlEditorWidgets Hides this toolbar. Skryje tento panel nástrojů. @@ -28963,9 +28190,6 @@ With cache simulation, further event counters are enabled: Hides this toolbar. This toolbar can be permanently disabled in the options page or in the context menu. Skryje tento panel nástrojů. Tento panel může být v nastavení nebo v kontextové nabídce trvale zakázán. - - - QmlEditorWidgets::ContextPaneWidgetImage double click for preview Dvojité klepnutí pro náhled @@ -28975,13 +28199,6 @@ With cache simulation, further event counters are enabled: Dvojité klepnutí pro náhled. - - QmlEditorWidgets::FileWidget - - Open File - Otevřít soubor - - ::QmlJS @@ -29986,9 +29203,6 @@ Would you like to overwrite them? %1. Chcete je nechat přepsat? - - - EditorManager Go Back Jít zpět @@ -29997,37 +29211,10 @@ Chcete je nechat přepsat? Go Forward Jít vpřed - - Split - Rozdělit - - - Split Side by Side - Rozdělit jedno vedle druhého - - - Open in New Window - Otevřít v novém okně - Close Document Zavřít dokument - - Close - Zavřít - - - Next Open Document in History - Další otevřený dokument na seznamu - - - Previous Open Document in History - Předchozí otevřený dokument na seznamu - - - - ::Core Could not find executable for '%1' (expanded '%2') @@ -30272,13 +29459,6 @@ správy verzí (%2) Spojuje se s %1... - - CheckUndefinedSymbols - - Expected a namespace-name - Požadováno zadání jmenného prostoru - - ::CppEditor @@ -30317,10 +29497,6 @@ správy verzí (%2) Generate missing Q_PROPERTY members... Doplnit chybějící prvky Q_PROPERTY... - - Generate Missing Q_PROPERTY Members... - Doplnit chybějící prvky Q_PROPERTY... - Expand All Rozbalit vše @@ -30437,7 +29613,7 @@ Příznaky: %3 - Cvs + ::CVS Ignore whitespace Nevšímat si bílých znaků @@ -31781,14 +30957,7 @@ když bude zavolán mimo git bash. - ::GLSLEditor - - GLSL - GLSL - - - - GLSLEditor::Internal::GLSLEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -31826,9 +30995,6 @@ když bude zavolán mimo git bash. Vertex Shader (Desktop OpenGL) Vertex Shader (Desktop OpenGL) - - - GLSLEditor::GLSLFileWizard New %1 Nový %1 @@ -31867,9 +31033,6 @@ když bude zavolán mimo git bash. Pause Animation Pozastavit animaci - - - ::ImageViewer Zoom In Přiblížit @@ -32747,14 +31910,6 @@ a vlastností součástek QML přímo. Component name: Název součástky: - - Dialog - Dialog - - - Choose... - Vybrat... - Show Qt Quick ToolBar Ukázat nástrojový pruh Qt Quick @@ -32767,16 +31922,6 @@ a vlastností součástek QML přímo. Refactoring Refactoring - - - QmlJsEditor - - QML - QML - - - - ::QmlJSEditor QML/JS Usages: Použití QML/JS: @@ -34848,7 +33993,7 @@ Vyžaduje <b>Qt 4.7.0</b> nebo novější. - BaseQtVersion + ::QtSupport The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4). Překladač '%1' (%2) nemůže vytvořit kód pro Qt ve verzi '%3' (%4). @@ -34913,9 +34058,6 @@ Vyžaduje <b>Qt 4.7.0</b> nebo novější. Building helpers Pomocné knihovny pro sestavení - - - ::QtSupport Getting Started Jak začít @@ -35040,10 +34182,6 @@ Důvod: %2 The following ABIs are currently not supported:<ul><li>%1</li></ul> Následující ABIs nejsou v současnosti podporovány: <ul><li>%1</ul> - - Building helpers - Pomocné knihovny pro výstup dat - Debugging Helper Build Log for '%1' Záznam o sestavení pomocného ladicího programu pro '%1' @@ -35137,9 +34275,6 @@ Důvod: %2 SBS v2 directory: Adresář SBS-v2: - - - ::QtSupport MinGW from %1 MinGW z %1 @@ -35198,9 +34333,6 @@ Důvod: %2 New Generic Linux Device Configuration Setup Zřízení nového nastavení zařízení pro obecný Linux - - - ::RemoteLinux Connection Data Data připojení @@ -35217,9 +34349,6 @@ Důvod: %2 Generic Linux Device Obecné linuxové zařízení - - - ::RemoteLinux Setup Finished Nastavení dokončeno @@ -35234,16 +34363,10 @@ In addition, device connectivity will be tested. Bude vytvořeno nové nastavení zařízení. Dodatečně bude vyzkoušeno spojení se zařízením. - - - ::RemoteLinux (default for %1) (výchozí pro %1) - - - ::RemoteLinux Start Wizard Spustit průvodce @@ -35256,9 +34379,6 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Available device types: Dostupné typy zařízení: - - - ::RemoteLinux Device with MADDE support (Fremantle, Harmattan, MeeGo) Zařízení s podporou pro MADDE-(Fremantle, Harmattan, MeeGo) @@ -35275,9 +34395,6 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Other MeeGo OS Jiné MeeGo OS - - - ::RemoteLinux Testing configuration. This may take a while. Zkouší se nastavení. Může to nějakou dobu trvat. @@ -35344,16 +34461,10 @@ Dodatečně bude vyzkoušeno spojení se zařízením. List of installed Qt packages: Seznam nainstalových balíčků Qt: - - - ::RemoteLinux Installing package to device... Instaluje se balíček na zařízení... - - - ::RemoteLinux No matching packaging step found. Nepodařilo se najít žádný odpovídající krok balíčkování. @@ -35366,9 +34477,6 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Deploy package via UTFS mount Nasazení prostřednictvím UTFS mount - - - ::RemoteLinux All files copied. Všechny soubory zkopírovány. @@ -35377,9 +34485,6 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Deploy files via UTFS mount Nasazení souborů prostřednictvím UTFS mount - - - ::RemoteLinux Choose Icon (will be scaled to %1x%1 pixels, if necessary) Vyberte ikonu (její velikost bude změněna na %1x%1 pixelů, pokud to bude potřeba) @@ -35400,9 +34505,6 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Could not save icon to '%1'. Ikonu se nepodařilo uložit pod '%1'. - - - ::RemoteLinux General Information Obecné informace @@ -35411,16 +34513,10 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Device Status Check Přezkoušení stavu zařízení - - - ::RemoteLinux Existing Keys Check Přezkoušení již existujících klíčů - - - ::RemoteLinux Key Creation Vytvoření klíče @@ -35449,9 +34545,6 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Could Not Save Key File Chyba při ukládání souboru s klíčem - - - ::RemoteLinux Key Deployment Nasazení klíče @@ -35472,23 +34565,14 @@ Dodatečně bude vyzkoušeno spojení se zařízením. The key was successfully deployed. You may now close the "%1" application and continue. Klíč byl úspěšně poslán. Nyní můžete program "%1" zavřít a pokračovat. - - - ::RemoteLinux The new device configuration will now be created. Nyní bude vytvořeno nové nastavení zařízení. - - - ::RemoteLinux New Device Configuration Setup Zřízení nového nastavení zařízení - - - ::RemoteLinux SDK Connectivity Propojitelnost SDK @@ -35501,16 +34585,10 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Unknown OS Neznámý operační systém - - - ::RemoteLinux Cannot deploy to sysroot: No packaging step found. Nelze provést žádné nasazení do sysroot: Nenalezen žádný balíčkovací krok. - - - ::RemoteLinux Cannot install to sysroot without build configuration. Bez nastavení sestavování nelze provést žádnou instalaci na sysroot. @@ -35531,23 +34609,14 @@ Dodatečně bude vyzkoušeno spojení se zařízením. Installation to sysroot failed, continuing anyway. Instalace balíčku na sysroot se nezdařila, ale pokračuje se. - - - ::RemoteLinux Install Debian package to sysroot Instalovat balíček Debian na sysroot - - - ::RemoteLinux Install RPM package to sysroot Instalovat balíček RPM na sysroot - - - ::RemoteLinux Cannot copy to sysroot without build configuration. Bez nastavení sestavování nelze na sysroot kopírovat. @@ -35570,9 +34639,6 @@ ale přesto se pokračuje dál. Copy files to sysroot Kopírovat soubory na sysroot - - - ::RemoteLinux Package up to date. Balíček je nejnovější. @@ -35609,9 +34675,6 @@ ale přesto se pokračuje dál. Exit code: %1 Kód ukončení: %1 - - - ::RemoteLinux Create Debian Package Vytvořit soubor balíčku Debian @@ -35652,9 +34715,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Error: Could not create file '%1'. Chyba: Soubor '%1' se nepodařilo vytvořit. - - - ::RemoteLinux Create RPM Package Vytvořit soubor balíčku RPM @@ -35663,9 +34723,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Could not move package file from %1 to %2. Soubor s balíčkem se nepodařilo přesunout z %1 do %2. - - - ::RemoteLinux Ignore missing files Nevšímat si chybějících souborů @@ -35678,9 +34735,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Create tarball: Vytvořit Tarovu kouli (tarball): - - - ::RemoteLinux Size should be %1x%2 pixels Požadovaná velikost: %1x%2 pixelů @@ -35729,9 +34783,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Could Not Set Version Number Nepodařilo se nastavit číslo verze - - - ::RemoteLinux Canceled. Zrušeno. @@ -35874,9 +34925,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.You have not set an icon for the package manager. The icon must be set in Projects -> Run -> Create Package -> Details. Nezadal jste ikonu pro správce balíčků. Je potřeba ji nastavit v Projekty -> Spuštění -> Vytvoření balíčku -> Podrobnosti. - - - ::RemoteLinux Publishing to Fremantle's "Extras-devel/free" Repository Zveřejnění ve skladišti Fremantle "Extras-devel/free" @@ -35889,9 +34937,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Choose a private key file Vyberte soubor se soukromým klíčem - - - ::RemoteLinux Publish for "Fremantle Extras-devel free" repository Zveřejnění ve skladišti Fremantle "Extras-devel/free" @@ -35900,9 +34945,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.This wizard will create a source archive and optionally upload it to a build server, where the project will be compiled and packaged and then moved to the "Extras-devel free" repository, from where users can install it onto their N900 devices. For the upload functionality, an account at garage.maemo.org is required. Tento průvodce vytvoří zdrojový archiv a volitelně jej nahraje na sestavovací server, kde bude projekt sestaven, zabalen a potom přesunut do skladiště "Extras-devel free", odkud jej mohou uživatelé instalovat na svá zařízení N900. Pro funkci nahrávání je potřeba přihlášení k garage.maemo.org. - - - ::RemoteLinux Publishing to Fremantle's "Extras-devel free" Repository Zveřejnění ve skladišti Fremantle "Extras-devel/free" @@ -35919,9 +34961,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Result Výsledek - - - ::RemoteLinux Error: Copy command failed. Chyba: Příkaz ke kopírování selhal. @@ -35930,9 +34969,6 @@ Dojde k pokusu o vytvoření balíčku, mohou se ale vyskytnout potíže.Copying file '%1' to directory '%2' on the device... Kopíruje se soubor '%1' do adresáře '%2' na zařízení... - - - ::RemoteLinux No directories to mount Žádné adresáře k připojení @@ -35993,9 +35029,6 @@ Chybový výstup byl: '%1' Timeout waiting for UTFS servers to connect. Překročení časového omezení při čekání na spojení se serverem UTFS. - - - ::RemoteLinux Local directory Místní adresář @@ -36004,16 +35037,10 @@ Chybový výstup byl: '%1' Remote mount point Vzdálený přípojný bod - - - ::RemoteLinux Not enough free ports on the device. Na zařízení není dostatek volných přípojek. - - - ::RemoteLinux Choose directory to mount Vyberte, prosím, adresář, který se má připojit @@ -36051,16 +35078,10 @@ Chybový výstup byl: '%1' Varování: Chcete připojit %1 adresářů, ale vaše zařízení má v režimu ladění dostupných jen %n přípojek.<br>S tímto nastavením nebudete moci provést ladění vašeho programu. - - - ::RemoteLinux Run on device Spustit na zařízení - - - ::RemoteLinux Qemu error Chyba v Qemu @@ -36081,23 +35102,14 @@ Chybový výstup byl: '%1' Qemu is currently configured to auto-detect the OpenGL mode, which is known to not work in some cases. You might want to use software rendering instead. V současnosti je Qemu nastaveno tak, aby byl režim OpenGL určen automaticky, což, jak je známo, ne vždy pracuje. Místo toho byste mohl použít softwarový rendering. - - - ::RemoteLinux Device Configurations Nastavení zařízení - - - ::RemoteLinux MeeGo Qemu Settings Nastavení Meego QEmu - - - ::RemoteLinux Save Public Key File Uložit soubor s veřejným klíčem @@ -36106,9 +35118,6 @@ Chybový výstup byl: '%1' Save Private Key File Uložit soubor se soukromým klíčem - - - ::RemoteLinux Qemu was not running. It has now been started up for you, but it will take a bit of time until it is ready. Please try again then. Nasazení se nezdařilo, neboť Qemu neběželo. Bylo nyní spuštěno, ale bude ještě potřebovat nějaký čas, než bude připraveno. Pak to, prosím, zkuste znovu. @@ -36129,9 +35138,6 @@ Chybový výstup byl: '%1' Unmounting host directories... Odpojují se hostitelské adresáře... - - - ::RemoteLinux Maemo GCC Maemo GCC @@ -36144,37 +35150,22 @@ Chybový výstup byl: '%1' %1 GCC (%2) %1 GCC (%2) - - - ::RemoteLinux <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> <html><head/><body><table><tr><td>Cesta k MADDE:</td><td>%1</td></tr><tr><td>Cesta k cíli MADDE:</td><td>%2</td></tr><tr><td>Ladič:</td/><td>%3</td></tr></body></html> - - - ::RemoteLinux Successfully uploaded package file. Soubor s balíčkem byl nahrán. - - - ::RemoteLinux Deploy Debian package via SFTP upload Nasazení balíčku Debian prostřednictvím nahrání SFTS - - - ::RemoteLinux Deploy RPM package via SFTP upload Nasazení balíčku RPM prostřednictvím nahrání SFTS - - - ::RemoteLinux Waiting for file name... Čeká se na název souboru... @@ -36199,9 +35190,6 @@ Chybový výstup byl: '%1' Close Zavřít - - - ::RemoteLinux Copy Files to Maemo5 Device Kopírovat soubory na zařízení Maemo5 @@ -36222,9 +35210,6 @@ Chybový výstup byl: '%1' Build Tarball and Install to Linux Host Vytvořit archiv tar a nainstalovat na linuxové zařízení - - - ::RemoteLinux Cannot open file '%1': %2 Soubor '%1' nelze otevřít: %2 @@ -36257,9 +35242,6 @@ Chcete je přidat do projektu?</html> Error creating MeeGo templates Chyba při vytváření předloh MeeGo - - - ::RemoteLinux Unable to create Debian templates: No Qt version set Nepodařilo se vytvořit žádné předlohy pro Debian. Není nastavena žádná verze Qt @@ -36272,9 +35254,6 @@ Chcete je přidat do projektu?</html> Unable to create debian templates: dh_make failed (%1) Nepodařilo se vytvořit žádné soubory předloh pro Debian: dh_make selhal (%1) - - - ::RemoteLinux The .pro file '%1' is being parsed. Soubor .pro '%1' se právě zpracovává. @@ -36301,9 +35280,6 @@ Chcete je přidat do projektu?</html> Remote Linux run configuration default display name Spustit na vzdáleném zařízení - - - ::RemoteLinux (on Remote Generic Linux Host) (na vzdáleném, obecném linuxovém zařízení) @@ -36312,9 +35288,6 @@ Chcete je přidat do projektu?</html> (on Remote Generic Linux Host) (na vzdáleném, obecném linuxovém zařízení) - - - ::RemoteLinux Fetch Device Environment Natáhnout prostředí zařízení @@ -36411,9 +35384,6 @@ Chcete je přidat do projektu?</html> Fetching environment failed: %1 Natažení prostředí se nezdařilo: %1 - - - ::RemoteLinux Starting remote process ... @@ -36432,9 +35402,6 @@ Chcete je přidat do projektu?</html> Vzdálený proces byl ukončen. Vrácená hodnota %1. - - - ::RemoteLinux Run on remote Linux device Spustit na vzdáleném linuxovém zařízení @@ -36728,9 +35695,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Profilování %1 - - - ::Valgrind Valgrind Profile uses the "callgrind" tool to record function calls when a program runs. Profilování Valgrind používá nástroj "callgrind" pro záznam volání funkcí během spuštění programu. @@ -36739,9 +35703,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Profile Costs of this Function and its Callees Náklady na profilování u této funkce a jí volaných funkcí - - - ::Valgrind Callers Volající @@ -36886,9 +35847,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Populating... Vytváří se pohled... - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Všechny funkce s poměrem zahrnutým nákladů větším než %1 (%2 jsou skryty) @@ -36987,9 +35945,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Error occurred parsing valgrind output: %1 Chyba při vyhodnocování výstupu Valgrind %1 - - - ::Valgrind Callee Volaná funkce @@ -37006,9 +35961,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Calls Volání - - - ::Valgrind Previous command has not yet finished. Předchozí příkaz ještě není ukončen. @@ -37045,9 +35997,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Downloading remote profile data... Stahují se vzdálená data profilování... - - - ::Valgrind Function: Funkce: @@ -37116,9 +36065,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Incl. Cost: %1 Zahrnuté náklady: %1 - - - ::Valgrind %1 in %2 %1 v %2 @@ -37127,9 +36073,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. %1:%2 in %3 %1:%2 v %3 - - - ::Valgrind Last-level Poslední úroveň @@ -37186,9 +36129,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Position: Poloha: - - - ::Valgrind No network interface found for remote analysis. Nebylo nalezeno žádné síťové rozhraní pro vzdálenou analýzu. @@ -37221,9 +36161,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. No Network Interface was chosen for remote analysis Nebylo vybráno žádné síťové rozhraní pro dálkově řízený rozbor - - - ::Valgrind No errors found Nenalezeny žádné chyby @@ -37264,9 +36201,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Helgrind Thread ID ID vlákna Helgrind - - - ::Valgrind Location: Umístění: @@ -37279,9 +36213,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Object: Objekt: - - - ::Valgrind Could not parse hex number from "%1" (%2) Nepodařilo se zpracovat šestnáctkové číslo (hexadecimální) z "%1" (%2); není platné @@ -37334,9 +36265,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Unexpected exception caught during parsing. Při zpracování se vyskytla neočekávaná výjimka. - - - ::Valgrind Description Popis @@ -37357,9 +36285,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. File Soubor - - - ::Valgrind Command-line arguments: %1 Argumenty příkazového řádku: %1 @@ -37396,9 +36321,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Application Output Výstup programu - - - ::Valgrind Analyzer Analyzátor @@ -38290,7 +37212,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. - Find::IFindFilter + ::Core Case sensitive Rozlišovat velká a malá písmena @@ -38319,17 +37241,10 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. , , - - - Find::Internal::SearchResultWidget Search was canceled. Hledání bylo zrušeno. - - Cancel - Zrušit - Repeat the search with same parameters Opakovat hledání se stejnými parametry @@ -38338,30 +37253,14 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Search again Hledat ještě jednou - - Replace with: - Nahradit: - Replace all occurrences Nahradit všechny výskyty - - Replace - Nahradit - - - Preserve case - Zachovat velikost písmen - This change cannot be undone. Tuto změnu nelze vrátit zpět. - - Do not warn again - Nevarovat znovu - The search resulted in more than %n items, do you still want to continue? @@ -38558,9 +37457,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? Connection error: %1 Chyba ve spojení: %1 - - - ::RemoteLinux Deployment failed: %1 Nasazení se nezdařilo: %1 @@ -38581,9 +37477,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? Deploy step finished. Nasazení hotovo. - - - ::RemoteLinux SFTP initialization failed: %1 Spuštění SFTP se nezdařilo: %1 @@ -38624,9 +37517,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? Uploading file '%1'... Nahrává se soubor '%1'... - - - ::RemoteLinux Incremental deployment Přírůstkové nasazení @@ -38721,9 +37611,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? Následující zadané porty se na zařízení používají: %1 - - - ::RemoteLinux Preparing SFTP connection... Připravuje se spojení SFTP... @@ -38748,9 +37635,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? Failed to upload package: %2 Chyba při nahrávání balíčku: %2 - - - ::RemoteLinux Updateable Project Files Aktualizovatelné projektové soubory @@ -38771,9 +37655,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? &Uncheck All Odstranit označení u vš&eho - - - ::RemoteLinux Run custom remote command Spustit uživatelskystanovený vzdálený příkaz @@ -38802,9 +37683,6 @@ Je zařízení připojeno a nastaveno pro síťový přístup? Remote command finished successfully. Vzdálený příkaz byl úspěšně vykonán. - - - ::RemoteLinux Deploy to Remote Linux Host Nasadit na vzdáleném linuxovém zařízení @@ -38817,16 +37695,10 @@ Je zařízení připojeno a nastaveno pro síťový přístup? (No device) (Žádné zařízení) - - - ::RemoteLinux <b>%1 using device</b>: %2 <b>%1 za použití zařízení</b>: %2 - - - ::RemoteLinux Error running remote process: %1 Chyba při spouštění vzdáleného procesu na zařízení: %1 @@ -38853,9 +37725,6 @@ Remote stderr was: '%1' Vzdálený chybový výstup byl: '%1' - - - ::RemoteLinux Connection failure: %1 Chyba při vytváření spojení: %1 @@ -38898,9 +37767,6 @@ Remote stderr was: %1 Vzdálený chybový výstup byl: '%1' - - - ::RemoteLinux Could not start remote process: %1 Vzdálený proces se nepodařilo spustit: %1 @@ -38915,9 +37781,6 @@ Remote error output was: %1 Vzdálený chybový výstup byl: %1 - - - ::RemoteLinux SSH Key Configuration Nastavení klíče SSH @@ -38966,9 +37829,6 @@ Vzdálený chybový výstup byl: %1 Failed to create directory: '%1'. Adresář '%1' se nepodařilo vytvořit. - - - ::RemoteLinux Public key error: %1 Chyba ve veřejném klíči: %1 @@ -38977,9 +37837,6 @@ Vzdálený chybový výstup byl: %1 Key deployment failed: %1. Nasazení klíče se nezdařilo: %1. - - - ::RemoteLinux Select Sysroot Vybrat Sysroot @@ -39028,9 +37885,6 @@ Vzdálený chybový výstup byl: %1 Running command: %1 Provádí se příkaz: %1 - - - ::RemoteLinux Packaging finished successfully. Vytvoření balíčku úspěšně dokončeno. @@ -39080,9 +37934,6 @@ Vzdálený chybový výstup byl: %1 Create tarball Vytvořit Tarovu kouli (archiv tar) - - - ::RemoteLinux (default) (výchozí) @@ -39091,9 +37942,6 @@ Vzdálený chybový výstup byl: %1 %1 (default) %1 (výchozí) - - - ::RemoteLinux No tarball creation step found. Nepodařilo se najít žádný odpovídající krok k vytvoření archivu tar. @@ -41139,9 +39987,6 @@ Tyto předpony se používají dodatečně k nynějšímu názvu souboru na Pře You can enter lists and ranges like this: '1024,1026-1028,1030'. Můžete zadat seznamy a oblasti jako jsou tyto: 1024,1026-1028,1030. - - - ::RemoteLinux WizardPage WizardPage @@ -41174,16 +40019,10 @@ Tyto předpony se používají dodatečně k nynějšímu názvu souboru na Pře The file containing the user's private key: Soubor se soukromým klíčem uživatele: - - - ::RemoteLinux Device Test Zkouška zařízení - - - ::RemoteLinux Form Formulář @@ -41204,9 +40043,6 @@ Tyto předpony se používají dodatečně k nynějšímu názvu souboru na Pře Files to deploy: Soubory pro nasazení: - - - ::RemoteLinux List of Remote Processes Seznam vzdálených procesů @@ -41869,23 +40705,11 @@ Jméno <E-mail> alias <E-mail>. - develop - - Develop - Vývoj - - - Sessions - Sezení - + ::ProjectExplorer Recent Projects Naposledy otevřené projekty - - New Project - Nový projekt - Open Project Otevřít projekt @@ -41896,7 +40720,7 @@ Jméno <E-mail> alias <E-mail>. - examples + ::QtSupport Examples Příklady @@ -41970,7 +40794,7 @@ Jméno <E-mail> alias <E-mail>. - tutorials + ::QtSupport Tutorials Návody @@ -42007,11 +40831,7 @@ Jméno <E-mail> alias <E-mail>. - SessionItem - - Clone - Klonovat - + ::ProjectExplorer Rename Přejmenovat @@ -42020,9 +40840,6 @@ Jméno <E-mail> alias <E-mail>. Delete Smazat - - - Sessions %1 (last session) %1 (poslední sezení) @@ -42046,7 +40863,7 @@ Jméno <E-mail> alias <E-mail>. - StaticAnalysisMessages + ::QmlJS do not use '%1' as a constructor '%1' se nesmí používat jako konstruktor @@ -42063,22 +40880,10 @@ Jméno <E-mail> alias <E-mail>. number value expected Očekávána číselná hodnota - - boolean value expected - Očekávána logická hodnota - - - string value expected - Očekáván řetězec - invalid URL Neplatná adresa (URL) - - file or directory does not exist - Soubor nebo adresář neexistuje - invalid color Neplatná barva @@ -42107,14 +40912,6 @@ Jméno <E-mail> alias <E-mail>. invalid property name '%1' Neplatný název vlastnosti '%1' - - '%1' does not have members - ' %1' nemá členy - - - '%1' is not a member of '%2' - ' %1' nepatří k '%2' - assignment in condition Přiřazení v podmínce @@ -42127,10 +40924,6 @@ Jméno <E-mail> alias <E-mail>. do not use 'eval' Nepoužívat 'eval' - - unreachable - Nedosažitelná - do not use 'with' Nepoužívat 'with' @@ -42239,10 +41032,6 @@ Jméno <E-mail> alias <E-mail>. calls of functions that start with an uppercase letter should use 'new' Funkce začínající velkým písmenem by se měly volat s 'new' - - 'new' should only be used with functions that start with an uppercase letter - 'new' by se měl používat jen s funkcemi, které začínají velkým písmenem - use spaces around binary operators Užívat mezery okolo binárních operátorů @@ -44878,7 +43667,7 @@ reference k prvkům v jiných souborech, smyčkách atd.) - ButtonsBar + ::Tracing Jump to previous event Jít na předchozí událost @@ -45021,14 +43810,6 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a ::QtSupport - - Examples - Příklady - - - Tutorials - Návody - Copy Project to writable Location? Má se projekt zkopírovat do zapisovatelného umístění? @@ -45080,9 +43861,6 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a Embedded Linux Vložený Linux - - - ::RemoteLinux Double-click to edit the project file Dvojité klepnutí pro úpravu souboru s projektem @@ -46669,7 +45447,7 @@ Nainstalujte, prosím, alespoň jedno SDK. - DeviceProcessesDialog + ::ProjectExplorer &Attach to Process &Připojit k procesu @@ -47227,10 +46005,6 @@ Zasáhnutí do modulu nebo nastavení bodů přerušení podle souboru, a oček &Filter: &Filtr: - - &Attach to Process - &Připojit k procesu - Remote Error Vzdálená chyba @@ -48091,9 +46865,6 @@ nelze najít v cestě. Run %1 Spustit %1 - - - ::QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. Knihovna Qt k použití pro všechny projekty používající tuto sadu.<br>Je požadována verze Qt pro projekty založené na qmake a jako volitelná při použití jiných sestavovacích systémů. @@ -48110,9 +46881,6 @@ nelze najít v cestě. %1 (invalid) %1 (neplatný) - - - ::QtSupport Qt version Verze Qt @@ -48136,9 +46904,6 @@ nelze najít v cestě. Deploy Public Key... Poslat veřejný klíč... - - - ::RemoteLinux Remote process crashed. Vzdálený proces spadl. @@ -48167,23 +46932,14 @@ nelze najít v cestě. Cannot check for free disk space: '%1' is not an absolute path. Nelze ověřit volné místo na disku: '%1' není absolutní cesta. - - - ::RemoteLinux MB MiB - - - ::RemoteLinux Check for free disk space Ověřit volné místo na disku - - - ::RemoteLinux Debugging failed. Ladění se nezdařilo. @@ -48243,9 +46999,6 @@ nelze najít v cestě. Could not copy the file to %1. Soubor se nepodařilo zkopírovat do %1. - - - ::ResourceEditor The file name is empty. Název souboru je prázdný. @@ -48262,9 +47015,6 @@ nelze najít v cestě. Cannot write file. Disk full? Soubor se nepodařilo zapsat. Možná že už na pevném disku není místo pro ukládání? - - - ::ResourceEditor All files (*) Všechny soubory (*) @@ -50955,9 +49705,6 @@ Vzdálený: %4 All Versions Všechny verze - - - ::QtSupport Full path to the host bin directory of the current project's Qt version. Úplná cesta k adresáři bin hostitele verze Qt nynějšího projektu. @@ -50966,9 +49713,6 @@ Vzdálený: %4 Full path to the target bin directory of the current project's Qt version. You probably want %1 instead. Úplná cesta k adresáři bin cíle verze Qt nynějšího projektu. Pravděpodobně místo toho chcete %1. - - - ::QtSupport No factory found for qmake: '%1' Pro QMake nebyla nalezena žádná továrna: '%1' @@ -51531,7 +50275,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - CppQmlTypesLoader + ::QmlJS %1 seems not to be encoded in UTF8 or has a BOM. %1 není kódován v UTF8, nebo nemá BOM. @@ -51993,9 +50737,6 @@ Lze používat části jmen, pokud jsou jednoznačné. Update Code Model Obnovit model kódu - - - QuickFixFactory Create Getter and Setter Member Functions Vytvořit funkce Getter a Setter @@ -52004,9 +50745,6 @@ Lze používat části jmen, pokud jsou jednoznačné. Generate Missing Q_PROPERTY Members... Doplnit chybějící prvky Q_PROPERTY... - - - ::CppEditor Move Definition Outside Class Přesunout definice vně třídy @@ -52065,7 +50803,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - Cvs + ::CVS &Edit Ú&pravy @@ -52782,9 +51520,6 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen Not enough free ports on device for debugging. Na zařízení není dostatek volných portů pro ladění. - - - ::RemoteLinux Checking available ports... @@ -54763,7 +53498,7 @@ se vyskytla chyba - Qt4ProjectManager + ::QtSupport Qt Versions Verze Qt @@ -54789,9 +53524,6 @@ se vyskytla chyba Profiling %1 Profilování %1 - - - ::Valgrind Analyzing Memory Provádí se rozbor paměti @@ -54802,7 +53534,7 @@ se vyskytla chyba - AnalyzerManager + ::Debugger Memory Analyzer Tool finished, %n issues were found. @@ -54827,10 +53559,6 @@ se vyskytla chyba Log file processed, no issues were found. Soubor se záznamem byl zpracován; nebyly nalezeny žádné problémy. - - Debug - Ladění - Release Vydání @@ -54878,16 +53606,10 @@ se vyskytla chyba Process terminated. Proces ukončen. - - - ::Valgrind Valgrind Valgrind - - - ::Valgrind Valgrind Function Profile uses the "callgrind" tool to record function calls when a program runs. Profilování funkcí s Valgrind používá nástroj "callgrind" pro záznam volání funkcí během spuštění programu. @@ -54912,16 +53634,10 @@ se vyskytla chyba Profile Costs of This Function and Its Callees Náklady na profilování u této funkce a jí volaných funkcí - - - ::Valgrind Could not determine remote PID. Nepodařilo se určit PID vzdáleného procesu. - - - ::Valgrind Valgrind Settings Nastavení Valgrind @@ -55205,62 +53921,6 @@ For example, "Revision: 15" will leave the branch at revision 15. ::Core - - &Search - &Hledat - - - Search && &Replace - Hledat a &nahradit - - - Sear&ch for: - &Hledat: - - - Case sensiti&ve - Rozlišující psaní &velkých a malých písmen - - - Whole words o&nly - Pouze celá &slova - - - Use re&gular expressions - Používat re&gulární výrazy - - - Sco&pe: - &Oblast: - - - Find - Hledat - - - Find: - Hledat: - - - ... - ... - - - Replace with: - Nahradit: - - - Replace - Nahradit - - - Replace && Find - Nahradit a hledat - - - Replace All - Nahradit vše - ::Qnx @@ -55645,186 +54305,14 @@ Vytvořte, prosím, aplikaci qmldump na stránce pro nastavení verze Qt. ::Core - - &Find/Replace - &Hledat/Nahradit - - - Advanced Find - Rozšířené hledání - - - Open Advanced Find... - Otevřít rozšířené hledání... - - - Advanced... - Rozšířené... - - - Ctrl+Shift+F - Ctrl+Shift+F - - - Shift+Enter - Shift+Enter - - - Shift+Return - Shift+Return - - - Find/Replace - Hledat/Nahradit - - - Enter Find String - Zadat vzor hledání - - - Ctrl+E - Ctrl+E - - - Find Next - Najít další - - - Find Previous - Najít předchozí - - - Find Next (Selected) - Najít další (vybrané) - - - Ctrl+F3 - Ctrl+F3 - - - Find Previous (Selected) - Najít předchozí (vybrané) - - - Ctrl+Shift+F3 - Ctrl+Shift+F3 - - - Ctrl+= - Ctrl+= - - - Replace && Find Previous - Nahradit a najít předchozí - - - Case Sensitive - Rozlišující velká a malá písmena - - - Whole Words Only - Pouze celá slova - - - Use Regular Expressions - Používat regulární výrazy - - - Preserve Case when Replacing - Zachovat při nahrazování velikost - - - Case sensitive - Rozlišovat velká a malá písmena - - - Whole words - Celá slova - - - Regular expressions - Regulární výrazy - - - Preserve case - Zachovat velikost písmen - - - Flags: %1 - Příznaky: %1 - - - None - Žádné - - - , - , - - - Search was canceled. - Hledání bylo zrušeno. - Repeat the search with same parameters. Opakovat hledání se stejnými parametry. - - Search again - Hledat ještě jednou - Replace all occurrences. Nahradit všechny výskyty. - - This change cannot be undone. - Tuto změnu nelze vrátit zpět. - - - The search resulted in more than %n items, do you still want to continue? - - Výsledkem hledání je více než %n položka. Stále ještě chcete pokračovat? - Výsledkem hledání je více než %n položky. Stále ještě chcete pokračovat? - Výsledkem hledání je více než %n položek. Stále ještě chcete pokračovat? - - - - Continue - Pokračovat - - - No matches found. - Nebyly nalezeny žádné odpovídající shody. - - - %n matches found. - - Nalezena %n shoda. - Nalezeny %n shody. - Nalezeno %n shod. - - - - New Search - Nové hledání - - - Expand All - Rozbalit vše - - - %1 %2 - %1 %2 - - - Collapse All - Složit vše - - - Search Results - Výsledky hledání - Could not find executable for '%1'. Nepodařilo se najít spustitelný soubor pro '%1'. @@ -56265,17 +54753,6 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen Vzdálený: "%1:%2" - Proces %3 - - PrefixLangDialog - - Prefix: - Předpona: - - - Language: - Jazyk: - - ::ResourceEditor diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index e678169e582..2d869f5a331 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -1434,14 +1434,11 @@ Installer en SDK af mindst API version %1. - AutoTest + ::Autotest Testing Tester - - - ::Autotest &Tests &Tests @@ -1502,9 +1499,6 @@ Installer en SDK af mindst API version %1. Selected test was not found (%1). Valgte test blev ikke fundet (%1). - - - ::Autotest Running tests failed. %1 @@ -1544,9 +1538,6 @@ Eksekverbar: %2 Execution took %1. Eksekvering tog %1. - - - ::Autotest Turns failures into debugger breakpoints. Omdanner fejl til fejlretter-brudpunkter. @@ -1625,9 +1616,6 @@ See Google Test documentation for further information on GTest filters. Sæt GTest-filteret til at blive brugt til gruppering. Se Google Test-dokumentation for yderligere information om GTest-filtre. - - - ::Autotest Entering test function %1::%2 Træder ind i testfunktion %1::%2 @@ -1672,9 +1660,6 @@ Se Google Test-dokumentation for yderligere information om GTest-filtre.Test execution took %1 ms. Testeksekvering tog %1 ms. - - - ::Autotest Enables interrupting tests on assertions. Aktiverer afbrydning af tests ved påstande. @@ -1751,9 +1736,6 @@ Warning: Plain text misses some information, such as duration. Advarsel: Ren tekst mangle nogle informationer, såsom varighed. - - - ::Autotest Select Run Configuration Vælg kør-konfiguration @@ -1778,9 +1760,6 @@ Advarsel: Ren tekst mangle nogle informationer, såsom varighed. Working Directory: Arbejdsmappe: - - - ::Autotest AutoTest Plugin WARNING: No files left after filtering test scan folders. Check test filter settings. ADVARSEL for AutoTest-plugin: Ingen filer tilbage efter filtrering af testskanmapper. Tjek testfilterindstillinger. @@ -1833,16 +1812,10 @@ Advarsel: Ren tekst mangle nogle informationer, såsom varighed. Show Data Functions Vis data-funktioner - - - ::Autotest Tests Tests - - - ::Autotest Stop Test Run Stop testkørsel @@ -1963,16 +1936,10 @@ Advarsel: Ren tekst mangle nogle informationer, såsom varighed. %2 - - - ::Autotest AutoTest Debug AutoTest-fejlret - - - ::Autotest Test run canceled by user. Testkørsel annulleret af bruger. @@ -2077,9 +2044,6 @@ Kun desktop kits understøttes. Sørg for at det aktuelt aktive kit er et deskto Build failed. Canceling test run. Byg mislykkedes. Annullerer testkørsel. - - - ::Autotest General Generelt @@ -2182,9 +2146,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Enables grouping of test cases. Aktivér gruppering af testsager. - - - ::Autotest No active test frameworks. Ingen aktive test-frameworks. @@ -2569,7 +2530,7 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba - BaseQtVersion + ::QtSupport Device type is not supported by Qt version. Enhedstypen understøttes ikke af Qt versionen. @@ -3691,7 +3652,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15. - BreakHandler + ::Debugger Breakpoint Brudpunkt @@ -3799,14 +3760,11 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15. - CMakeFilesProjectNode + ::CMakeProjectManager CMake Modules CMake-moduler - - - ::CMakeProjectManager Current CMake: %1 Aktuelle CMake: %1 @@ -4497,9 +4455,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.*** cmake process exited with exit code %1. *** cmake proces afsluttede med afslutningskode %1. - - - CMakeTargetNode Target type: Måltype: @@ -5487,7 +5442,7 @@ p, li { white-space: pre-wrap; } - ContentWindow + ::Help Open Link Åbn link @@ -9123,7 +9078,7 @@ Flag: %3 - Cvs + ::CVS &Edit &Rediger @@ -9761,9 +9716,6 @@ Flag: %3 &Port: &Port: - - - ::Debugger New Ny @@ -10261,9 +10213,6 @@ Flag: %3 Stopped at internal breakpoint %1 in thread %2. Stoppet ved internt brudpunkt %1 i tråd %2. - - - ::Debugger Select Local Cache Folder Vælg lokal mellemlager-mappe @@ -10288,9 +10237,6 @@ Flag: %3 The folder "%1" could not be created. Mappen "%1" kunne ikke oprettes. - - - ::Debugger C++ exception C++-undtagelse @@ -10315,9 +10261,6 @@ Flag: %3 Output: Output: - - - ::Debugger Failed to Start the Debugger Kunne ikke starte fejlretteren @@ -10378,16 +10321,10 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness "Select Widget to Watch": Not supported in state "%1". "Vælg widget som skal overvåges": Understøttes ikke i tilstanden "%1". - - - ::Debugger CDB CDB - - - ::Debugger Startup Placeholder @@ -10433,16 +10370,10 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness <html><head/><body><p>Uses CDB's native console for console applications. This overrides the setting in Environment > System. 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 the configured console and the subsequent attach fails.</p></body></html> <html><head/><body><p>Bruger CDB's egen konsol til konsolprogrammer. Det tilsidesætter indstillingen i Miljø > System. Egen konsol spørger ikke ved afslutning af program. Det er egnet til diagnosticering af sager hvor programmer ikke starter ordentligt i den konfigureret konsol og de efterfølgende mislykkede tilkoblinger.</p></body></html> - - - ::Debugger CDB Paths CDB-stier - - - ::Debugger Symbol Paths Symbolstier @@ -10451,9 +10382,6 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness Source Paths Kildestier - - - ::Debugger Insert Symbol Server... Indsæt symbol-server... @@ -10478,9 +10406,6 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness Configure Symbol paths that are used to locate debug symbol files. Konfigurer symbol-sti som bruges til at lokalisere fejlret-symbol-filer. - - - ::Debugger Behavior Adfærd @@ -10581,9 +10506,6 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness Always adds a breakpoint on the <i>%1()</i> function. Tilføj altid et brudpunkt på <i>%1()</i>-funktionen. - - - ::Debugger Show debug, log, and info messages. Vis fejlretnings-, log- og infomeddelelser. @@ -10604,9 +10526,6 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness Debugger Console Fejlretterkonsol - - - ::Debugger &Copy &Kopiér @@ -10619,9 +10538,6 @@ Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness C&lear &Ryd - - - ::Debugger No Memory Viewer Available Ingen hukommelsesfremviser tilgængelig @@ -10782,16 +10698,10 @@ Sætning af brudpunkter efter filnavn og linjenummer kan mislykkes.Jump to Line %1 Hop til linje %1 - - - ::Debugger Debugging has finished Fejlretning er fuldført - - - ::Debugger The debugger to use for this kit. Fejlretteren som bruges til dette kit. @@ -10804,9 +10714,6 @@ Sætning af brudpunkter efter filnavn og linjenummer kan mislykkes.None Ingen - - - ::Debugger Clear Contents Ryd indhold @@ -10819,9 +10726,6 @@ Sætning af brudpunkter efter filnavn og linjenummer kan mislykkes.Reload Debugging Helpers Genindlæs fejlretningshjælpere - - - ::Debugger Debug Fejlret @@ -10949,9 +10853,6 @@ Påvirket brudpunkter er %1 Tries to install missing debug information. Prøver at installere manglende fejlretinformation. - - - ::Debugger 0x%1 hit Message tracepoint: Address hit. @@ -11360,9 +11261,6 @@ Påvirket brudpunkter er %1 Debugger finished. Fejlretter afsluttet. - - - ::Debugger Configure Debugger... Konfigurer fejlretter... @@ -11583,9 +11481,6 @@ Påvirket brudpunkter er %1 Create Full Backtrace Opret fuld backtrace - - - ::Debugger <new source> <ny kilde> @@ -11642,9 +11537,6 @@ Påvirket brudpunkter er %1 Qt Sources Qt-kilder - - - ::Debugger Expression %1 in function %2 from line %3 to %4 Udtryk %1 i funktion %2 fra linje %3 til %4 @@ -11665,9 +11557,6 @@ Påvirket brudpunkter er %1 Expression too complex Udtryk for kompleks - - - ::Debugger The gdb process failed to start. Gdp-processen kunne ikke starte. @@ -12038,9 +11927,6 @@ Du kan vælge mellem at vente længere tid eller afbryde fejlretning.Oprettelse af forbindelse til fjern-server mislykkedes: %1 - - - ::Debugger General Generelt @@ -12211,23 +12097,14 @@ længere på lansomme maskiner. Værdien bør i dette tilfælde øges.<html><head/><body>Keeps debugging all children after a fork.</body></html> <html><head/><body>Fortsætter fejlretning af alle børn efter en fork.</body></html> - - - ::Debugger GDB Extended GDB udvidet - - - ::Debugger Type Ctrl-<Return> to execute a line. Skriv Ctrl-<Retur> for at eksekvere en linje. - - - ::Debugger Stopping temporarily Stopper midlertidigt @@ -12300,9 +12177,6 @@ længere på lansomme maskiner. Værdien bør i dette tilfælde øges.Error Fejl - - - ::Debugger Use Debugging Helper Brug fejlretningshjælper @@ -12339,9 +12213,6 @@ længere på lansomme maskiner. Værdien bør i dette tilfælde øges.Display string length: Vis strenglængde: - - - ::Debugger Debugger &Log Fejlretter&log @@ -12372,9 +12243,6 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r Log File Logfil - - - ::Debugger Memory at Register "%1" (0x%2) Hukommelse ved register "%1" (0x%2) @@ -12387,9 +12255,6 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r Memory at 0x%1 Hukommelse ved 0x%1 - - - ::Debugger Module Name Modulnavn @@ -12414,9 +12279,6 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r End Address Slutadresse - - - ::Debugger Cannot create temporary file: %1 Kan ikke oprette midlertidig fil: %1 @@ -12429,9 +12291,6 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r Cannot open FiFo %1: %2 Kan ikke åbne FiFo %1: %2 - - - ::Debugger Python Error Python-fejl @@ -12472,9 +12331,6 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r An unknown error in the Pdb process occurred. Der opstod en ukendt fejl i Pdb-processen. - - - ::Debugger C++ debugger activated C++-fejlretter aktiveret @@ -12483,9 +12339,6 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r QML debugger activated QML-fejlretter aktiveret - - - ::Debugger No application output received in time Ingen program-ouput modtaget i tide @@ -12536,9 +12389,6 @@ Vil du prøve igen? QML Debugger disconnected. QML-fejlretter forbindelse afbrudt. - - - ::Debugger Success: Succes: @@ -12551,9 +12401,6 @@ Vil du prøve igen? Properties Egenskaber - - - ::Debugger Content as ASCII Characters Indhold som ASCII-tegn @@ -12634,9 +12481,6 @@ Vil du prøve igen? Edit bits %1...%2 of register %3 Rediger bit %1...%2 af register %3 - - - ::Debugger Debugger Settings Fejlretterindstillinger @@ -12661,9 +12505,6 @@ Vil du prøve igen? Enable Debugging of Subprocesses Aktivér fejlretning af underprocesser - - - ::Debugger Download of remote file succeeded. Download af fjern-fil lykkedes. @@ -12676,9 +12517,6 @@ Vil du prøve igen? Remove Snapshot Fjern øjebliksbillede - - - ::Debugger Internal Name Internt navn @@ -12699,9 +12537,6 @@ Vil du prøve igen? Open File "%1" Åbn filen "%1" - - - ::Debugger Address: Adresse: @@ -12814,16 +12649,10 @@ Vil du prøve igen? Try to Load Unknown Symbols Prøv at indlæse ukendte symboler - - - ::Debugger Stack Stak - - - ::Debugger Start Debugger Start fejlretter @@ -12907,9 +12736,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug &Recent: &Nylige: - - - ::Debugger <html><body><p>The remote CDB needs to load the matching %1 CDB extension (<code>%2</code> or <code>%3</code>, respectively).</p><p>Copy it onto the remote machine and set the environment variable <code>%4</code> to point to its folder.</p><p>Launch the remote CDB as <code>%5 &lt;executable&gt;</code> to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p><pre>%6</pre></body></html> <html><body><p>Fjern-CDB'en skal indlæse den matchende %1 CDB-udvidelse (henholdvis <code>%2</code> eller <code>%3</code>).</p><p>Kopiér den til fjern-maskingen og sæt miljøvariablen <code>%4</code> til at pege til dens mappe.</p><p>Start fjern-CDB'en som <code>%5 &lt;eksekverbar&gt;</code> for at bruge TCP/IP som kommunikationsprotokol.</p><p>Indtast forbindelsesparameterne som:</p><pre>%6</pre></body></html> @@ -12922,9 +12748,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug &Connection: &Forbindelse: - - - ::Debugger Start Remote Engine Start fjern-motor @@ -12949,9 +12772,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug &Inferior path: &Laverestående sti: - - - ::Debugger Set up Symbol Paths Opsæt symbol-stier @@ -12968,9 +12788,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Use Microsoft Symbol Server Brug Microsoft symbol-server - - - ::Debugger Terminal: Cannot open /dev/ptmx: %1 Terminal: kan ikke åbne /dev/ptmx: %1 @@ -12999,9 +12816,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Terminal: Read failed: %1 Terminal: læsning mislykkedes: %1 - - - ::Debugger Thread&nbsp;id: Tråd-id: @@ -13050,9 +12864,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Core Kerne - - - ::Debugger Type Formats Typeformater @@ -13069,9 +12880,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Misc Types Diverse typer - - - ::Debugger Attach to Process Not Yet Started Tilkobl til proces endnu ikke startet @@ -13120,9 +12928,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Attach Tilkobl - - - ::Debugger <empty> <tom> @@ -13595,9 +13400,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Locals and Expressions Locals og expressions - - - ::Debugger Start Remote Analysis Start fjern-analyse @@ -13826,7 +13628,7 @@ Det hjælper måske at genbygge projektet. - DevelopmentTeam + ::Ios %1 - Free Provisioning Team : %2 %1 - Ledig provisioneringsteam : %2 @@ -14150,7 +13952,7 @@ Det hjælper måske at genbygge projektet. - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character Slet tegn @@ -15225,14 +15027,7 @@ når de ikke kræves, hvilket i de fleste tilfælde vil forbedre ydelsen. - ::GLSLEditor - - GLSL - GLSL - - - - GTestFramework + ::Autotest Google Test Google-test @@ -15243,9 +15038,6 @@ See also Google Test settings. Aktivér eller deaktivér gruppering af testsager efter mappe eller gtest-filter. Se også Google-test-indstillinger. - - - GTestTreeItem <matching> <matcher> @@ -17362,7 +17154,7 @@ Lad være tom for at gennemsøge filsystemet. - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -17926,14 +17718,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt &Look for: &Led efter: - - Open Link - Åbn link - - - Open Link as New Page - Åbn link som ny side - Copy Full Path to Clipboard Kopiér fulde sti til udklipsholder @@ -18052,9 +17836,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Size: %1x%2, %3 byte, format: %4, depth: %5 Størrelse: %1x%2, %3 byte, format: %4, dybde: %5 - - - ::ImageViewer File: Fil: @@ -18074,9 +17855,6 @@ Would you like to overwrite it? %1 findes allerede. Vil du overskrive den? - - - ::ImageViewer Export %1 Eksportér %1 @@ -18097,9 +17875,6 @@ Vil du overskrive den? Could not write file "%1". Kunne ikke skrive filen "%1". - - - ::ImageViewer Pause Animation Pause animation @@ -18108,9 +17883,6 @@ Vil du overskrive den? Play Animation Afspil animation - - - ::ImageViewer Image format not supported. Billedformat understøttes ikke. @@ -18123,9 +17895,6 @@ Vil du overskrive den? Failed to read image. Kunne ikke læse billede. - - - ::ImageViewer Fit to Screen Tilpas til skærm @@ -28681,11 +28450,7 @@ Dette er uafhængigt af visibility-egenskaben i QML. - QmlEngine - - JS Source for %1 - JS-kilde for %1 - + ::Debugger Anonymous Function Anonym funktion @@ -29531,9 +29296,6 @@ Se "Checking Code Syntax"-dokumentation for mere information.Split Initializer Opdel initialiserer - - - QmlJSHoverHandler Library at %1 Bibliotek ved %1 @@ -29600,7 +29362,7 @@ QML-redigeringen skal kende til en sandsynlig URI. - QmlManager + ::QmlProjectManager <Current File> <aktuel fil> @@ -30578,7 +30340,7 @@ Er du sikker på, at du vil fortsætte? - QrcEditor + ::ResourceEditor Add Tilføj @@ -30772,9 +30534,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Qt Class Generation Qt-klassegenerering - - - ::QtSupport Embedding of the UI Class Indlejring af brugerflade-klassen @@ -30807,9 +30566,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Add Qt version #ifdef for module names Tilføj Qt version #ifdef for modulnavne - - - ::QtSupport Examples Eksempler @@ -30862,9 +30618,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Search in Tutorials... Søg i vejledninger... - - - ::QtSupport Qt version: Qt version: @@ -30877,9 +30630,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf %1 (invalid) %1 (ugyldig) - - - ::QtSupport <specify a name> <angiv et navn> @@ -30960,9 +30710,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf The Qt version selected must match the device type. Den valgte Qt version skal matche enhedstypen. - - - ::QtSupport Full path to the host bin directory of the current project's Qt version. Fuld sti til værtens bin-mappe af det aktuelle projekts Qt version. @@ -30971,9 +30718,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Full path to the target bin directory of the current project's Qt version.<br>You probably want %1 instead. Fuld sti til værtens mål-mappe af det aktuelle projekts Qt version.<br>Du vil formodentligt hellere have %1. - - - ::QtSupport Version name: Versionsnavn: @@ -30986,9 +30730,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Edit Rediger - - - ::QtSupport Add... Tilføj... @@ -31001,23 +30742,14 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Clean Up Ryd op - - - ::QtSupport Debugging Helper Build Log Fejlretningshjælper byglog - - - ::QtSupport [Inexact] [ineksakt] - - - ::QtSupport Qt version Qt version @@ -31114,23 +30846,17 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Path to the qmake executable Sti til qmake-eksekverbaren - - - ::QtSupport No factory found for qmake: "%1" Ingen fabrik fundet for qmake: "%1" - QtTestFramework + ::Autotest Qt Test Qt-test - - - QtTestTreeItem inherited nedarvet @@ -31237,14 +30963,11 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QuickTestFramework + ::Autotest Quick Test Quick-test - - - QuickTestTreeItem <unnamed> <unavngivet> @@ -31317,9 +31040,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Deploy to Remote Linux Host Udsend til fjern-Linux-vært - - - ::RemoteLinux No deployment action necessary. Skipping. Ingen udsendelseshandling nødvendig. Springer over. @@ -31348,9 +31068,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Connection error: %1 Forbindelsesfejl: %1 - - - ::RemoteLinux Cannot deploy: %1 Kan ikke udsende: %1 @@ -31367,9 +31084,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Deploy step finished. Udsendelsestrin fuldført. - - - ::RemoteLinux Connection failure: %1 Oprettelse af forbindelse mislykkedes: %1 @@ -31378,9 +31092,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Installing package failed. Installation af pakke mislykkedes. - - - ::RemoteLinux Successfully uploaded package file. Uploadede pakkefil med succes. @@ -31393,9 +31104,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Package installed. Pakke installeret. - - - ::RemoteLinux Package modified files only Pak kun ændrede filer @@ -31408,9 +31116,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Create tarball: Opret tarball: - - - ::RemoteLinux SFTP initialization failed: %1 SFTP-initialisering mislykkedes: %1 @@ -31447,9 +31152,6 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Uploading file "%1"... Uploader filen "%1"... - - - ::RemoteLinux Upload files via SFTP Upload filer via SFTP @@ -31542,16 +31244,10 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf Key via ssh-agent Nøgle via ssh-agent - - - ::RemoteLinux New Generic Linux Device Configuration Setup Ny generisk Linux-enhed konfigurationsopsætning - - - ::RemoteLinux Summary Opsummering @@ -31562,9 +31258,6 @@ In addition, device connectivity will be tested. Den nye enhedskonfiguration vil nu blive oprettet. Derudover testes enhedens forbindelse. - - - ::RemoteLinux Connection Forbindelse @@ -31577,9 +31270,6 @@ Derudover testes enhedens forbindelse. Generic Linux Device Generisk Linux-enhed - - - ::RemoteLinux Connecting to host... Opretter forbindelse til vært... @@ -31616,16 +31306,10 @@ Derudover testes enhedens forbindelse. The following specified ports are currently in use: %1 Følgende porte er aktuelt i brug: %1 - - - ::RemoteLinux Run custom remote command Kør brugerdefineret fjern-kommando - - - ::RemoteLinux Incremental deployment Trinvis udsendelse @@ -31638,9 +31322,6 @@ Derudover testes enhedens forbindelse. Command line: Kommandolinje: - - - ::RemoteLinux WizardPage Assistent side @@ -31681,9 +31362,6 @@ Derudover testes enhedens forbindelse. Agent Agent - - - ::RemoteLinux Generic Linux Generisk Linux @@ -31692,9 +31370,6 @@ Derudover testes enhedens forbindelse. Deploy Public Key... Udsend offentlig nøgle... - - - ::RemoteLinux Preparing SFTP connection... Forbereder SFTP-forbindelse... @@ -31715,16 +31390,10 @@ Derudover testes enhedens forbindelse. Failed to upload package: %2 Kunne ikke uploade pakke: %2 - - - ::RemoteLinux MB MB - - - ::RemoteLinux Remote executable: Fjern-eksekverbar: @@ -31745,9 +31414,6 @@ Derudover testes enhedens forbindelse. Run "%1" Kør "%1" - - - ::RemoteLinux Error: No device Fejl: ingen enhed @@ -31768,16 +31434,10 @@ Derudover testes enhedens forbindelse. Remote stderr was: "%1" Fjern-stderr var: "%1" - - - ::RemoteLinux %1 (default) %1 (standard) - - - ::RemoteLinux Choose Public Key File Vælg offentlig nøgle-fil @@ -31798,9 +31458,6 @@ Derudover testes enhedens forbindelse. Close Luk - - - ::RemoteLinux Remote process crashed. Fjern-proces holdt op med at virke. @@ -31827,16 +31484,10 @@ Derudover testes enhedens forbindelse. Cannot check for free disk space: "%1" is not an absolute path. Kan ikke tjekke for ledig diskplads: "%1" er ikke en absolut sti. - - - ::RemoteLinux Check for free disk space Tjek for ledig diskplads - - - ::RemoteLinux No command line given. Ingen kommandolinje givet. @@ -31861,9 +31512,6 @@ Derudover testes enhedens forbindelse. Remote command finished successfully. Fjern-kommando fuldført med succes. - - - ::RemoteLinux Clean Environment Rensmiljø @@ -31872,9 +31520,6 @@ Derudover testes enhedens forbindelse. System Environment Systemmiljø - - - ::RemoteLinux Fetch Device Environment Hent enhedsmiljø @@ -31891,9 +31536,6 @@ Derudover testes enhedens forbindelse. Fetching environment failed: %1 Hentning af miljø mislykkedes: %1 - - - ::RemoteLinux Executable on device: Eksekverbar på enhed: @@ -31906,16 +31548,10 @@ Derudover testes enhedens forbindelse. Executable on host: Eksekverbar på vært: - - - ::RemoteLinux Exit code is %1. stderr: Afslutningskode er %1. stderr: - - - ::RemoteLinux Public key error: %1 Fejl ved offentlig nøgle: %1 @@ -31928,9 +31564,6 @@ Derudover testes enhedens forbindelse. Key deployment failed: %1. Udsendelse af nøgle mislykkedes: %1. - - - ::RemoteLinux Packaging finished successfully. Pakning afsluttede med succes. @@ -31979,9 +31612,6 @@ Derudover testes enhedens forbindelse. Create tarball Opret tarball - - - ::RemoteLinux No tarball creation step found. Intet tarball oprettelsestrin fundet. @@ -32002,17 +31632,6 @@ Derudover testes enhedens forbindelse. Krævet diskplads: - - ::ResourceEditor - - Prefix: - Præfiks: - - - Language: - Sprog: - - ::ResourceEditor @@ -32063,9 +31682,6 @@ Derudover testes enhedens forbindelse. Could not copy the file to %1. Kunne ikke kopiere filen til %1. - - - ::ResourceEditor &Undo &Fortryd @@ -32090,10 +31706,6 @@ Derudover testes enhedens forbindelse. Remove Prefix... Fjern præfiks... - - Remove Missing Files - Fjern manglende filer - Rename... Omdøb... @@ -32146,9 +31758,6 @@ Derudover testes enhedens forbindelse. Rename Prefix Omdøb præfiks - - - ::ResourceEditor Open File Åbn fil @@ -32161,16 +31770,10 @@ Derudover testes enhedens forbindelse. Copy Resource Path to Clipboard Kopiér ressourcesti til udklipsholder - - - ::ResourceEditor All files (*) Alle filer (*) - - - ::ResourceEditor The file name is empty. Filnavnet er tomt. @@ -32183,9 +31786,6 @@ Derudover testes enhedens forbindelse. The <RCC> root element is missing. Rodelementet <RCC> mangler. - - - ResourceTopLevelNode %1 Prefix: %2 %1 præfiks: %2 @@ -33567,7 +33167,7 @@ med en adgangskode, som du kan indtaste herunder. - TestTreeItem + ::Autotest %1 (none) %1 (ingen) @@ -36143,7 +35743,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. - TopicChooser + ::Help Choose Topic Vælg emne @@ -37181,9 +36781,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Calls Kald - - - ::Valgrind Previous command has not yet finished. Forrige kommando er endnu ikke færdig. @@ -37216,9 +36813,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Callgrind unpaused. Callgrind fjernet fra pause. - - - ::Valgrind Function: Funktion: @@ -37290,9 +36884,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Incl. Cost: %1 Inkl. pris: %1 - - - ::Valgrind %1 in %2 %1 i %2 @@ -37301,9 +36892,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. %1:%2 in %3 %1:%2 i %3 - - - ::Valgrind Last-level Sidste-niveau @@ -37360,9 +36948,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Position: Position: - - - ::Valgrind %1%2 %1%2 @@ -37371,9 +36956,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. in %1 i %1 - - - ::Valgrind Valgrind Function Profiler uses the Callgrind tool to record function calls when a program runs. Valgrind funktion-profilering bruger Callgrind-værktøjet til at optage funktionskald når et program kører. @@ -37538,9 +37120,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Parsing Profile Data... Parser profildata... - - - ::Valgrind Profiling Profilerer @@ -37549,16 +37128,10 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Profiling %1 Profilerer %1 - - - ::Valgrind Suppress Error Undertryk fejl - - - ::Valgrind External Errors Eksterne fejl @@ -37715,16 +37288,10 @@ Når et problem detekteres, afbrydes programmet og kan fejlrettes. Logfil behandlet. %n problemstillinger blev fundet. - - - ::Valgrind Analyzing Memory Analyserer hukommelse - - - ::Valgrind Save Suppression Gem undertrykkelse @@ -37741,9 +37308,6 @@ Når et problem detekteres, afbrydes programmet og kan fejlrettes. Select Suppression File Vælg undertrykkelsesfil - - - ::Valgrind Generic Settings Generiske indstillinger @@ -37912,23 +37476,14 @@ Med mellemlager-simulation aktiveres begivenhedstællere: Valgrind Suppression File (*.supp);;All Files (*) Valgrind-undertrykkelsesfil (*.supp);;Alle filer (*) - - - ::Valgrind Valgrind Valgrind - - - ::Valgrind Valgrind Settings Valgrind-indstillinger - - - ::Valgrind Valgrind options: %1 Valgrind-valgmuligheder: %1 @@ -37963,16 +37518,10 @@ Med mellemlager-simulation aktiveres begivenhedstællere: Proces afsluttede med returværdi %1 - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Alle funktioner med en inkluderende "cost ratio" højere end %1 (%2 er skjult) - - - ::Valgrind XmlServer on %1: XmlServer på %1: @@ -37981,9 +37530,6 @@ Med mellemlager-simulation aktiveres begivenhedstællere: LogServer on %1: LogServer på %1: - - - ::Valgrind Location: Placering: @@ -37992,9 +37538,6 @@ Med mellemlager-simulation aktiveres begivenhedstællere: Instruction pointer: Instruktionspeger: - - - ::Valgrind Issue Problemstilling @@ -38003,9 +37546,6 @@ Med mellemlager-simulation aktiveres begivenhedstællere: %1 in function %2 %1 i funktionen %2 - - - ::Valgrind Could not parse hex number from "%1" (%2) Kunne ikke parse heks-tal fra "%1" (%2) @@ -38058,9 +37598,6 @@ Med mellemlager-simulation aktiveres begivenhedstællere: Unexpected exception caught during parsing. Fangede uventet undtagelse under parsing. - - - ::Valgrind Description Beskrivelse @@ -40374,14 +39911,11 @@ Vil du overskrive dem? - AddAnalysisMessageSuppressionComment + ::QmlJSEditor Add a Comment to Suppress This Message Tilføj en kommentar for at undertrykke denne meddelelse - - - ::QmlJSEditor Code Model Warning Kodemodel advarsel @@ -40656,7 +40190,7 @@ Gemning mislykkedes. - HeobDialog + ::Valgrind XML output file: XML-output-fil: @@ -40765,13 +40299,6 @@ Gemning mislykkedes. OK OK - - Heob - Heob - - - - HeobData Process %1 Proces %1 diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index f038c3a8330..ca002fbf759 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -1284,11 +1284,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der - ContentWindow - - Open Link - Adresse öffnen - + ::Help Open Link as New Page Verweis in neuer Seite öffnen @@ -9215,10 +9211,6 @@ Leer lassen, um das Dateisystem zu durchsuchen. Open Link Verweis öffnen - - Open Link as New Page - Verweis in neuer Seite öffnen - Copy Link Verweis kopieren @@ -12094,7 +12086,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun - TopicChooser + ::Help Choose a topic for <b>%1</b>: Wählen Sie ein Thema für <b>%1</b>: @@ -14946,7 +14938,7 @@ The name of the build configuration created by default for a generic project. - QmlManager + ::QmlProjectManager <Current File> <Aktuelle Datei> @@ -16299,13 +16291,6 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden Alle einklappen - - ::GLSLEditor - - GLSL - GLSL - - ::Macros @@ -30875,7 +30860,7 @@ Möchten Sie es beenden? - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character Zeichen entfernen @@ -33670,7 +33655,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -34545,11 +34530,7 @@ provided they were unmodified before the refactoring. - QmlEngine - - JS Source for %1 - JS-Quelle für %1 - + ::Debugger Anonymous Function Anonyme Funktion @@ -35195,7 +35176,7 @@ Error: - ResourceTopLevelNode + ::ResourceEditor %1 Prefix: %2 %1 Präfix: %2 @@ -39505,7 +39486,7 @@ Zeile: %4, Spalte: %5 - DevelopmentTeam + ::Ios %1 - Free Provisioning Team : %2 %1 - Free Provisioning-Team : %2 @@ -41511,7 +41492,7 @@ Was soll %1 tun? - HeobDialog + ::Valgrind New Neu @@ -41632,10 +41613,6 @@ Was soll %1 tun? Default Vorgabe - - Heob - Heob - New Heob Profile Neues Heob-Profil @@ -41656,9 +41633,6 @@ Was soll %1 tun? Are you sure you want to delete this profile permanently? Möchten Sie dieses Profil endgültig löschen? - - - HeobData Process %1 Prozess %1 @@ -41721,7 +41695,7 @@ Was soll %1 tun? - ClangFormat::ClangFormatConfigWidget + ::ClangFormat Clang-Format Style Clang-Format-Stil @@ -41735,7 +41709,7 @@ Was soll %1 tun? - ClangFormat::ClangFormatPlugin + ::ClangFormat Open Used .clang-format Configuration File Verwendete .clang-format-Konfigurationsdatei öffnen @@ -42882,7 +42856,7 @@ You might find further explanations in the Application Output view. - ClangDiagnosticConfig + ::ClangCodeModel Project: %1 (based on %2) Projekt: %1 (basierend auf %2) @@ -44739,7 +44713,7 @@ Do you want to display them anyway? - Marketplace::Internal::QtMarketplaceWelcomePage + ::Marketplace Marketplace Marketplace @@ -45004,11 +44978,7 @@ Do you want to display them anyway? - RunConfigSelector - - Run Without Deployment - Ausführung ohne Deployment - + ::Autotest ::ProjectExplorer @@ -45553,7 +45523,7 @@ Do you want to display them anyway? - ProMessageHandler + ::QtSupport [Inexact] Prefix used for output from the cumulative evaluation of project files. @@ -50576,9 +50546,6 @@ in "%2" aus. Disable Diagnostic in Current Project Meldung für aktuelles Projekt deaktivieren - - - ClangUtils Could not retrieve build directory. Build-Verzeichnis konnte nicht abgefragt werden. @@ -50589,7 +50556,7 @@ in "%2" aus. - ClangFormat::ClangFormatGlobalConfigWidget + ::ClangFormat Formatting mode: Formatierungsart: @@ -50630,9 +50597,6 @@ in "%2" aus. Override Clang Format configuration file with the chosen configuration. Die Clang-Format-Konfigurationsdatei mit der gewählten Konfiguration überschreiben. - - - ClangFormatStyleFactory ClangFormat ClangFormat @@ -50764,7 +50728,7 @@ in "%2" aus. - Coco::CocoPlugin + ::Coco Select a Squish Coco CoverageBrowser Executable @@ -52307,7 +52271,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. - GitLab::GitLabCloneDialog + ::GitLab Clone Repository @@ -52368,9 +52332,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Cloning failed. - - - GitLab::GitLabDialog GitLab @@ -52439,9 +52400,6 @@ Note: This can expose you to man-in-the-middle attack. Möchten Sie die SSL-Verifikation für diesen Server abschalten? Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. - - - GitLab::GitLabOptionsPage Host: Host: @@ -52462,13 +52420,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. HTTPS: - - GitLab - - - - - GitLab::GitLabOptionsWidget Default: Vorgabe: @@ -52517,13 +52468,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Add Hinzufügen - - - GitLab::GitLabPlugin - - GitLab - - GitLab... @@ -52536,13 +52480,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Invalid GitLab configuration. For a fully functional configuration, you need to set up host name or address and an access token. Providing the path to curl is mandatory. - - - GitLab::GitLabProjectSettingsWidget - - Host: - Host: - Linked GitLab Configuration: @@ -52567,10 +52504,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Remote host does not match chosen GitLab configuration. - - Check settings for misconfiguration. - - Accessible (%1). diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index d65a58e5045..3ff0536e19a 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -32,22 +32,18 @@ Iniciar depurador - Core File: Archivo core: - Attach to Process ID: Adjuntar al ID de proceso: - Filter: Filtro: - Clear Limpiar @@ -95,22 +91,18 @@ Agregar marcador - Bookmark: Marcador: - Add in Folder: Agregar en directorio: - + - New Folder Nuevo directorio @@ -236,7 +228,6 @@ Condición: - Ignore count: Ignorar cuenta: @@ -439,23 +430,19 @@ Estas opciones surtirán efecto en el próximo inicio de Qt Creator. - Cdb Placeholder - Debugger Paths Rutas del depurador - Symbol paths: Rutas de símbolos: - Source paths: Rutas de fuentes: @@ -468,7 +455,6 @@ - Path: Ruta: @@ -490,7 +476,6 @@ - Verbose Symbol Loading @@ -502,12 +487,10 @@ Ubicación del repositorio: - Select Seleccionar - Change: Cambiar: @@ -559,7 +542,6 @@ Pegar: - Protocol: @@ -572,37 +554,30 @@ Usuario: - Copy Paste URL to clipboard Copiar URL al portapapeles - Display Output Pane after sending a post Desplegar panel de salida luego de enviar - General - CodePaster - Default Protocol: - Pastebin.ca - Pastebin.com @@ -614,23 +589,19 @@ Interfaz de usuario - Checking this will populate the source file view automatically but might slow down debugger startup considerably. Seleccionando esto hará que la vista de código fuente sea rellenada automáticamente pero puede hacer la depuración considerablemente mas lenta. - Populate source file view automatically Rellenar vista de código fuente automáticamente - When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. Cuando esta opción se selecciona, 'Paso adentro' comprime varios pasos en uno solo en determinadas situaciones, lo que hace la depuración menos verbosa. Así, por ejemplo, el código de conteo atómico de referencias será omitido, y un solo 'Paso adentro' para la emisión de una señal terminará directamente en el slot conectado a ella. - Skip known frames when stepping Saltar frames conocidos al avanzar @@ -639,17 +610,14 @@ Usar tooltips durante depuración - Maximal stack depth: Profundidad máxima de pila: - <unlimited> <ilimitado> - Use alternating row colors in debug views Alternar colores de filas @@ -658,60 +626,51 @@ Si marca esto se activarán los tooltips para valores de variables durante la depuración. Dado que hace lenta la depuración y no arroja información confiable ya que no usa información del alcance, es desactivada por defecto. - Enable reverse debugging Habilitar depuración inversa - Show a message box when receiving a signal - Use tooltips in main editor while debugging - CompletionSettingsPage + ::TextEditor Code Completion Completado de código - Do a case-sensitive match for completion items. Distinguir MAYÚS/minús en items de autocompletado. - &Case-sensitive completion &Completado distingue MAYÚS/minús - Automatically insert (, ) and ; when appropriate. Insertar (,) y (;) automáticamente cuando sea apropiado. - Insert the common prefix of available completion items. Insertar el prefijo común de los items de completado disponibles. - Autocomplete common &prefix Autocompletar &prefijo común - &Automatically insert brackets &Automáticamente insertar corchetes - ContentWindow + ::Help Open Link Abrir vínculo @@ -1125,52 +1084,42 @@ Would you like to overwrite them? Ajustes generales - User &interface color: Color de &interfaz de usuario: - Reset to default Restablecer a predefinidos - R - Terminal: - External editor: Editor externo: - ? - When files are externally modified: - Always ask - Reload all modified files - Ignore modifications @@ -1336,7 +1285,6 @@ Would you like to overwrite them? Nuevo proyecto - 1 @@ -1810,32 +1758,26 @@ Would you like to overwrite them? Nombre de clase: - Base class: Clase base: - Header file: Archivo de encabezado: - Source file: Archivo de fuentes: - Generate form: Generar formulario: - Form file: Archivo de formulario: - Path: Ruta: @@ -1912,12 +1854,10 @@ Would you like to overwrite them? Introducción y ubicación del proyecto - Name: Nombre: - Create in: Crear en: @@ -1930,12 +1870,10 @@ Would you like to overwrite them? Enviar a Subversion - Des&cription Des&cripción - F&iles Arch&ivos @@ -2059,22 +1997,18 @@ Would you like to overwrite them? Convenciones de nomenclatura de archivos - Source suffix: Sufijo para fuentes: - Lower case file names Nombres de archivos en minúsculas - File Naming Conventions Convenciones de nomenclatura de archivos - License Template: @@ -2297,9 +2231,6 @@ Would you like to overwrite them? Breakpoint will only be hit after being ignored so many times. El punto de ruptura se alcanzará luego de ser ignorado ésta cantidad de veces. - - - ::Debugger Breakpoints Puntos de ruptura @@ -2356,9 +2287,6 @@ Would you like to overwrite them? Conditions on Breakpoint %1 Condiciones en punto de ruptura %1 - - - ::Debugger Unable to load the debugger engine library '%1': %2 Imposible cargar librería del depurador '%1': %2 @@ -2473,9 +2401,6 @@ Would you like to overwrite them? Thread %1: No debug information available (%2). - - - ::Debugger injection inyección @@ -2520,9 +2445,6 @@ Would you like to overwrite them? Querying dumpers for '%1'/'%2' (%3) Solicitando volcado de '%1'/'%2' (%3) - - - ::Debugger Cdb Cdb @@ -2544,9 +2466,6 @@ Would you like to overwrite them? Autodetection Autodetección - - - ::Debugger Symbol Server... Servidor de símbolos... @@ -2559,16 +2478,10 @@ Would you like to overwrite them? Pick a local cache directory Seleccione un directorio local para el caché - - - ::Debugger Debug Depuración - - - ::Debugger Continue Continuar @@ -2937,9 +2850,6 @@ Would you like to overwrite them? Execute line Ejecutar línea - - - ::Debugger Debugging Helper Asistende de depuración @@ -2952,9 +2862,6 @@ Would you like to overwrite them? Ctrl+Shift+F11 - - - ::Debugger Disassembler Desensamblador @@ -2967,9 +2874,6 @@ Would you like to overwrite them? Always reload disassembler listing Siempre recargar desensamblado - - - ::Debugger The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program. El inicio del proceso Gdb ha fallado. Puede que el programa invocado '%1' no exista o que no tenga suficientes permisos para invocarlo. @@ -3381,9 +3285,6 @@ Es recomendado usar gdb 6.7 o posterior. Loading dumpers via debugger call (%1)... - - - ::Debugger Choose Gdb Location Seleccione ubicación de Gdb @@ -3392,9 +3293,6 @@ Es recomendado usar gdb 6.7 o posterior. Choose Location of Startup Script File Seleccione ubicación del script de inicio - - - ::Debugger Module name Nombre del módulo @@ -3471,9 +3369,6 @@ Es recomendado usar gdb 6.7 o posterior. Symbols in "%1" Símbolos en "%1" - - - ::Debugger Cannot create temporary file: %2 No se pudo crear archivo temporal: %2 @@ -3490,9 +3385,6 @@ Es recomendado usar gdb 6.7 o posterior. Cannot open FiFo %1: %2 No se pudo abrir FIFO %1: %2 - - - ::Debugger Name Nombre @@ -3501,9 +3393,6 @@ Es recomendado usar gdb 6.7 o posterior. Value (base %1) - - - ::Debugger Registers Registros @@ -3552,9 +3441,6 @@ Es recomendado usar gdb 6.7 o posterior. Cowardly refusing to evaluate expression '%1' with potential side effects Rehusando cobardemente a evaluar expresión '%1' con posibles efectos colaterales - - - ::Debugger Internal name Nombre interno @@ -3593,9 +3479,6 @@ Es recomendado usar gdb 6.7 o posterior. Open file "%1"' Abrir archivo "%1" - - - ::Debugger ... @@ -3644,9 +3527,6 @@ Es recomendado usar gdb 6.7 o posterior. Address Dirección - - - ::Debugger Thread: %1 Hilo: %1 @@ -3804,9 +3684,6 @@ Es recomendado usar gdb 6.7 o posterior. <Edit> <Editar> - - - ::Debugger Clear contents Limpiar contenido @@ -3823,33 +3700,27 @@ Es recomendado usar gdb 6.7 o posterior. Esto activará el despliegue legible de objetos Qt y STL en la vista Locales & Observadores - Use debugging helper Usar asistente de depuración - This will load a dumper library Esto cargará la librería de volcado - Use debugging helper from custom location Usar asistente de depuración desde la ubicación indicada - Location: Localización: - Debug debugging helper ??? Asistente de depuración - Debugging helper Asistente de depuración @@ -3928,12 +3799,10 @@ Es recomendado usar gdb 6.7 o posterior. Elija un nombre para la clase - Class Clase - Configure... Configurar... @@ -4157,18 +4026,16 @@ Reconstruir el proyecto puede ayudar. - DocSettingsPage + ::Help Registered Documentation Documentación registrada - Add... Agregar... - Remove Suprimir @@ -4210,7 +4077,6 @@ Reconstruir el proyecto puede ayudar. Piel: - Use Virtual Box Note: This adds the toolchain to the build environment and runs the program inside a virtual machine. It also automatically sets the correct Qt version. @@ -4226,47 +4092,38 @@ Adicionalmente ajustará automáticamente la versión de Qt. Nombre: - Version: Versión: - Compatibility Version: Versión compatible: - Vendor: Vendedor: - Url: - Location: Localización: - Description: Descripción: - Copyright: - License: Licencia: - Dependencies: Dependencias: @@ -4275,7 +4132,6 @@ Adicionalmente ajustará automáticamente la versión de Qt. Estado: - Error Message: Mensaje de error: @@ -4296,22 +4152,18 @@ Adicionalmente ajustará automáticamente la versión de Qt. Estado - Name Nombre - Version Versión - Vendor Vendedor - Location Localización @@ -4539,82 +4391,66 @@ Razón: %3 Usar FakeVim - Vim style settings Ajustes de estilo Vim - vim's "expandtab" option Opción "expandtab" de Vim - Expand tabulators: Expandir tabulaciones: - Highlight search results: Resaltar resultados de búsquedas: - Shift width: Número de espacios por nivel de indentación (shiftwidth): - Smart tabulators: Tabulaciones inteligentes: - Start of line: Principio de línea: - vim's "tabstop" option Opción "tabstop" de Vim - Tabulator size: Tamaño de tabulación: - Backspace: Retroceso: - VIM's "autoindent" option Opción "autoindent" de Vim - Automatic indentation: Indentación automática: - Copy text editor settings Copiar ajustes de editor de texto - Set Qt style Establecer estilo predefinido de Qt - Set plain style Establecer estilo simple - Incremental search: Búsqueda incremental: @@ -4626,7 +4462,6 @@ Razón: %3 Agregar nombre de filtro - Filter Name: Nombre de filtro: @@ -4638,65 +4473,52 @@ Razón: %3 Filtros - 1 - Add Agregar - Remove Suprimir - Attributes Atributos - Find::Internal::FindDialog + ::Core Search for... Buscar... - Sc&ope: &Alcance: - &Search &Buscar - Search &for: Te&xto: - Close Cerrar - &Case sensitive Distin&guir MAYÚS/minús - &Whole words only Palabras &completas solamente - - - Find::Internal::FindPlugin &Find/Replace &Buscar/Reemplazar @@ -4713,9 +4535,6 @@ Razón: %3 Ctrl+Shift+F - - - Find::Internal::FindToolBar Current Document Documento actual @@ -4764,36 +4583,26 @@ Razón: %3 Use Regular Expressions Usar expresiones regulares - - - Find::Internal::FindWidget Find Buscar - Find: Buscar: - Replace with: Reemplazar con: - All Todo - ... - - - Find::SearchResultWindow Search Results Resultados de búsqueda @@ -4820,80 +4629,67 @@ Razón: %3 - GdbOptionsPage + ::Debugger Gdb interaction Interacción con Gdb - Gdb location: Ubicación de Gdb: - Environment: Entorno: - This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up. Esto debe dejarse en blanco o bien indicando la ruta a un archivo conteniendo comandos de Gdb que serán ejecutados inmediatamente luego del inicio. - Gdb startup script: Script de inicio de Gdb: - Behaviour of breakpoint setting in plugins Comportamiento de puntos de ruptura en plugins - This is the slowest but safest option. Ésta es la opción mas lenta, pero también la más segura. - Try to set breakpoints in plugins always automatically. Siempre intentar establecer puntos de ruptura en plugins automáticamente. - Try to set breakpoints in selected plugins Intentar establecer puntos de ruptura en los plugins seleccionados - Matching regular expression: Expresión regular coincidente: - Never set breakpoints in plugins automatically Nunca establecer puntos de ruptura en plugins automáticamente - This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH. Indique aquí la ruta absoluta al binario de Gdb que prefiere usar, de lo contrario se ajustará al binario que se detecte en la variable PATH. - GenericMakeStep + ::ProjectExplorer Override %1: Redefinir %1: - Make arguments: Argumentos para make: - Targets: Objetivos: @@ -5024,17 +4820,14 @@ Razón: %3 Ramas - General information Información general - Repository: Repositorio: - Remote branches Ramas remotas @@ -5419,32 +5212,26 @@ Razón: %3 Información general - repository repositorio - Branch: Rama: - branch rama - Commit Information Información del commit - Author: Autor: - Email: Email: @@ -5469,47 +5256,38 @@ Razón: %3 Variables de entorno - PATH: PATH: - From system Desde el sistema - <b>Note:</b> <b>Nota:</b> - Git needs to find Perl in the environment as well. Git necesita encontrar Perl en el entorno. - Log commit display count: Número de entradas del histórico: - Note that huge amount of commits might take some time. Tenga en cuenta que un gran número de entradas tomará cierto tiempo. - Timeout (seconds): Expirar en (segundos): - Prompt to submit Preguntar antes de enviar - Omit date from annotation output @@ -5626,18 +5404,10 @@ Razón: %3 Filters Filtros - - Help - Ayuda - Help index Índice de la ayuda - - Help - Ayuda - Contents Contenidos @@ -5795,22 +5565,14 @@ Skipping file. - IndexWindow + ::Help &Look for: &Buscar: - - Open Link - Abrir vínculo - - - Open Link in New Tab - Abrir vínculo en nueva pestaña - - InputPane + ::Debugger Type Ctrl-<Return> to execute a line. Teclee Ctrl-<Intro> para ejecutar una línea. @@ -5943,16 +5705,7 @@ en su archivo .pro. - MakeStep - - Override %1: - Redefinir %1: - - - - Make arguments: - Argumentos para make: - + ::ProjectExplorer MyMain @@ -5968,24 +5721,21 @@ en su archivo .pro. Apodos - Filter: Filtro: - Clear Limpiar - OpenWithDialog + ::Core Open File With... Abrir archivo con... - Open file extension with: Abrir extensión de archivo con: @@ -6021,7 +5771,6 @@ en su archivo .pro. Modificar número - Change Number: Modificar número: @@ -6030,12 +5779,10 @@ en su archivo .pro. Modificaciones pendientes de P4 - Submit Enviar - Cancel Cancelar @@ -6342,7 +6089,6 @@ en su archivo .pro. Interacción con Perforce - OK Ok @@ -6351,27 +6097,22 @@ en su archivo .pro. Comando P4: - Use default P4 environment variables Usar variables de entorno predefinidas de P4 - Environment variables Variables de entorno - P4 Client: Cliente P4: - P4 User: Usuario P4: - P4 Port: Puerto P4: @@ -6384,7 +6125,6 @@ en su archivo .pro. Probar - Prompt to submit Preguntar antes de enviar @@ -6401,43 +6141,24 @@ en su archivo .pro. Comando Perforce - Change: Modificación: - Client: Cliente: - User: Usuario: - PluginDialog - - Details - Detalles - + ::Core Error Details Detalles de errores - - Installed Plugins - Plugins instalados - - - Plugin Details of %1 - Detalles del plugin %1 - - - Plugin Errors of %1 - Errores del plugin %1 - ::ExtensionSystem @@ -6902,22 +6623,18 @@ Nombre base de librería: %1 Seleccione su sesión - Create New Session Crear nueva sesión - Clone Session Clonar sesión - Delete Session Eliminar sesión - <a href="qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">What is a Session?</a> <a href="qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">¿Qué es una sesión?</a> @@ -6971,22 +6688,18 @@ Nombre base de librería: %1 Permitir etapa de construcción personalizada - Command: Comando: - Working Directory: Directorio de trabajo: - Command Arguments: Argumentos del comando: - Enable Custom Process Step @@ -7085,17 +6798,14 @@ Nombre base de librería: %1 Suprimir archivo - &Delete file permanently &Eliminar archivo permanentemente - &Remove from Version Control &Remover del control de versiones - File to remove: Archivo a suprimir: @@ -7112,7 +6822,6 @@ Nombre base de librería: %1 - - @@ -7121,7 +6830,6 @@ Nombre base de librería: %1 Ajustes - Edit run configuration: @@ -7163,22 +6871,18 @@ Nombre base de librería: %1 Gestor de proyectos - &Add to Project &Agregar al proyecto - &Project &Proyecto - Add to &version control Agregar al control de &versiones - The following files will be added: @@ -7559,22 +7263,18 @@ al control de versiones (%2)? Ajustes de construcción QMake: - debug - release - Additional arguments: Argumentos adicionales: - Effective qmake call: Llamada qmake efectiva: @@ -7724,7 +7424,7 @@ al control de versiones (%2)? - QrcEditor + ::ResourceEditor Form Formulario @@ -7734,27 +7434,22 @@ al control de versiones (%2)? Agregar - Remove Eliminar - Properties Propiedades - Prefix: Prefijo: - Language: Idioma: - Alias: Alias: @@ -7870,17 +7565,14 @@ al control de versiones (%2)? Nuevo - Remove Suprimir - Up Arriba - Down Abajo @@ -8041,7 +7733,6 @@ al control de versiones (%2)? Nombre de configuración: - Qt Version: Versión de Qt: @@ -8050,22 +7741,18 @@ al control de versiones (%2)? Gestionar versiones de Qt - This Qt-Version is invalid. Ésta versión de Qt es inválida. - Shadow Build: Construcción en sombra (shadow build): - Build Directory: Directorio de construcción: - <a href="import">Import existing build</a> <a href="import">Importar ajuste existente</a> @@ -8098,7 +7785,6 @@ al control de versiones (%2)? - Tool Chain: @@ -8260,17 +7946,14 @@ al control de versiones (%2)? Versiones de Qt - + - - - Name Nombre @@ -8279,47 +7962,38 @@ al control de versiones (%2)? Ruta - Debugging Helper Asistente de depuración - Version Name: Nombre de versión: - MinGW Directory: Directorio de MinGW: - Debugging Helper: Asistente de depuración: - Show &Log Mostrar &registro - &Rebuild &Reconstruir - Default Qt Version: Versión preferida de Qt: - MSVC Version: Versión de MSVC: - <!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; } @@ -8332,17 +8006,14 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Imposible detectar versión de MSVC.</span></p></body></html> - QMake Location - QMake Location: - MWC Directory: @@ -8355,67 +8026,54 @@ p, li { white-space: pre-wrap; } Editar variable - Variable Name: Nombre de variable: - Assignment Operator: Operador de asignación: - Variable: Variable: - Append (+=) Añadir (+=) - Remove (-=) Eliminar (-=) - Replace (~=) Reemplazar (~=) - Set (=) Establecer (=) - Unique (*=) Único (*=) - Select Item Seleccionar item - Edit Item Editar item - Select Items Seleccionar items - Edit Items Editar items - New Nuevo @@ -8746,47 +8404,38 @@ p, li { white-space: pre-wrap; } Nombre: - File Types: Tipos de archivo: - Specify file name filters, separated by comma. Filters may contain wildcards. Especifique filtros para nombres de archivos, separados por comas. Los filtros pueden contener comodines. - Prefix: Prefijo: - Limit to prefix Límite para el prefijo - Add... Agregar... - Edit... Editar... - Remove Suprimir - Directories: Directorios: - Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree. To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for. Especifique una palabra corta o abreviatura que pueda usarse para restringir el completado de archivos de este arbol de directorios. @@ -8801,17 +8450,14 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Ajustes de filtros - Limit to prefix Limite para el prefijo - Include hidden files Incluir archivos ocultos - Filter: Filtro: @@ -8852,22 +8498,18 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Ajustar filtros - Add Agregar - min - Refresh now! Refrescar ahora! - Refresh Interval: Intervalo de refresco: @@ -8876,7 +8518,6 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg %1 (Prefijo: %2) - Edit Editar @@ -8990,27 +8631,22 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg &Redo &Rehacer - - - ::ResourceEditor untitled sin título - SaveItemsDialog + ::Core Save Changes Guardar cambios - The following files have unsaved changes: Los siguientes archivos tienen cambios sin guardar: - Automatically save all files before building Guardar cambios automáticamente antes de construir @@ -9022,13 +8658,12 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Opciones - 0 - SharedTools::QrcEditor + ::ResourceEditor Add Files Agregar archivos @@ -9077,9 +8712,6 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Could not copy the file to %1. No se pudo copiar el archivo a %1. - - - SharedTools::ResourceView Add Files... Agregar archivos... @@ -9124,80 +8756,53 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Change Language Cambiar idioma - - Language: - Idioma: - Change File Alias Cambiar alias de archivo - - Alias: - Alias: - - ShortcutSettings + ::Core Keyboard Shortcuts Atajos de teclado - - Filter: - Filtro: - - - Command Comando - Label Etiqueta - Shortcut Atajo - Defaults Predefinidos - Import... Importar... - Export... Exportar... - Key Sequence Secuencia de teclas - Shortcut: Atajo: - Reset Restablecer - - - Remove - Suprimir - ShowBuildLog @@ -9215,50 +8820,32 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg - StartExternalDialog + ::Debugger - Start Debugger - Iniciar depurador - - - Executable: Ejecutable: - Arguments: Argumentos: - Break at 'main': Interrumpir en 'main': - - - StartRemoteDialog - Start Debugger - Iniciar depurador - - - Architecture: Arquitectura: - Host and port: Anfitrión y puerto: - Use server start script: Usar guion de inicio en servidor: - Server start script: Guión de inicio: @@ -9270,17 +8857,14 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Comando Subversion: - Authentication Autenticación - User name: Nombre de usuario: - Password: Contraseña: @@ -9541,92 +9125,74 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Almacenamiento - Removes trailing whitespace on saving. Suprime espacios en blanco al guardar. - &Clean whitespace Suprimir espa&cios en blanco - Clean whitespace in entire document instead of only for changed parts. Suprimir espacios en blanco en todo el documento en vez de solo en partes modificadas. - In entire &document En todo el &documento - Correct leading whitespace according to tab settings. Corregir sangrado conforme a ajustes. - Clean indentation Indentación limpia - &Ensure newline at end of file Pon&er un salto de línea al final del archivo - Tabs and Indentation Sangrado e indentación - Ta&b size: Tamaño de ta&bulación: - &Indent size: Tamaño de &indentación: - Backspace will go back one indentation level instead of one space. La tecla retroceso remueve un nivel de indentación en vez de un espacio. - &Backspace follows indentation Tecla retr&oceso sigue la indentación - Insert &spaces instead of tabs Insertar e&spacios en vez de tabulaciones - Enable automatic &indentation Activar i&ndentación automática - Tab key performs auto-indent: La tecla de tabulación autoindentará: - Never Nunca - Always Siempre - In leading white space Cuando empiece con un espacio @@ -9635,67 +9201,54 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg Mostrar - Display line &numbers Mostrar &números de línea - Display &folding markers Mostrar marcadores de ple&gado - Show tabs and spaces. Mostrar tabulaciones y espacios. - &Visualize whitespace &Visualizar espacios en blanco - Highlight current &line Resaltar &línea actual - Text Wrapping Ajuste de texto - Enable text &wrapping Activar ajuste de te&xto - Display right &margin at column: Mostrar &margen derecho en columna: - Highlight &blocks Resaltar &bloques - Animate matching parentheses Animar pareo de paréntesis - Navigation Navegación - Enable &mouse navigation Activar navegación con el &ratón - Mark text changes @@ -9794,17 +9347,14 @@ The following encodings are likely to fit: Fuente - Family: Familia: - Size: Tamaño: - Color Scheme Esquema de colores @@ -9833,17 +9383,14 @@ The following encodings are likely to fit: Previsualización: - Antialias - Copy... - Delete Suprimir @@ -10197,7 +9744,7 @@ The following encodings are likely to fit: - TopicChooser + ::Help Choose a topic for <b>%1</b>: Elija un tópico para <b>%1</b>: @@ -10207,17 +9754,14 @@ The following encodings are likely to fit: Elegir tópico - &Topics &Tópicos - &Display &Desplegar - &Close &Cerrar @@ -10301,39 +9845,32 @@ The following encodings are likely to fit: Preguntar antes de enviar - Wrap submit message at: Longitud máxima de líneas (en caracteres): - An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. Un ejecutable que es invocado con un archivo (temporal, conteniendo el mensaje) como primer argumento. Para indicar falla, debe retornar un valor distinto de 0 y volcar un mensaje en la salida de error estándar. - Submit message check script: Script de comprobación de mensaje de envío: - A file listing user names and email addresses in a 4-column mailmap format: name <email> alias <email> Una lista de nombres de usuario y direcciones de email en un formato mailmap de 4 columnas: nombre <email> alias <email> - User/alias configuration file: Archivo de configuración usuario/alias: - A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. Un archivo simple conteniendo líneas con campos como "Revisado-Por:" que será agregado al editor de mensajes. - User fields configuration file: Archivo de configuración de campos de usuario: @@ -10370,22 +9907,18 @@ Nota: Puede que se elimine la copia local del archivo. Enviar a CodePaster - &Username: &Usuario: - <Username> <Usuario> - &Description: &Descripción: - <Description> <Descripción> @@ -10404,22 +9937,18 @@ p, li { white-space: pre-wrap; } Partes a enviar a CodePaster - Patch 1 Parche 1 - Patch 2 Parche 2 - Protocol: - <!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; } @@ -10428,7 +9957,6 @@ p, li { white-space: pre-wrap; } - Parts to send to server @@ -10440,22 +9968,18 @@ p, li { white-space: pre-wrap; } - Text1: - N/A No presente - Text2: - Text3: @@ -10467,29 +9991,25 @@ p, li { white-space: pre-wrap; } - TextLabel - CheckBox - PasteBinComSettingsWidget + ::CodePaster Form Formulario - Server Prefix: - <!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; } @@ -10500,33 +10020,28 @@ p, li { white-space: pre-wrap; } - Cvs + ::CVS Prompt to submit Preguntar antes de enviar - When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed. - Describe all files matching commit id: - CVS Command: - CVS Root: - Diff Options: @@ -10542,42 +10057,34 @@ p, li { white-space: pre-wrap; } Formulario - Gdb - Symbian ARM gdb location: - Cygwin location: - Communication - Serial Port - Bluetooth - Port: - Device: @@ -10589,37 +10096,30 @@ p, li { white-space: pre-wrap; } Formulario - Embedding of the UI Class - Aggregation as a pointer member Agregar como miempro puntero - Aggregation Agregar como miembro - Multiple Inheritance Herencia múltiple - Code Generation - Support for changing languages at runtime Permitir el cambio de idioma en tiempo de ejecución - Use Qt module name in #include-directive @@ -10654,17 +10154,14 @@ p, li { white-space: pre-wrap; } - Filter: Filtro: - ... - Keep updating @@ -10684,12 +10181,10 @@ p, li { white-space: pre-wrap; } - Filter: Filtro: - ... @@ -10731,108 +10226,88 @@ p, li { white-space: pre-wrap; } - GeneralSettingsPage + ::Help Form Formulario - Font Fuente - Family: Familia: - Style: - Size: Tamaño: - Startup Inicio - On context help: - Show side-by-side if possible - Always show side-by-side - Always start full help - On help start: - Show my home page - Show a blank page - Show my tabs from last session - Home Page: - Use &Current Page - Use &Blank Page - Restore to Default - Help Bookmarks - Import... Importar... - Export... Exportar... @@ -10844,27 +10319,22 @@ p, li { white-space: pre-wrap; } Construir y ejecutar - Save all files before Build Guardar todos los archivos antes de construir - Always build Project before Running Siempre construir el proyecto antes de ejecutar - Show Compiler Output on building - Use jom instead of nmake - <i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. For more details, see the <a href="http://qt.gitorious.org/qt-labs/jom/">jom Homepage</a>. Disable it if you experience problems with your builds. @@ -10873,12 +10343,10 @@ p, li { white-space: pre-wrap; } Formulario - Manage Sessions... Gestionar sesiones... - Create New Project... Crear un nuevo proyecto... @@ -10913,117 +10381,94 @@ p, li { white-space: pre-wrap; } Formulario - The header file - &Sources - Widget librar&y: - Widget project &file: - Widget h&eader file: - The header file has to be specified in source code. - Widge&t source file: - Widget &base class: - QWidget - Plugin class &name: - Plugin &header file: - Plugin sou&rce file: - Icon file: - &Link library - Create s&keleton - Include pro&ject - &Description - G&roup: - &Tooltip: - W&hat's this: - The widget is a &container - Property defa&ults - dom&XML: @@ -11040,42 +10485,34 @@ p, li { white-space: pre-wrap; } - Plugin and Collection Class Information - Specify the properties of the plugin library and the collection class. - Collection class: - Collection header file: - Collection source file: - Plugin name: - Resource file: - icons.qrc @@ -11084,17 +10521,14 @@ p, li { white-space: pre-wrap; } - Custom Widget List - Widget &Classes: - Specify the list of custom widgets and their properties. @@ -11102,12 +10536,10 @@ p, li { white-space: pre-wrap; } ::Welcome - Examples not installed Ejemplos no instalados - Open Abrir @@ -11232,22 +10664,18 @@ p, li { white-space: pre-wrap; } ::QmakeProjectManager - Installed S60 SDKs: - SDK Location - Qt Location - Refresh Refrescar @@ -11263,27 +10691,22 @@ p, li { white-space: pre-wrap; } Negritas - Italic Itálicas - Background: Fondo: - Foreground: Texto: - Erase background Limpiar fondo - x @@ -11295,12 +10718,10 @@ p, li { white-space: pre-wrap; } - Checkout Directory: - Path: Ruta: @@ -11347,7 +10768,6 @@ p, li { white-space: pre-wrap; } - #headerFrame { border-image: url(:/welcome/images/center_frame_header.png) 0; border-width: 0; @@ -11356,12 +10776,10 @@ p, li { white-space: pre-wrap; } - Help us make Qt Creator even better Ayúdenos a hacer Qt Creator aún mejor - Feedback @@ -11421,27 +10839,14 @@ p, li { white-space: pre-wrap; } Server: - - - PasteBinDotComProtocol Error during paste - - - PasteBinDotComSettings Pastebin.com - - CodePaster - - - - - PasteView Paste Pegar @@ -11493,7 +10898,7 @@ p, li { white-space: pre-wrap; } - Cvs + ::CVS Checks out a project from a CVS repository. @@ -11767,9 +11172,6 @@ p, li { white-space: pre-wrap; } - - - ::Debugger Attached to core temporarily. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index a6a86f56b8a..57a06d9884e 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -623,7 +623,7 @@ - CompletionSettingsPage + ::TextEditor Code Completion Complétion du code @@ -652,10 +652,6 @@ Autocomplete common &prefix Autocomplétion du &préfixe commun - - Behavior - Comportement - &Case-sensitivity: Sensibilité à la &casse : @@ -664,10 +660,6 @@ Full Totale - - None - Aucune - First Letter Première lettre @@ -688,10 +680,6 @@ When Triggered À la demande - - Always - Toujours - Automatically insert brackets and semicolons when appropriate. Insérer automatiquement les accolades et les points-virgule où cela est approprié. @@ -714,7 +702,7 @@ - ContentWindow + ::Help Open Link Ouvrir le lien @@ -880,10 +868,6 @@ Voulez vous les écraser ? Meta+E Meta+E - - Ctrl+E - Ctrl+E - Close All Except Visible Fermer tout sauf l'éditeur visible @@ -2904,9 +2888,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Override &start script: Surcharger le &script de démarrage : - - - ::Debugger Select start address Sélectionner l'adresse de départ @@ -2923,9 +2904,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Enter an address: Entrer une adresse : - - - ::Debugger Marker File: Alternative "Fichier ayant le marqueur" @@ -3178,9 +3156,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Breakpoint will only be hit in the specified thread(s). Le point d'arrêt ne sera rencontré que dans le(s) thread(s) spécifié(s). - - - ::Debugger Breakpoints Points d'arrêt @@ -3230,9 +3205,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Querying dumpers for '%1'/'%2' (%3) Recherche de collecteur pour '%1'/"%2" (%3) - - - ::Debugger Cdb Cdb @@ -3294,9 +3266,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Ignore first chance access violations Ignorer les violations d'accès à la première tentative - - - ::Debugger Symbol Server... Serveur de symboles... @@ -3593,9 +3562,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Execute line Exécuter la ligne - - - ::Debugger Debugging Helper Assistance au débogage @@ -3649,9 +3615,6 @@ Pour plus de détails, voir /etc/sysctl.d/10-ptrace.conf Show Qt's namespace for types Afficher l'espace de noms de Qt pour les types - - - ::Debugger The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program. Échec du démarrage du processus Gdb. Soit le programme "%1" est manquant, soit les droits sont insuffisants pour exécuter le programme. @@ -4315,9 +4278,6 @@ Ceci pourrait amener à des résultats incorrects. About variable's value <aucune information> - - - ::Debugger GDB timeout: Délai GDB : @@ -4557,9 +4517,6 @@ at debugger startup. Choose Location of Startup Script File Choisir l'emplacement du fichier contenant le script de démarrage - - - ::Debugger Modules Modules @@ -4662,9 +4619,6 @@ at debugger startup. Level Niveau - - - ::Debugger Thread id: ID du thread : @@ -5319,29 +5273,6 @@ Regénérer le projet peut résoudre ce problème. Impossible d'ajouter la déclaration de la méthode. - - DocSettingsPage - - Registered Documentation - Documentation enregistrée - - - Add... - Ajouter... - - - Remove - Supprimer - - - Add and remove compressed help files, .qch. - Ajouter et supprimer des fichiers d'aide compressés, .qch. - - - Add - Ajouter - - EmbeddedPropertiesPage @@ -6092,7 +6023,7 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e - Find::Internal::FindDialog + ::Core Search for... Rechercher... @@ -6109,10 +6040,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Search &for: Rec&herche : - - Close - Fermer - &Case sensitive Sensible à la &casse @@ -6129,10 +6056,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Use regular e&xpressions Utiliser des e&xpressions régulières - - Cancel - Annuler - Sco&pe: &Contexte : @@ -6157,24 +6080,10 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Search && &Replace &Remplacer && Suivant - - - Find::Internal::FindPlugin - - &Find/Replace - &Rechercher/Remplacer - Find... Rechercher dans... - - Ctrl+Shift+F - Ctrl+Maj+F - - - - Find::Internal::FindToolBar Current Document Document courant @@ -6263,9 +6172,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Preserve Case when Replacing Conserver la casse lors du remplacement - - - Find::Internal::FindWidget Find Rechercher @@ -6274,10 +6180,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Find: Rechercher : - - Replace with: - Remplacer par : - All Tout @@ -6286,25 +6188,10 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e ... ... - - Replace - Remplacer - - - Replace && Find - Remplacer && chercher - - - Replace All - Remplacer tout - Advanced... Avancé... - - - Find::SearchResultWindow No matches found! Aucun résultat ! @@ -6321,22 +6208,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e %1 %2 %1 %2 - - Replace with: - Remplacer avec : - - - Replace all occurrences - Remplacer toutes les occurrences - - - Replace - Remplacer - - - This change cannot be undone. - Ce changement ne peut être annulé. - Do not warn again Ne plus avertir @@ -6351,7 +6222,7 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e - GenericMakeStep + ::ProjectExplorer Override %1: Écraser %1 : @@ -8648,10 +8519,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l Copy &Link Location Copier l'adresse du &lien - - Open Link in New Tab - Ouvrir le lien dans un nouvel onglet - Select All Tout sélectionner @@ -8664,14 +8531,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l Indexing Documentation... Indexation de la documentation… - - Open Link - Ouvrir le lien - - - Open Link as New Page - Ouvrir le lien en tant que nouvelle page - Copy Link Copier le lien @@ -8733,32 +8592,10 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l proxy -> serveur mandataire ? -> en théorie, oui <li>Si votre ordinateur ou votre réseau est protégé par un pare-feu ou un serveur mandataire, assurez-vous que l'application est autorisée à accéder au réseau.</li> - - - IndexWindow &Look for: &Rechercher : - - Open Link - Ouvrir le lien - - - Open Link as New Page - Ouvrir le lien en tant que nouvelle page - - - Open Link in New Tab - Ouvrir le lien dans un nouvel onglet - - - - InputPane - - Type Ctrl-<Return> to execute a line. - Taper Ctrl-<Retour> pour exécuter une ligne. - ::Core @@ -9017,15 +8854,7 @@ dans votre fichier .pro. - MakeStep - - Override %1: - Écraser %1 : - - - Make arguments: - Arguments de Make : - + ::ProjectExplorer MyMain @@ -9053,17 +8882,6 @@ dans votre fichier .pro. Surnoms - - OpenWithDialog - - Open File With... - Ouvrir le fichier avec... - - - Open file extension with: - Ouvrir ce type d'extension avec : - - ::Perforce @@ -9608,29 +9426,6 @@ francis : voila une nouvelle suggestion :) Utilisateur : - - PluginDialog - - Details - Détails - - - Error Details - Détails de l'erreur - - - Installed Plugins - Plug-ins installés - - - Plugin Details of %1 - Détails sur le plug-in %1 - - - Plugin Errors of %1 - Erreurs du plug-in %1 - - ::ExtensionSystem @@ -9940,10 +9735,6 @@ francis : voila une nouvelle suggestion :) Remove Supprimer - - Rename - Renommer - Remove Build Configuration Supprimer la configuration de la compilation @@ -10430,10 +10221,6 @@ au projet '%2'. Show containing folder... Afficher le dossier parent... - - Recent Projects - Projets récents - Close Project Fermer le projet @@ -11202,10 +10989,6 @@ au système de gestion de version (%2) ? Location: Emplacement : - - <Current File> - <Fichier courant> - QML Viewer arguments: Arguments du visualisateur QML : @@ -11216,7 +10999,7 @@ au système de gestion de version (%2) ? - QrcEditor + ::ResourceEditor Add Ajouter @@ -12741,9 +12524,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Recheck existence of referenced files Vérifiez à nouveau l'existence des fichiers référencés - - - ::ResourceEditor Open With Ouvrir avec @@ -12761,21 +12541,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t sans titre - - SaveItemsDialog - - Save Changes - Sauvegarder les changements - - - The following files have unsaved changes: - Les fichiers suivants contiennent des modifications non enregistrées : - - - Automatically save all files before building - Sauvegarder automatiquement tous les fichiers avant de compiler - - SettingsDialog @@ -12788,56 +12553,15 @@ To do this, you type this shortcut and a space in the Locator entry field, and t - SharedTools::QrcEditor - - Add Files - Ajouter des fichiers - - - Add Prefix - Ajouter un préfixe - - - Choose Copy Location - Choisir l'emplacement de copie - - - Overwriting Failed - Echec de l'écrasement - - - Copying Failed - Échec de la copie - + ::ResourceEditor Invalid file Fichier invalide - - Copy - Copier - - - Skip - ignorer ? - Passer - - - Abort - Abandonner - The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file. Le fichier %1 n'est pas dans un sous-dossier du fichier de ressource. Continuer résulterait en un fichier de ressource invalide. - - Invalid file location - Emplacement de fichier invalide - - - The file %1 is not in a subdirectory of the resource file. You now have the option to copy this file to a valid location. - Le fichier %1 n'est pas dans un sous-dossier du fichier de ressource. Vous avez maintenant la possibilité de le copier vers un emplacement valide. - Choose copy location Choisir le chemin de la copie @@ -12846,21 +12570,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Overwrite failed L'écrasement a échoué - - Could not overwrite file %1. - L'écrasement du fichier %1 a échoué. - Copying failed Échec de la copie - - Could not copy the file to %1. - La copie du fichier dans "%1" a échoué. - - - - SharedTools::ResourceView Add Files... Ajouter des fichiers... @@ -12885,10 +12598,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Remove Item Supprimer l'élément - - Open File - Ouvrir le fichier - Input prefix: Préfixe d'entrée : @@ -12897,10 +12606,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Open file Ouvrir le fichier - - All files (*) - Tous les fichiers (*) - Change Prefix Changer le préfixe @@ -12913,53 +12618,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Change Language Changer la langue - - Language: - Langue : - Change File Alias Changer l'alias du fichier - - Alias: - Alias : - - ShortcutSettings - - Keyboard Shortcuts - Raccourcis clavier - - - Filter: - Filtre : - - - Command - Commande - - - Label - Libellé - - - Shortcut - Raccourci - + ::Core Defaults Restaurer - - Import... - Importer... - - - Export... - Exporter... - Key Sequence Combinaison de touches @@ -12968,14 +12637,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Shortcut: Raccourci : - - Reset - Réinitialiser - - - Remove - Supprimer - ShowBuildLog @@ -14766,7 +14427,7 @@ Ne sera pas appliquée aux espaces dans les commentaires et les chaînes. - TopicChooser + ::Help Choose Topic thème ? @@ -15031,11 +14692,7 @@ p, li { white-space: pre-wrap; } - PasteBinComSettingsWidget - - Form - Formulaire - + ::CodePaster Server Prefix: Préfixe du serveur : @@ -15054,10 +14711,6 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://pastebin.com"><span style=" text-decoration: underline; color:#0000ff;">pastebin.com</span></a><span style=" font-size:8pt;"> permet d'envoyer les snippet à des sous-domaines personnalisés (eg. qtcreator.pastebin.com). Remplissez le préfixe désiré.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Notez que les plug-ins utiliseront ceci pour poster et récupérer les snippets.</span></p></body></html> - - Server prefix: - Préfixe du serveur : - <html><head/><body> <p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</p> @@ -15066,17 +14719,9 @@ p, li { white-space: pre-wrap; } <p><a href="http://pastebin.com">pastebin.com</a> permet d'envoyer les snippets à des sous-domaines personnalisés (par exemple qtcreator.pastebin.com). Remplissez le préfixe désiré.</p> <p>Notez que les plug-ins utiliseront ceci pour poster et récupérer les snippets.</p></body></html> - - <a href="http://pastebin.com">pastebin.com</a> allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix. - <a href="http://pastebin.com">pastebin.com</a> permet d'envoyer d'envoyer des messages à des sous-domaines personnalisés (comme creator.pastebin.com). Remplissez le préfixe désiré. - - - <i>Note: The plugin will use this for posting as well as fetching.</i> - <i>Note : le plug-in utilisera ceci pour poster et récupérer. </i> - - Cvs + ::CVS Prompt to submit Invite lors du submit @@ -15326,35 +14971,7 @@ p, li { white-space: pre-wrap; } - GeneralSettingsPage - - Form - Formulaire - - - Font - Police - - - Family: - Famille : - - - Style: - Style : - - - Size: - Taille : - - - Startup - Démarrage - - - On context help: - Pour l'aide contextuelle : - + ::Help Show side-by-side if possible Afficher côte à côte si possible @@ -15367,10 +14984,6 @@ p, li { white-space: pre-wrap; } Always start full help Toujours afficher l'aide complète - - On help start: - Au démarrage de l'aide : - Show my home page Afficher ma page d'accueil @@ -15387,14 +15000,6 @@ p, li { white-space: pre-wrap; } Home Page: Page d'accueil : - - Use &Current Page - Utiliser la page &courante - - - Use &Blank Page - Utiliser une page &blanche - Restore to Default Restaurer les paramètres par défaut @@ -15411,58 +15016,6 @@ p, li { white-space: pre-wrap; } Export... Exporter... - - Show Side-by-Side if Possible - Afficher côte à côte si possible - - - Always Show Side-by-Side - Toujours afficher côte à côte - - - Always Start Full Help - Toujours afficher l'aide complète - - - Show My Home Page - Afficher ma page d'accueil - - - Show a Blank Page - Afficher une page blanche - - - Show My Tabs from Last Session - Afficher mes onglets de la dernière session - - - Home page: - Page d'accueil : - - - Always Show Help in External Window - Toujours afficher l'aide dans une fenêtre externe - - - Behaviour - Comportement - - - Switch to editor context after last help page is closed. - Basculer vers l'éditeur de contexte après que la dernière page d'aide soit fermée. - - - Return to editor on closing the last page - Retourner à l'éditeur lors de la fermeture de la dernière page - - - Reset to default - Restaurer les paramètres par défaut - - - Reset - Réinitialiser - ::ProjectExplorer @@ -16162,47 +15715,14 @@ p, li { white-space: pre-wrap; } Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com). Note : spécifiez le nom d'hôte du service CodePaster sans aucun protocole (par exemple, codepaster.mycompany.com). - - - PasteBinDotComProtocol Error during paste Erreur durant le collage - - - PasteBinDotComSettings Pastebin.com Pastebin.com - - Code Pasting - Collage de code - - - CodePaster - CodePaster - - - - PasteView - - Paste - Coller - - - <Username> - <Utilisateur> - - - <Description> - <Description> - - - <Comment> - <Commentaire> - ::CppEditor @@ -16224,7 +15744,7 @@ p, li { white-space: pre-wrap; } - Cvs + ::CVS Checks out a project from a CVS repository. Obtient un projet à partir d'un dépôt CVS. @@ -16951,18 +16471,6 @@ p, li { white-space: pre-wrap; } Reset Réinitialiser - - Help Bookmarks - Signet de l'aide - - - Import... - Importer... - - - Export... - Exporter... - Behaviour Comportement @@ -18212,61 +17720,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name, taille d'un flottant : %1 - - CommandMappings - - Command Mappings - Mappages de commandes - - - Command - Commande - - - Label - Libellé - - - Target - Cible - - - Defaults - Restaurer - - - Import... - Importer... - - - Export... - Exporter... - - - Target Identifier - Identifiant de la cible - - - Target: - Cible : - - - Reset - Réinitialiser - - - Reset all to default - Restaurer tous les paramètres par défaut - - - Reset All - Tout réinitialiser - - - Reset to default - Restaurer les paramètres par défaut - - ::Git @@ -19681,73 +19134,22 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband Cleaning %1 Nettoyage de %1 - - - CommonSettingsPage - - Wrap submit message at: - Limiter la largeur du message à : - - - characters - caractères - - - An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. - Un fichier exécutable qui est appelé avec comme premier argument le message dans un fichier temporaire. Pour indiquer une erreur, il doit se terminer avec un code différent de 0 et un message sur la sortie d'erreur standard. - Submit message check script: Script de vérification du message : - - A file listing user names and email addresses in a 4-column mailmap format: -name <email> alias <email> - Un fichier listant les noms d'utilisateur et leurs adresses email dans le format 4 colonnes de mailmap : -nom <email> alias <email> - User/alias configuration file: Fichier de configuration des alias utilisateur : - - A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. - Un fichier texte contenant des lignes telles que "Reviewed-By:", qui seront ajoutées à la fin dans l'éditeur de message. - User fields configuration file: Fichier de configuration des champs utilisateurs : - - Specifies a command that is executed to graphically prompt for a password, -should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS). - Spéficie une commande qui est exécutée pour demander graphiquement un mot de passe -si un dépôt requiert une authentification SSH (voir la documentation sur SSH et la variable d'environnement SSH_ASKPASS). - SSH prompt command: Invite de commande SSH : - - Submit message &check script: - Script de vérifi&cation du message : - - - User/&alias configuration file: - Fichier de configuration des &alias utilisateur : - - - User &fields configuration file: - &Fichier de configuration des champs utilisateurs : - - - &Patch command: - Commande &Patch : - - - &SSH prompt command: - Invite de commande &SSH : - BorderImageSpecifics @@ -20478,10 +19880,6 @@ francis : ouai assez d'accord. expected anchor line Ancre de ligne attendue - - unreachable - inattingible - declarations should be at the start of a function les déclarations devraient être au début d'une fonction @@ -20594,14 +19992,6 @@ francis : ouai assez d'accord. expression statements should be assignments, calls or delete expressions only les définitions d'expression devraient être des expression d'assignation, d'appel ou de suppression uniquement - - 'new' should only be used with functions that start with an uppercase letter - 'new' ne devrait être utilisé qu'avec des fonctions qui commence par une lettre majuscule - - - calls of functions that start with an uppercase letter should use 'new' - les appels de fonctions qui commence par une lettre majuscule devrait utiliser 'new' - avoid assignments in conditions éviter l'assignement dans les conditions @@ -21341,7 +20731,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - Cvs + ::CVS Annotate revision "%1" Révision annotée "%1" @@ -21373,9 +20763,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. The folder '%1' could not be created. Le dossier "%1' n"a pas pu être créé. - - - ::Debugger Running requested... Exécution demandée… @@ -21480,7 +20867,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - Find::FindPlugin + ::Core &Find/Replace &Rechercher/Remplacer @@ -21493,11 +20880,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Open Advanced Find... Ouvrir la recherche avancée... - - Advanced... - c'est surement la recherche donc je mettrais un e à la fin - Avancée... - Ctrl+Shift+F Ctrl+Shift+F @@ -22575,34 +21957,10 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Qt Application Application Qt - - - TargetSettingsPanelFactory Targets Cibles - - Build & Run - Compiler et exécuter - - - - RunSettingsPanelFactory - - Run Settings - Paramètres d'exécution - - - - RunSettingsPanel - - Run Settings - Paramètres d'exécution - - - - ::ProjectExplorer Enter the name of the session: Entrez le nom de la session : @@ -23024,13 +22382,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Propriétés - - FileWidget - - Open File - Ouvrir un fichier - - QmlDesigner::PropertyEditor @@ -24082,16 +23433,10 @@ Nécessite <b>Qt 4.8</b> ou plus récent. Debugging Port: Port du débogueur : - - - QmlManager <Current File> <Fichier courant> - - - ::QmlProjectManager Run QML Script Executer le script QML @@ -24859,26 +24204,15 @@ Preselects Qt for Simulator and mobile targets if available - ComponentNameDialog + ::QmlJSEditor Dialog Boîte de dialogue - - Component name: - Nom du composant : - - - Path: - Chemin : - Choose... Choisir... - - - ::QmlJSEditor Form Formulaire @@ -25312,13 +24646,6 @@ La liste du serveur était %2. Connexion à %1... - - CheckUndefinedSymbols - - Expected a namespace-name - Un nom de namespace est attendu - - ::CppEditor @@ -25629,9 +24956,6 @@ Cette fonctionnalité n'est disponible que pour GDB. &Message: &Message : - - - ::Debugger The console process '%1' could not be started. Le processus de la console "%1' n"a pas pu être démarré. @@ -25708,9 +25032,6 @@ Cette fonctionnalité n'est disponible que pour GDB. Ignoring initial breakpoint... Point d'arrêt initial ignoré… - - - ::Debugger Attempting to interrupt. Tentative d'interruption. @@ -25719,9 +25040,6 @@ Cette fonctionnalité n'est disponible que pour GDB. Debugger Test Test du débogueur - - - ::Debugger Launching Lancement @@ -25903,13 +25221,6 @@ Section %1 : %2 Jump to Line %1 Sauter à la ligne %1 - - - ::Debugger - - Debug - Débogage - Option '%1' is missing the parameter. Option "%1" : le paramètre est manquant. @@ -26027,9 +25338,6 @@ Details: %3 Close Debugging Session Fermer la session de débogage - - - ::Debugger Connection could not be established. La connexion ne peut être établie. @@ -26082,16 +25390,10 @@ Details: %3 Unable to write log contents to '%1': %2 Impossible d'écrire le contenu du journal d'événements dans "%1" : %2 - - - ::Debugger Type Ctrl-<Return> to execute a line. Taper Ctrl-<Retour> pour exécuter une ligne. - - - ::Debugger Debugger Log Journal de débogage @@ -26146,43 +25448,11 @@ plutôt que dans le répertoire d'installation lors d'une exècution e - EditorManager - - Next Open Document in History - Document ouvert suivant dans l'historique - - - Previous Open Document in History - Document ouvert précédent dans l'historique - - - Go Back - Précédent - - - Go Forward - Suivant - - - Split - Scinder - - - Split Side by Side - Scinder verticalement - - - Open in New Window - Ouvrir dans une nouvelle fenêtre - + ::Core Close Document Fermer le document - - Close - Fermer - ::Help @@ -26487,10 +25757,6 @@ utilisez import Qt 4.7 au lieu de import QtQuick 1.0 Invalid path Chemin invalide - - Dialog - Boîte de dialogue - Component name: Nom du composant : @@ -26499,20 +25765,6 @@ utilisez import Qt 4.7 au lieu de import QtQuick 1.0 Path: Chemin : - - Choose... - Choisir... - - - - QmlJsEditor - - QML - QML - - - - ::QmlJSEditor QML/JS Usages: Utilisations QML/JS : @@ -28118,21 +27370,6 @@ Les pulls locaux ne sont pas appliqués à la branche maître. La publication n'est pas actuellement possible pour le projet "%1". - - ToolChainOptionsPage - - Add - Ajouter - - - Remove - Supprimer - - - Clone - Cloner - - ::QmakeProjectManager @@ -29011,9 +28248,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Helgrind Thread ID ID du thread Helgrind - - - ::Valgrind Location: Emplacement : @@ -29022,9 +28256,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Instruction pointer: Pointeur d'instruction : - - - ::Valgrind Could not parse hex number from "%1" (%2) Impossible de parser le nombre hexadécimal depuis "%1" (%2) @@ -29077,9 +28308,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Unexpected exception caught during parsing. Exception inattendue lors du parsage. - - - ::Valgrind Description Description @@ -29833,10 +29061,6 @@ au gestionnaire de version (%2) Generate missing Q_PROPERTY members... Générer les membre Q_PROPERTY manquant... - - Generate Missing Q_PROPERTY Members... - Générer les membre Q_PROPERTY manquants... - Expand All Développer tout @@ -30384,9 +29608,6 @@ Qt Creator ne peut pas s'y attacher. Qt Sources Sources de Qt - - - ::Debugger %1 (%2) %1 (%2) @@ -30395,9 +29616,6 @@ Qt Creator ne peut pas s'y attacher. <html><head/><body><table><tr><td>ABI:</td><td><i>%1</i></td></tr><tr><td>Debugger:</td><td>%2</td></tr> <html><head/><body><table><tr><td>ABI :</td><td><i>%1</i></td></tr><tr><td>Débogueur :</td><td>%2</td></tr> - - - ::Debugger Debugging complex command lines is currently not supported under Windows Débogueur des lignes de commande complexes n'est pas actuellement supporté sous Windows @@ -30406,9 +29624,6 @@ Qt Creator ne peut pas s'y attacher. Debugging complex command lines is currently not supported on Windows. Débogueur des lignes de commande complexes n'est pas actuellement supporté sous Windows. - - - ::Debugger Fatal engine shutdown. Incompatible binary or IPC error. Arrêt fatal du moteur. Erreur de compatibilité des binaires ou 'IPC. @@ -30425,16 +29640,10 @@ Qt Creator ne peut pas s'y attacher. SSH connection error: %1 Erreur de connexion SSH : %1 - - - ::Debugger LLDB LLDB - - - ::Debugger Memory $ Mémoire $ @@ -30455,9 +29664,6 @@ Qt Creator ne peut pas s'y attacher. The memory contents cannot be shown as no viewer plugin for binary data has been loaded. Le contenu de la mémoire ne peut pas être affiché car aucun éditeur pour des données binaires n'a pu être chargé. - - - ::Debugger The slave debugging engine required for combined QML/C++-Debugging could not be created: %1 Le moteur de débogage esclave requis pour le débogage combiné QML/C++ n'a pas pu être créé : %1 @@ -30484,9 +29690,6 @@ Suggestions: Move the breakpoint after QmlApplicationViewer instantiation or swi Impossible d'arrêter l'exécution avant que le moteur QML est démarré. Le point d'arrêt est ignoré. Suggestions : déplacer le point d'arrêt après l'instanciation de QmlApplicationViewer ou passer au débogage du code C++ exclusivement. - - - ::Debugger QML Debugger connected. Débogueur QML connecté. @@ -30640,21 +29843,11 @@ Do you want to retry? - GLSLEditor::Internal::FunctionArgumentWidget + ::GlslEditor %1 of %2 %1 de %2 - - - ::GLSLEditor - - GLSL - GLSL - - - - GLSLEditor::Internal::GLSLEditorPlugin GLSL GLSL sub-menu in the Tools menu @@ -30692,9 +29885,6 @@ Do you want to retry? Vertex Shader (Desktop OpenGL) Vertex shader (OpenGL) - - - GLSLEditor::GLSLFileWizard New %1 Nouveau %1 @@ -32487,25 +31677,6 @@ if (a && Texte - - StatusDisplay - - No QML events recorded - Pas d'événement QML enregistré - - - Profiling application - Profilage de l'application - - - Loading data - Chargement des données - - - Application stopped before loading all data - L'application a stoppé avant le chargement de toutes les données - - TimeDisplay @@ -32679,9 +31850,6 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install Compiler: Compilateur : - - - ::QtSupport Version name: Nom de version : @@ -32694,9 +31862,6 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install Edit Éditer - - - ::QtSupport Name Nom @@ -32722,45 +31887,6 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install Ajouter... - - GenericLinuxDeviceConfigurationWizardSetupPage - - WizardPage - WizardPage - - - The name to identify this configuration: - Le nom pour identifier cette configuration : - - - The device's host name or IP address: - Le nom d'hôte du périphérique ou son adresse IP : - - - The user name to log into the device: - Le nom d'utilisateur pour se connecter sur le périphérique : - - - The authentication type: - Le type d'authentification : - - - Password - Mot de passe - - - Key - Clé - - - The user's password: - Le mot de passe de l'utilisateur : - - - The file containing the user's private key: - Le fichier contenant la clé privée de l'utilisateur : - - ::Valgrind @@ -32783,9 +31909,6 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install Save Suppression Sauvegarder la suppression - - - ::Valgrind Generic Settings Paramètres génériques @@ -33441,27 +32564,15 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac - develop + ::ProjectExplorer Manage Sessions... Gestion des sessions... - - Develop - Developper - - - Sessions - Sessions - Recent Projects Projets récents - - New Project - Nouveau projet - Open Project Ouvrir le projet @@ -33491,7 +32602,7 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac - ExampleDelegate + ::Core Tags: Tags : @@ -33539,26 +32650,15 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac - RecentProjects + ::ProjectExplorer Recently Edited Projects Projets récemment édités - - - RecentSessions Recently Used Sessions Sessions récemment utilisées - - %1 (last session) - %1 (dernière session) - - - %1 (current session) - %1 (session courante) - TagBrowser @@ -33814,7 +32914,7 @@ Would you like to overwrite them? - Cvs + ::CVS Ignore whitespace Ignorer les espaces @@ -33838,9 +32938,6 @@ Would you like to overwrite them? Previous Précédent - - - ::Debugger Memory at Register '%1' (0x%2) Mémoire au registre "%1" (0x%2) @@ -34658,7 +33755,7 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f - BaseQtVersion + ::QtSupport The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4). Le compilateur "%1" (%2) ne peut produire du code pour la version de Qt "%3" (%4). @@ -34723,9 +33820,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Building helpers Aide à la compilation - - - ::QtSupport <specify a name> <spécifier un nom> @@ -34762,10 +33856,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f The following ABIs are currently not supported:<ul><li>%1</li></ul> Les ABI suivantes ne sont pas supportées : <ul><li>%1</li></ul> - - Building helpers - Aide à la compilation - Debugging Helper Build Log for '%1' Journal de compilation de l'assistant de débogage pour "%1" @@ -34859,9 +33949,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f SBS v2 directory: Répertoire SBS v2 : - - - ::QtSupport MinGW from %1 MinGW depuis %1 @@ -34908,16 +33995,10 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Deployment finished. Déploiement fini. - - - ::RemoteLinux New Generic Linux Device Configuration Setup Configuration d'un nouveau périphérique Linux générique - - - ::RemoteLinux Connection Data Données de connexion @@ -34934,9 +34015,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Generic Linux Device Périphérique Linux générique - - - ::RemoteLinux Setup Finished Fin de l'installation @@ -34950,16 +34028,10 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f In addition, device connectivity will be tested. La configuration du nouveau périphérique va maintenant être créée. En plus, la connectivité du périphérique sera testée. - - - ::RemoteLinux (default for %1) (paramètre par défaut pour %1) - - - ::RemoteLinux Start Wizard Démarrer l'assistant @@ -34972,9 +34044,6 @@ In addition, device connectivity will be tested. Available device types: Types de périphérique disponibles : - - - ::RemoteLinux All files copied. Tous les fichiers ont été copiés. @@ -34983,9 +34052,6 @@ In addition, device connectivity will be tested. Deploy files via UTFS mount Déployer les fichiers par montage UTFS - - - ::RemoteLinux Choose Icon (will be scaled to %1x%1 pixels, if necessary) Choisir une icône (elle sera remise à l'échelle à %1x%1 pixels si nécessaire) @@ -35006,9 +34072,6 @@ In addition, device connectivity will be tested. Could not save icon to '%1'. Impossible d'enregistrer l'icône dans "%1". - - - ::RemoteLinux General Information Informations générales @@ -35017,16 +34080,10 @@ In addition, device connectivity will be tested. Device Status Check Vérification de l'état du périphérique - - - ::RemoteLinux Existing Keys Check Vérification des clés existantes - - - ::RemoteLinux Key Creation Création de clé @@ -35055,9 +34112,6 @@ In addition, device connectivity will be tested. Could Not Save Key File Impossible de sauver le fichier de la clé - - - ::RemoteLinux Key Deployment Déploiement de la clé @@ -35082,30 +34136,18 @@ In addition, device connectivity will be tested. Done. Fait. - - - ::RemoteLinux The new device configuration will now be created. La configuration du nouveau périphérique va maintenant être créée. - - - ::RemoteLinux New Device Configuration Setup Configuration du nouveau périphérique - - - ::RemoteLinux Cannot deploy to sysroot: No packaging step found. Impossible de déployer à la racine système : pas d'étape de paquetage trouvée. - - - ::RemoteLinux Cannot install to sysroot without build configuration. Impossible d'installer à la racine système sans configuration de la compilation. @@ -35126,23 +34168,14 @@ In addition, device connectivity will be tested. Installation to sysroot failed, continuing anyway. Échec lors de l'installation à la racine système, l'installation continue néanmoins. - - - ::RemoteLinux Install Debian package to sysroot Installer le paquet Debian à la racine système - - - ::RemoteLinux Install RPM package to sysroot Installer le paquet RMP à la racine système - - - ::RemoteLinux Cannot copy to sysroot without build configuration. Impossible de copier les fichiers à la racine système sans configuration de la compilation. @@ -35164,9 +34197,6 @@ In addition, device connectivity will be tested. Copy files to sysroot Copie des fichiers à la racine système - - - ::RemoteLinux Public key error: %1 Erreur de clé publique : %1 @@ -35175,9 +34205,6 @@ In addition, device connectivity will be tested. Key deployment failed: %1. Échec lors du déploiement de la clé : %1. - - - ::RemoteLinux Create Debian Package Créer un paquet Debian @@ -35186,9 +34213,6 @@ In addition, device connectivity will be tested. Create RPM Package Créer un paquet RPM - - - ::RemoteLinux Package up to date. Paquet à jour. @@ -35225,9 +34249,6 @@ In addition, device connectivity will be tested. Exit code: %1 Code de sortie : %1 - - - ::RemoteLinux Size should be %1x%2 pixels La taille devrait être de %1x%2 pixels @@ -35276,9 +34297,6 @@ In addition, device connectivity will be tested. Could Not Set Version Number Impossible de définir le numéro de la version - - - ::RemoteLinux Connection failure: %1 Échec de la connexion : %1 @@ -35287,16 +34305,10 @@ In addition, device connectivity will be tested. Installing package failed. Échec lors de l'installation du paquet. - - - ::RemoteLinux Installation failed: You tried to downgrade a package, which is not allowed. Échec de l'installation. Vous avez essayé d'installer une version plus ancienne d'un paquet, ce qui n'est pas permis. - - - ::RemoteLinux Choose directory to mount Sélectionner un répertoire à monter @@ -35331,16 +34343,10 @@ In addition, device connectivity will be tested. AVERTISSEMENT : vous voulez monter %1 répertoires mais seulement %n ports seront disponibles en mode debug. <br>Vous n'êtes pas en mesure de déboguervotre application avec cette configuration. - - - ::RemoteLinux Run on device Exécuter sur le périphérique - - - ::RemoteLinux Qemu error Erreur de Qemu @@ -35361,23 +34367,14 @@ In addition, device connectivity will be tested. Qemu is currently configured to auto-detect the OpenGL mode, which is known to not work in some cases. You might want to use software rendering instead. Qemu est actuellement configuré pour autodétecter le mode OpenGL, qui est connu pour ne pas toujours fonctionner. Vous pourrize vouloir utiliser le rendu logiciel à la place. - - - ::RemoteLinux Device Configurations Configurations de périphériques - - - ::RemoteLinux MeeGo Qemu Settings Paramètres de Qemu pour MeeGo - - - ::RemoteLinux Save Public Key File Enregistrer le fichier de clé publique @@ -35386,9 +34383,6 @@ In addition, device connectivity will be tested. Save Private Key File Enregistrer le fichier de clé privée - - - ::RemoteLinux Qemu was not running. It has now been started up for you, but it will take a bit of time until it is ready. Please try again then. Qemu n'était pas en cours d'exécution. Il a maintenant été lancé mais pourrait prendre un peu de temps avant d'être prêt. Veuillez réessayer alors. @@ -35409,9 +34403,6 @@ In addition, device connectivity will be tested. Unmounting host directories... Démontage des répertoires hôtes... - - - ::RemoteLinux Maemo GCC GCC pour Maemo @@ -35424,37 +34415,22 @@ In addition, device connectivity will be tested. %1 GCC (%2) %1 GCC (%2) - - - ::RemoteLinux <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> <html><head/><body><table><tr><td>Chemin de MADDE :</td><td>%1</td></tr><tr><td>Chemin de la cible MADDE :</td><td>%2</td></tr><tr><td>Débogueur :</td/><td>%3</td></tr></body></html> - - - ::RemoteLinux No matching packaging step found. Pas d'étape de paquetage correspondante trouvée. - - - ::RemoteLinux Deploy Debian package via SFTP upload Déployer le paquet Debian par SFTP - - - ::RemoteLinux Deploy RPM package via SFTP upload Déployer le paquet RPM par SFTP - - - ::RemoteLinux Could not start remote process: %1 Impossible de démarrer le processus distant : %1 @@ -35472,9 +34448,6 @@ In addition, device connectivity will be tested. Remote error output was: %1 La sortie du processus distant était : %1 - - - ::RemoteLinux Waiting for file name... Attente du nom de fichier... @@ -35495,9 +34468,6 @@ Remote error output was: %1 Deployment finished successfully. Le déploiement s'est déroulé avec succès. - - - ::RemoteLinux Debian changelog file '%1' has unexpected format. Le fichier de journal des changements Debian "%1" a un format inattendu. @@ -35530,9 +34500,6 @@ Remote error output was: %1 Unable to move new debian directory to '%1'. Impossible de déplacer le nouveau répertoire Debian dans "%1". - - - ::RemoteLinux Don't know what to run. bancal... @@ -35552,9 +34519,6 @@ Remote error output was: %1 Remote Linux run configuration default display name Lancer sur un périphérique distant - - - ::RemoteLinux (on Remote Generic Linux Host) (sur hôte distant Linux générique) @@ -35563,9 +34527,6 @@ Remote error output was: %1 (on Remote Generic Linux Host) (sur un hôte distant Linux générique) - - - ::RemoteLinux <a href="%1">Manage device configurations</a> <a href="%1">Gérer les configurations des périphériques</a> @@ -35611,9 +34572,6 @@ Remote error output was: %1 Remote path not set Chemin distant indéfini - - - ::RemoteLinux Starting remote process... @@ -35628,9 +34586,6 @@ Remote error output was: %1 Remote Execution Failure Échec lors de l'exécution à distance - - - ::RemoteLinux Run on remote Linux device Exécuter sur périphérique Linux distant @@ -35698,9 +34653,6 @@ Remote error output was: %1 Profilage de %1 - - - ::Valgrind Valgrind Function Profiler Profileur de fonction de Valgrind @@ -35713,9 +34665,6 @@ Remote error output was: %1 Profile Costs of this Function and its Callees Profiler les coûts de cette fonction et de ses appelés - - - ::Valgrind Callers ou -ants ? @@ -35850,32 +34799,20 @@ Remote error output was: %1 Populating... Remplissage... - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Toutes les fonctions avec un ratio de coût inclusif supérieur à %1 (%2 sont cachés) - - - ::Valgrind Analyzing memory of %1 Analyse de la mémoire de %1 - - - ::Valgrind in %1 dans %1 - - - ::Valgrind Copy Selection Copier la sélection @@ -35884,9 +34821,6 @@ Remote error output was: %1 Suppress Error Cacher les erreurs - - - ::Valgrind External Errors Erreurs externe @@ -35959,9 +34893,6 @@ Remote error output was: %1 Error occurred parsing valgrind output: %1 Erreur d'analyse de la sortie de Valgring : %1 - - - ::Valgrind Callee Appelé @@ -35978,9 +34909,6 @@ Remote error output was: %1 Calls Appels - - - ::Valgrind Previous command has not yet finished. La commande précédente n'a pas fini. @@ -36017,9 +34945,6 @@ Remote error output was: %1 Downloading remote profile data... Téléchargement des données de profilage distante... - - - ::Valgrind Function: Fonction : @@ -36089,9 +35014,6 @@ Remote error output was: %1 Incl. Cost: %1 Dont coût : %1 - - - ::Valgrind %1 in %2 %1 dans %2 @@ -36100,9 +35022,6 @@ Remote error output was: %1 %1:%2 in %3 %1 : %2 dans %3 - - - ::Valgrind Last-level Dernier niveau @@ -36159,9 +35078,6 @@ Remote error output was: %1 Position: Position : - - - ::Valgrind No network interface found for remote analysis. Pas d'interface réseau trouvée pour l'analyse à distance. @@ -36194,9 +35110,6 @@ Remote error output was: %1 No Network Interface was chosen for remote analysis Aucune interface réseau n'a été choisie pour l'analyse distante - - - ::Valgrind Valgrind options: %1 Options de Valgrind : %1 @@ -36237,9 +35150,6 @@ Remote error output was: %1 Application Output Sortie de l'application - - - ::Valgrind Analyzer Analyseur @@ -36829,7 +35739,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle - Find::IFindFilter + ::Core Case sensitive Sensible à la casse @@ -36858,17 +35768,10 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle , , - - - Find::Internal::SearchResultWidget Search was canceled. La recherche a été annulée. - - Cancel - Annuler - Repeat the search with same parameters Relancer la recherche avec les mêmes paramètres @@ -36885,22 +35788,10 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle Replace all occurrences Remplacer toutes les occurrences - - Replace - Remplacer - - - Preserve case - Préserver la casse - This change cannot be undone. Ce changement ne peut être annulé. - - Do not warn again - Ne plus avertir - The search resulted in more than %n items, do you still want to continue? @@ -37082,9 +35973,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Connection error: %1 Erreur de connexion : %1 - - - ::RemoteLinux Deployment failed: %1 Échec du déploiement : %1 @@ -37105,9 +35993,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Deploy step finished. Étape de déploiment effectuée. - - - ::RemoteLinux Successfully uploaded package file. Fichier de paquet envoyé avec succès. @@ -37120,9 +36005,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Package installed. Paquet installé. - - - ::RemoteLinux SFTP initialization failed: %1 Échec de l'initialisation de SFTP : %1 @@ -37159,9 +36041,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Warning: No remote path set for local file '%1'. Skipping upload. Attention: Aucun chemin distant de défini pour le fichier local '%1'. Continuation de l'envoie. - - - ::RemoteLinux Incremental deployment Déploiement incrémental @@ -37170,16 +36049,10 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Command line: Ligne de commande : - - - ::RemoteLinux Upload files via SFTP Envoi de fichiers par SFTP - - - ::RemoteLinux Generic Linux Linux générique @@ -37204,9 +36077,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Deploy Public Key Déployer la clé publique - - - ::RemoteLinux Linux Device Configurations Configurations des périphériques Linux @@ -37251,9 +36121,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ &Generate SSH Key... &Générer une clé SSH... - - - ::RemoteLinux Close Fermer @@ -37266,9 +36133,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Device test failed. Le test du périphérique a échoué. - - - ::RemoteLinux Connecting to host... Connexion à l'hôte... @@ -37340,9 +36204,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Les ports suivant sont actuellement en cours d'utilisation : %1 - - - ::RemoteLinux Preparing SFTP connection... Préparation de la connexion SFTP... @@ -37363,9 +36224,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Failed to upload package: %2 Échec de l'envoi du paquet : %2 - - - ::RemoteLinux Updateable Project Files Fichiers de projet pouvant être mis à jour @@ -37386,16 +36244,10 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ &Uncheck All Décocher to&ut - - - ::RemoteLinux Run custom remote command Exécuter une commande distante personnalisée - - - ::RemoteLinux No command line given. Aucune ligne de commande donnée. @@ -37420,9 +36272,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Remote command finished successfully. Processus distant terminé avec succès. - - - ::RemoteLinux Deploy to Remote Linux Host Déploiement sur une hôte Linux distante @@ -37439,16 +36288,10 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ (No device) (Pas de périphérique) - - - ::RemoteLinux <b>%1 using device</b>: %2 <b>%1 utilisant le périphérique</b> : %2 - - - ::RemoteLinux Error running remote process: %1 Erreur lors de l'exécution du processus à distance : %1 @@ -37470,9 +36313,6 @@ globalement dans l'éditeur QML. Vous pouvez ajouter une annotation '/ Remote stderr was: '%1' Le stderr distant était : "%1" - - - ::RemoteLinux Select Sysroot Sélectionner la racine système @@ -37530,9 +36370,6 @@ Remote stderr was: '%1' Exécute la commande : %1 {1?} - - - ::RemoteLinux Packaging finished successfully. Paquetage terminé avec succès. @@ -37581,9 +36418,6 @@ Remote stderr was: '%1' Create tarball Créer un tarball - - - ::RemoteLinux (default) (par défaut) @@ -37592,9 +36426,6 @@ Remote stderr was: '%1' %1 (default) %1 (par défaut) - - - ::RemoteLinux No tarball creation step found. Aucune étape de création d'archive tarball trouvée. @@ -38414,9 +37245,6 @@ Ces chemines sont utilisés en complément au répertoire courant pour basculer Leave empty to look up executable in $PATH Laisser vide pour rechercher un exécutable dans le $PATH - - - ::RemoteLinux WizardPage WizardPage @@ -38449,16 +37277,10 @@ Ces chemines sont utilisés en complément au répertoire courant pour basculer The file containing the user's private key: Le fichier contenant la clé privée de l'utilisateur : - - - ::RemoteLinux Device Test Test de périphérique - - - ::RemoteLinux Device configuration: Configuration du périphérique : @@ -39067,7 +37889,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - examples + ::QtSupport Examples Exemples @@ -39141,7 +37963,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - tutorials + ::QtSupport Tutorials Tutoriels @@ -39179,11 +38001,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - SessionItem - - Clone - Cloner - + ::ProjectExplorer Rename Renommer @@ -39192,9 +38010,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e Delete Supprimer - - - Sessions %1 (last session) %1 (dernière session) @@ -39205,7 +38020,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - StaticAnalysisMessages + ::QmlJS do not use '%1' as a constructor ne pas utiliser '%1' comme un constructeur @@ -39222,22 +38037,10 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e number value expected valeur numérique attendue - - boolean value expected - Valeur binaire attendue - - - string value expected - Chaîne de caractères attendue - invalid URL URL invalide - - file or directory does not exist - le fichier ou le répertoire n'existe pas - invalid color couleur invalide @@ -39267,14 +38070,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e invalid property name '%1' nom de propriété '%1' invalide - - '%1' does not have members - "%1" n'a pas de membres - - - '%1' is not a member of '%2' - "%1" n'est pas un membre de "%2" - assignment in condition assignation dans une condition @@ -39359,10 +38154,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e == and != may perform type coercion, use === or !== to avoid == et != peuvent provoquer une coercition de type, utilisez === ou !== pour l'éviter - - expression statements should be assignments, calls or delete expressions only - les définitions d'expression devraient être des expression d'assignation, d'appel ou de suppression uniquement - var declarations should be at the start of a function la déclaration de variables doit être au début de la fonction @@ -39407,10 +38198,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e use spaces around binary operators utilisez des espaces autour des opérateurs binaires - - unintentional empty block, use ({}) for empty object literal - bloc vide involontaire, utilisez ({}) pour les objets vides - use %1 instead of 'var' or 'variant' to improve performance utilisez %1 à la place de 'var' ou 'variant' pour améliorer les performances @@ -40035,9 +38822,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e Misc Types Types divers - - - ::Debugger Debugger Settings Paramètres du débogueur @@ -40062,9 +38846,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e Enable Debugging of Subprocesses Activer le débogage des sous-processus - - - ::Debugger Anonymous Function Fonction anonyme @@ -40482,14 +39263,6 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un ::QtSupport - - Examples - Exemples - - - Tutorials - Tutoriels - Copy Project to writable Location? Copier le projet à un emplacement accessible en écriture ? @@ -40526,9 +39299,6 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un Failed to Open Project Échec d'ouverture du projet - - - ::QtSupport MeeGo/Harmattan MeeGo/Harmattan @@ -40569,9 +39339,6 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un Embedded Linux Linux embarqué - - - ::RemoteLinux Double-click to edit the project file Double-cliquez pour modifier le fichier de projet @@ -42972,9 +41739,6 @@ Oui :) Add Breakpoint Ajouter un point d'arrêt - - - ::Debugger Select Executable Sélectionner l'exécutable @@ -43043,9 +41807,6 @@ Oui :) &Recent: &Récent : - - - ::Debugger Manage... Gérer... @@ -43070,9 +41831,6 @@ Oui :) Debugger for "%1" Débogueur pour "%1" - - - ::Debugger &Engine: &Moteur : @@ -43086,9 +41844,6 @@ Oui :) Label text for path configuration. %2 is "x-bit version". <html><body><p>Spécifier le chemin à <a href="%1">l'exécutable du débogueur en console de Windows</a> (%2) ici.</p></body></html> - - - ::Debugger No debugger set up. Aucun débogueur n'a été configuré. @@ -43144,7 +41899,7 @@ Oui :) - DeviceProcessesDialog + ::ProjectExplorer &Attach to Process &Attacher au processus @@ -43255,9 +42010,6 @@ Oui :) Interrupting not possible Interruption impossible - - - ::Debugger Remote Error Erreur distante @@ -43310,16 +42062,10 @@ Oui :) Process gdbserver finished. Status: %1 Processus gbdserver terminé. Statut : %1 - - - ::Debugger Download of remote file succeeded. Téléchargement du fichier distant réussi. - - - ::Debugger Module Name Nom du module @@ -43404,9 +42150,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi End address of loaded module <inconnue> - - - ::Debugger Update Module List Mettre à jour la liste des modules @@ -43463,9 +42206,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Show Dependencies of "%1" Montrer les dépendances de "%1" - - - ::Debugger Connecting to debug server %1:%2 Connexion au serveur de débogage %1:%2 @@ -43509,9 +42249,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Closing. Fermeture. - - - ::Debugger Success: Réussite : @@ -43524,9 +42261,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Properties Propriétés - - - ::Debugger The %1 attribute at line %2, column %3 cannot be changed without reloading the QML application. L'attribut %1 à la ligne %2, colonne %3 ne peut pas être modifié sans redémarrer l'application QML. @@ -43551,9 +42285,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Reload QML Recharger le QML - - - ::Debugger Reload Register Listing Recharger la liste des registres @@ -43602,9 +42333,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Binary Binaire - - - ::Debugger Snapshots Snapshots @@ -43617,9 +42345,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Remove Snapshot Supprimer un snapshot - - - ::Debugger Reload Data Recharger les données @@ -43632,9 +42357,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Open File "%1"' Ouvrir le fichier "%1" - - - ::Debugger Function: Fonction : @@ -43667,9 +42389,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Frame #%1 (%2) Frame #%1 (%2) - - - ::Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -44280,10 +42999,6 @@ were not verified among remotes in %3. Select different folder? &Filter: &Filtre : - - &Attach to Process - &Attacher au processus - Remote Error Erreur distante @@ -45115,9 +43830,6 @@ n'a pas pu être trouvé dans le dossier. Run %1 Exécuter %1 - - - ::QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. La bibliothèque Qt à utiliser pour tous les projets utilisant ce kit.<br>Une version de Qt est nécesaire pour les projets basés sur qmake et est optionnelle pour les autres systèmes de compilation. @@ -45134,9 +43846,6 @@ n'a pas pu être trouvé dans le dossier. %1 (invalid) %1 (invalide) - - - ::QtSupport Qt version Version de Qt @@ -45175,23 +43884,14 @@ n'a pas pu être trouvé dans le dossier. Cannot check for free disk space: '%1' is not an absolute path. Impossible de vérifier l'espace libre du disque : "%1" n'est pas un chemin absolu. - - - ::RemoteLinux MB Mo - - - ::RemoteLinux Check for free disk space Vérification de l'espace disque disponible - - - ::RemoteLinux Debugging failed. Le débogage a échoué. @@ -45247,9 +43947,6 @@ n'a pas pu être trouvé dans le dossier. Could not copy the file to %1. La copie du fichier dans "%1" a échoué. - - - ::ResourceEditor The file name is empty. Le nom de fichier est vide. @@ -45266,9 +43963,6 @@ n'a pas pu être trouvé dans le dossier. Cannot write file. Disk full? Impossible d'écrire le fichier. Disque plein ? - - - ::ResourceEditor Open File Ouvrir le fichier @@ -46692,7 +45386,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - CppQmlTypesLoader + ::QmlJS %1 seems not to be encoded in UTF8 or has a BOM. %1 ne semble pas être encodé en UTF8 ou possède un BOM. @@ -47510,9 +46204,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Update Code Model Mettre à jour le modèle de code - - - QuickFixFactory Create Getter and Setter Member Functions Créer des fonctions membres accesseurs et mutateurs @@ -47521,9 +46212,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Generate Missing Q_PROPERTY Members... Générer les membres Q_PROPERTY manquants... - - - ::CppEditor Move Definition Outside Class Déplacer la définition en dehors de la classe @@ -47586,7 +46274,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - Cvs + ::CVS &Edit &Édition @@ -47602,16 +46290,10 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Source Paths Chemin des sources - - - ::Debugger CDB Paths Chemins CDB - - - ::Debugger Behavior Comportement @@ -47700,16 +46382,10 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Maximum string length: Longueur maximum de la chaîne de caractères : - - - ::Debugger Debugger settings Paramètres du débogueur - - - ::Debugger GDB Extended GDB étendu @@ -49416,9 +48092,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un All Versions Toutes les versions - - - ::QtSupport Full path to the host bin directory of the current project's Qt version. Chemin complet vers le répertoire bin d'origine de la version Qt actuelle du projet. @@ -49427,9 +48100,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un Full path to the target bin directory of the current project's Qt version. You probably want %1 instead. Chemin complet vers le répertoire bin de destination de la version Qt actuelle du projet. Vous vouliez probablement dire %1 à la place. - - - ::QtSupport No factory found for qmake: '%1' Aucune fabrique trouvée pour qmake : "%1" @@ -49441,9 +48111,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un Not enough free ports on device for debugging. Pas assez de ports disponibles sur le périphérique pour le débogage. - - - ::RemoteLinux Checking available ports... @@ -49462,9 +48129,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un Initial setup failed: %1 Échec lors de la configuration initiale : %1 - - - ::RemoteLinux Local File Path Chemin du fichier local @@ -49473,9 +48137,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un Remote Directory Répertoire distant - - - ::RemoteLinux Clean Environment Environnement vierge @@ -49484,9 +48145,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un System Environment Environnement du système - - - ::RemoteLinux Fetch Device Environment Récupérer l'environnement du périphérique @@ -50664,9 +49322,6 @@ réinitialisation du moniteur Type Type - - - ::Debugger Path: Chemin : @@ -50707,9 +49362,6 @@ réinitialisation du moniteur The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. In the Qt Creator Build and Run preferences page, select a Qt version, expand the Details section and click Build All. L'assistant au débogage est utilisé pour formater correctement les valeurs selon les types de données fournit par Qt et les bibliothèques standards. Il doit être compilé pour chaque versions de Qt séparément. Dans la page de préférences Compiler et Exécuter de Qt Creator, sélectionnez une version de Qt, développez la section Détails et cliquez sur Tout Construire. - - - ::Debugger Starting executable failed: Échec du lancement de l'exécutable : @@ -51375,7 +50027,7 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu - Qt4ProjectManager + ::QtSupport Qt Versions Versions de Qt @@ -51397,9 +50049,6 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu Profiling %1 Profilage de %1 - - - ::Valgrind Analyzing Memory Analyse de la mémoire @@ -51410,7 +50059,7 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu - AnalyzerManager + ::Debugger Memory Analyzer Tool finished, %n issues were found. @@ -51476,16 +50125,10 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu Process terminated. Le processus s'est terminé. - - - ::Valgrind Valgrind Valgrind - - - ::Valgrind Valgrind Function Profile uses the "callgrind" tool to record function calls when a program runs. Le profileur Valgrind utilise l'outil "callgrind" pour enregistrer les appels de fonction quand un programme est lancé. @@ -51510,16 +50153,10 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu Profile Costs of This Function and Its Callees Estimer les coûts de cette fonction et de fonctions qu'elle appelle - - - ::Valgrind Could not determine remote PID. Impossible de déterminer le PID distant. - - - ::Valgrind Valgrind Settings Paramètres de Valgrind diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 712b2e4e0ec..9766ed4df67 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -1130,9 +1130,6 @@ See Google Test documentation for further information on GTest filters. Postavi GTest filtar koji će se koristiti za grupiranje. Dodatne dokumente o GTest filtrima potraži u Google Test dokumentaciji. - - - ::Autotest Enables interrupting tests on assertions. Omogućuje prekid testova kod potvrda. @@ -1209,9 +1206,6 @@ Upozorenje: Običan tekst propušta neke informacije, kao što je trajanje.Perf Perf - - - ::Autotest General Opće @@ -1701,7 +1695,7 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m - ClangFormat::ClangFormatConfigWidget + ::ClangFormat Format instead of indenting Formatiraj umjesto uvlačenja @@ -3304,7 +3298,7 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju - Cvs + ::CVS Configuration Konfiguracija @@ -7362,9 +7356,6 @@ Sigurno želiš nastaviti? Add Qt version #ifdef for module names Dodaj Qt verziju #ifdef za nazive modula - - - ::QtSupport Version name: Naziv verzije: @@ -7377,9 +7368,6 @@ Sigurno želiš nastaviti? Edit Uredi - - - ::QtSupport Add... Dodaj … @@ -7392,9 +7380,6 @@ Sigurno želiš nastaviti? Clean Up Izbriši - - - ::QtSupport Debugging Helper Build Log Zapis gradnje pomoćnika za uklanjanje grešaka @@ -7482,9 +7467,6 @@ Sigurno želiš nastaviti? You will need at least one port. Trebat ćeš barem jedan prikljjučak. - - - ::RemoteLinux WizardPage Stranica čarobnjaka @@ -7514,7 +7496,7 @@ Sigurno želiš nastaviti? - QrcEditor + ::ResourceEditor Add Dodaj @@ -8869,7 +8851,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - TopicChooser + ::Help Choose Topic Odaberi temu @@ -10722,9 +10704,6 @@ will also disable the following plugins: Expected type %1 but value contained %2 Očekivana vrsta %1, ali vrijednost je sadržavala %2 - - - JsonRpcMessageHandler Could not parse JSON message "%1". Nije moguće obraditi JSON poruku "%1". @@ -10733,9 +10712,6 @@ will also disable the following plugins: Expected a JSON object, but got a JSON "%1". Očekivan JSON objekt, ali je dobiven JSON "%1". - - - ::LanguageServerProtocol No parameters in "%1". Nema parametara u "%1". @@ -14021,14 +13997,11 @@ The files in the Android package source directory are copied to the build direct - AutoTest + ::Autotest Testing Testiranje - - - ::Autotest &Tests @@ -14105,9 +14078,6 @@ The files in the Android package source directory are copied to the build direct Selected test was not found (%1). - - - GTestFramework Google Test Google test @@ -14117,9 +14087,6 @@ The files in the Android package source directory are copied to the build direct See also Google Test settings. - - - ::Autotest Running tests failed. %1 @@ -14146,9 +14113,6 @@ Executable: %2 Repeating test case %1 (iteration %2) - - - ::Autotest <matching> @@ -14169,16 +14133,10 @@ Executable: %2 typed - - - ::Autotest Qt Test Qt test - - - ::Autotest %1 %2 per iteration (total: %3, iterations: %4) @@ -14227,23 +14185,14 @@ Executable: %2 Test finished. - - - ::Autotest inherited naslijeđeno - - - ::Autotest Quick Test - - - ::Autotest <unnamed> @@ -14252,9 +14201,6 @@ Executable: %2 <p>Give all test cases a name to ensure correct behavior when running test cases and to be able to select them.</p> - - - ::Autotest AutoTest Plugin WARNING: No files left after filtering test scan folders. Check test filter settings. @@ -14263,9 +14209,6 @@ Executable: %2 Scanning for Tests - - - ::Autotest Select All Odaberi sve @@ -14372,16 +14315,10 @@ Executable: %2 %2 - - - ::Autotest AutoTest Debug - - - ::Autotest Test run canceled by user. @@ -14486,9 +14423,6 @@ Check the test environment. Build failed. Canceling test run. - - - ::Autotest Select Run Configuration @@ -14517,9 +14451,6 @@ Check the test environment. Working Directory: - - - ::Autotest No active test frameworks. @@ -14552,9 +14483,6 @@ Check the test environment. Specify a filter expression that will replace "%1".<br/>Wildcards are not supported. - - - TestTreeItem %1 (none) @@ -15701,9 +15629,6 @@ Check the test environment. <Select Symbol> <Odaberi simbol> - - - ClangDiagnosticConfig Project: %1 (based on %2) Projekt: %1 (osnovan na %2) @@ -15712,9 +15637,6 @@ Check the test environment. Changes applied in Projects Mode > Clang Code Model Primijenjene promjene u Projects Mode > Clang Code Model - - - ::ClangCodeModel Code Model Warning Code Model upozorenje @@ -15733,7 +15655,7 @@ Check the test environment. - ClangFormat::ClangFormatPlugin + ::ClangFormat Open Used .clang-format Configuration File Otvori korištenu konfiguracijsku datoteku .clang-formata @@ -16804,14 +16726,11 @@ Kopirati stazu do izvornih datoteka u međuspremnik? - CMakeFilesProjectNode + ::CMakeProjectManager CMake Modules CMake moduli - - - CMakeTargetNode Target type: Vrsta odredišta: @@ -16824,9 +16743,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? Build artifacts: Artefakti gradnje: - - - ::CMakeProjectManager CMake SnippetProvider @@ -19940,7 +19856,7 @@ Oznake: %3 - Cvs + ::CVS Ignore Whitespace @@ -20316,9 +20232,6 @@ Oznake: %3 Property Svojstvo - - - ::Debugger Output: Izrada: @@ -20469,9 +20382,6 @@ Oznake: %3 Extracted from Kit %1 - - - ::Debugger Location Mjesto @@ -20516,9 +20426,6 @@ Oznake: %3 Debuggers - - - ::Debugger The debugger to use for this kit. Program za uklanjanje grešaka korišten za ovaj komplet. @@ -22190,7 +22097,7 @@ Možda će ponovna gradnja projekta pomoći. - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character Ukloni znak @@ -24102,14 +24009,7 @@ instead of its installation directory when run outside git bash. - ::GLSLEditor - - GLSL - GLSL - - - - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -24396,9 +24296,6 @@ Would you like to overwrite it? %1: već postoji. Želiš li je prepisati? - - - ::ImageViewer Exported "%1", %2x%3, %4 bytes Izvezeno "%1", %2x%3, %4 bajta @@ -24423,9 +24320,6 @@ Would you like to overwrite it? Play Animation Pokreni animaciju - - - ::ImageViewer Image format not supported. Slikovni format nije podržan. @@ -24530,9 +24424,6 @@ Would you like to overwrite them? %1 Simulator %1 simulator - - - DevelopmentTeam %1 - Free Provisioning Team : %2 @@ -31106,9 +30997,6 @@ ID oznake moraju započeti malim slovom. Searching for Usages - - - QmlJSHoverHandler Library at %1 @@ -31121,9 +31009,6 @@ ID oznake moraju započeti malim slovom. Read typeinfo files successfully. - - - ::QmlJSEditor Show All Bindings @@ -31140,16 +31025,10 @@ ID oznake moraju započeti malim slovom. Split Initializer - - - AddAnalysisMessageSuppressionComment Add a Comment to Suppress This Message Dodaj komentar kako se ova poruka ne bi prikazivala - - - ::QmlJSEditor Code Model Warning @@ -31925,16 +31804,10 @@ Saving failed. Clean Environment - - - QmlManager <Current File> <Trenutačna datoteka> - - - ::QmlProjectManager Main QML file: @@ -32045,9 +31918,6 @@ Saving failed. Qt Version is used for embedded Linux development - - - BaseQtVersion Device type is not supported by Qt version. Vrsta uređaja nije podržana Qt verzijom. @@ -32112,9 +31982,6 @@ Saving failed. This Qt Version does not contain Qt Quick Compiler. Ova Qt verzija ne sadrži Qt Quick Compiler. - - - ::QtSupport unknown nepoznato @@ -32166,9 +32033,6 @@ Saving failed. Close Zatvori - - - ::RemoteLinux Remote process failed: %1 Udaljeni proces neuspjeo: %1 @@ -32244,9 +32108,6 @@ Saving failed. Could not copy the file to %1. - - - ::ResourceEditor The file name is empty. @@ -32259,9 +32120,6 @@ Saving failed. The <RCC> root element is missing. - - - ::ResourceEditor Open File Otvori datoteku @@ -32270,20 +32128,6 @@ Saving failed. All files (*) Sve datoteke (*) - - - ::ResourceEditor - - Prefix: - Prefiks: - - - Language: - Jezik: - - - - ::ResourceEditor &Undo &Poništi @@ -32308,10 +32152,6 @@ Saving failed. Remove Prefix... - - Remove Missing Files - - Rename... Preimenuj … @@ -32364,9 +32204,6 @@ Saving failed. Rename Prefix - - - ::ResourceEditor Open With @@ -32379,9 +32216,6 @@ Saving failed. Copy Resource Path to Clipboard - - - ResourceTopLevelNode %1 Prefix: %2 @@ -34992,9 +34826,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.Calls Pozivi - - - ::Valgrind Previous command has not yet finished. Prethodna naredba još nije gotova. @@ -35027,9 +34858,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.Callgrind unpaused. Callgrind je ponovo pokrenut. - - - ::Valgrind File: Datoteka: @@ -35090,9 +34918,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.Incl. Cost: %1 Uklj. trošak: %1 - - - ::Valgrind %1 in %2 %1 u %2 @@ -35101,9 +34926,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.%1:%2 in %3 %1:%2 u %3 - - - ::Valgrind Last-level Zadnja-razina @@ -35160,9 +34982,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.Position: Položaj: - - - ::Valgrind Profiling Profiliranje @@ -35171,9 +34990,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.Profiling %1 Profiliranje %1 - - - ::Valgrind Callgrind Callgrind @@ -35342,30 +35158,18 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.Parsing Profile Data... Obrada podataka profila … - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Sve funkcije s uključenim omjerom troškova većim od %1 (%2 su skrivene) - - - ::Valgrind Suppress Error Potisni grešku - - - ::Valgrind Analyzing Memory Analiziranje memorije - - - ::Valgrind Memcheck @@ -35523,9 +35327,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Datoteka dnevnika je obrađena. Nađeno je %1 problema. - - - HeobDialog XML output file: Izlazna XML datoteka: @@ -35634,13 +35435,6 @@ When a problem is detected, the application is interrupted and can be debugged.< OK U redu - - Heob - Heob - - - - HeobData Process %1 Proces %1 @@ -35701,9 +35495,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Heob: Failure in process attach handshake (%1). - - - ::Valgrind Save Suppression Spremi potiskivanje @@ -35720,9 +35511,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Select Suppression File Odaberi datoteku potiskivanja - - - ::Valgrind Valgrind options: %1 Valgrind opcije: %1 @@ -35757,23 +35545,14 @@ When a problem is detected, the application is interrupted and can be debugged.< Proces je izašao s povratnom vrijednošću %1 - - - ::Valgrind Valgrind Valgrind - - - ::Valgrind Valgrind Settings Valgrind postavke - - - ::Valgrind XmlServer on %1: XmlPoslužitelj na %1: @@ -35782,9 +35561,6 @@ When a problem is detected, the application is interrupted and can be debugged.< LogServer on %1: LogPoslužitelj na %1: - - - ::Valgrind Issue Problem @@ -35797,9 +35573,6 @@ When a problem is detected, the application is interrupted and can be debugged.< %1 in function %2 %1 u funkciji %2 - - - ::Valgrind %1%2 %1%2 @@ -35808,9 +35581,6 @@ When a problem is detected, the application is interrupted and can be debugged.< in %1 u %1 - - - ::Valgrind Function: Funkcija: @@ -35827,9 +35597,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Object: Objekt: - - - ::Valgrind Could not parse hex number from "%1" (%2) @@ -35882,9 +35649,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Unexpected exception caught during parsing. - - - ::Valgrind Description Opis @@ -36613,17 +36377,6 @@ What do you want to do? Preimenuj knjižnu oznaku - - ContentWindow - - Open Link - Otvori poveznicu - - - Open Link as New Page - Otvori poveznicu kao novu stranicu - - ::Help diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 40db042c8cf..3e0328459d1 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -21,7 +21,7 @@ - AttachCoreDialog + ::Debugger Start Debugger Debugger elindítása @@ -227,7 +227,7 @@ - BreakCondition + ::Debugger Condition: Feltétel: @@ -512,7 +512,7 @@ - Cvs + ::CVS Parsing of the log output failed A log kimenet elemzése nem sikerült @@ -1057,7 +1057,7 @@ - CompletionSettingsPage + ::TextEditor Code Completion Kód kiegészítés @@ -1088,7 +1088,7 @@ - ContentWindow + ::Help Open Link Link megnyitása @@ -3453,9 +3453,6 @@ p { Stop Debugger Debugger leállítása - - - ::Debugger The Gdb process could not be stopped: %1 @@ -3486,9 +3483,6 @@ p { A távoli szerverhez történő csatlakozás nem sikerült: %1 - - - ::Debugger Select start address Start cím kiválasztása @@ -3497,9 +3491,6 @@ p { Enter an address: Egy cím bevitele: - - - ::Debugger Select Executable Futtatható fájl kiválasztása @@ -3508,9 +3499,6 @@ p { Select Core File Mag fájlok kiválasztása - - - ::Debugger Process ID Folyamat azonosító @@ -3527,9 +3515,6 @@ p { Refresh Felfrissítés - - - ::Debugger Marker File: Megjelölt fájl: @@ -3574,10 +3559,6 @@ p { Line Number: Sor szám: - - Condition: - Feltétel: - Ignore Count: Mellőzés számlálás: @@ -3602,9 +3583,6 @@ p { Breakpoint will only be hit after being ignored so many times. A töréspont sok alkalommal való mellőzés után lesz csak leütve. - - - ::Debugger Breakpoints Töréspontok @@ -3669,9 +3647,6 @@ p { Conditions on Breakpoint %1 Feltételek a(z) %1 törésponton - - - ::Debugger Unable to load the debugger engine library '%1': %2 Nem lehet betölteni a debugger engine könytárat '%1' nicht geladen werden: %2 @@ -3800,9 +3775,6 @@ p { Thread %1: No debug information available (%2). %1 Szál: Nincsen elérhető debugg információ (%2). - - - ::Debugger injection Injekció @@ -3847,9 +3819,6 @@ p { Querying dumpers for '%1'/'%2' (%3) Dömperek kérése '%1'/'%2' (%3) - - - ::Debugger Cdb Cdb @@ -3872,9 +3841,6 @@ p { Autodetection Automatikus észlelés - - - ::Debugger Symbol Server... Szimbólum szerver... @@ -3887,9 +3853,6 @@ p { Pick a local cache directory Egy helyi gyorsítótár könyvtárra szedés - - - ::Debugger Error Loading Symbols Hiba történt a szimbólumok betöltésekor @@ -3924,9 +3887,6 @@ p { Nem sikerült hozzácsatolni a(z) "%1" maghoz: - - - ::Debugger Close Debugging Session Debug szakasz bezárása @@ -3939,9 +3899,6 @@ p { A debugging session is still in progress. Terminating the session in the current state (%1) can leave the target in an inconsistent state. Would you still like to terminate it? A debuggolási szakasz még mindig folyamatban van. A szakasz befejezése az aktuális helyzetben (%1) ellentmondó állapotban hagyhatja a célt. Mégis be szeretné fejezni? - - - ::Debugger Option '%1' is missing the parameter. %1 opció egy hiányzó paraméter. @@ -4030,16 +3987,10 @@ p { Attaching to core %1. Hozzácsatolás a(z) %1 maghoz. - - - ::Debugger Debug Debuggolás - - - ::Debugger Debugger properties... Debugger beállítások... @@ -4168,9 +4119,6 @@ p { Execute line Sor végrehajtása - - - ::Debugger Debugging Helper Debuggolást segítő @@ -4183,9 +4131,6 @@ p { Ctrl+Shift+F11 Ctrl+Shift+F11 - - - ::Debugger The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program. Nem sikerült elindítani a Gdb folyamatot. Vagy a(z) '%1' felhasznált program hiányzik, vagy nincsenek meg a megfelelő jogai a program felhasználására. @@ -4507,9 +4452,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Adapter crashed Összeomlott az adapter - - - ::Debugger Gdb Gdb @@ -4522,9 +4464,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Choose Location of Startup Script File Betöltési szkript fájl helyének kiválasztása - - - ::Debugger Memory $ Memória $ @@ -4537,9 +4476,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. The memory contents cannot be shown as no viewer plugin for binary data has been loaded. Nem lehet megjeleníteni a memória tartalmat, mivel nem lett megjelenítő beépülő modul betöltve bináris adatra. - - - ::Debugger Module name Modul név @@ -4556,9 +4492,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. End address Vég cím - - - ::Debugger Modules Modul @@ -4611,9 +4544,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Symbols in "%1" Szimbólum "%1"-ben - - - ::Debugger Cannot create temporary file: %1 Nem lehet átmeneti fájlt létrehozni: %1 @@ -4626,9 +4556,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Cannot open FiFo %1: %2 Nem sikerült a(z) FiFo megnyitása: %2 - - - ::Debugger Cannot set up communication with child process: %1 Nem sikerült beállítani a kommunikációs a gyermek folyamattal: %1 @@ -4639,16 +4566,10 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. A futtatható elindítása nem sikerült: - - - ::Debugger Value (base %1) - - - ::Debugger Registers Regiszterek @@ -4714,9 +4635,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Nem sikerült elindítani a távoli futtatható fájlt: - - - ::Debugger '%1' contains no identifier '%1' nem tartalmaz azonosítót @@ -4737,9 +4655,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Full name Teljes név - - - ::Debugger Source Files Forrás fájlok @@ -4756,9 +4671,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Open file "%1"' A(z) '"%1" fájl megnyitása - - - ::Debugger Address: Cím: @@ -4811,20 +4723,10 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Open disassembler at %1 Disassembler megnyitása %1-nél - - - ::Debugger - - Executable: - Futtatható: - Arguments: Argumentumok: - - - ::Debugger Thread: %1 Szál: %1 @@ -4857,9 +4759,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Address Cím - - - ::Debugger Thread Szál @@ -4873,9 +4772,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Nem sikerült a TRK szerver adapterhez való csatlakozás: - - - ::Debugger Form Forma @@ -4904,9 +4800,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Device: Eszköz: - - - ::Debugger <not in scope> <nem a hatókörben> @@ -5027,9 +4920,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Refresh code model snapshot Kód modell fénykép felfrissítése - - - ::Debugger Clear contents Tartalom kitisztítása @@ -5038,9 +4928,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Save contents Tartalom mentése - - - ::Debugger Debugging helper Debuggolást segítő @@ -5535,7 +5422,7 @@ A projekt újraépítése talán segít. - DocSettingsPage + ::Help Registered Documentation Nyilvántartott dokumentum @@ -6373,7 +6260,7 @@ Ok: %3 - Find::Internal::FindDialog + ::Core Search for... Keresés... @@ -6390,10 +6277,6 @@ Ok: %3 Search &for: &Rákeresés: - - Close - Bezárás - &Case sensitive &Kis és nagybetűérzékeny @@ -6402,9 +6285,6 @@ Ok: %3 &Whole words only Kizárólag &egész szavakat - - - Find::Internal::FindPlugin &Find/Replace &Keresés/Kicserélés @@ -6417,9 +6297,6 @@ Ok: %3 Ctrl+Shift+F Ctrl+Shift+F - - - Find::Internal::FindToolBar Current Document Aktuális dokumentum @@ -6428,10 +6305,6 @@ Ok: %3 Enter Find String A keresett szó bevitele - - Ctrl+E - Ctrl+E - Find Next Következő találat @@ -6468,9 +6341,6 @@ Ok: %3 Use Regular Expressions Reguláris kifejezése használata - - - Find::Internal::FindWidget Find Keresés @@ -6491,9 +6361,6 @@ Ok: %3 All Az összes - - - Find::SearchResultWindow No matches found! Egyezés nem található! @@ -6502,10 +6369,6 @@ Ok: %3 Expand All Az összes kiterjesztése - - Replace with: - Kicserélés ezzel: - Replace all occurrences Az összes előfordulás lecsérélése @@ -6520,7 +6383,7 @@ Ok: %3 - GdbOptionsPage + ::Debugger Gdb interaction Gdb kölcsönhatás @@ -6594,7 +6457,7 @@ on slow machines. In this case, the value should be increased. - GeneralSettingsPage + ::Help Form Forma @@ -6681,7 +6544,7 @@ on slow machines. In this case, the value should be increased. - GenericMakeStep + ::ProjectExplorer Override %1: %1 megsemmisítése: @@ -8294,18 +8157,10 @@ Fájl kihagyása. Filters Szűrők - - Help - Segítség - General settings Általános beállítások - - Help - Segítség - Open Image Kép megnyitása @@ -8326,10 +8181,6 @@ Fájl kihagyása. Help index Segítség - Index - - Help - Segítség - Contents Tartalom @@ -8434,10 +8285,6 @@ Fájl kihagyása. Copy &Link Location &Link címének másolása - - Open Link in New Tab - Link megnyitása új lapon - Select All Az összes kijelőlése @@ -8484,22 +8331,14 @@ Fájl kihagyása. - IndexWindow + ::Help &Look for: &Rákeresés: - - Open Link - Link megnyitása - - - Open Link in New Tab - Link megnyitása új lapon - - InputPane + ::Debugger Type Ctrl-<Return> to execute a line. Nyomja meg a Ctrl-<Return> gombokat a sor végrehajtásához. @@ -8767,15 +8606,7 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line) - MakeStep - - Override %1: - %1 megsemmisítése: - - - Make arguments: - Make argumentumok: - + ::ProjectExplorer MimeType @@ -9061,7 +8892,7 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line) - OpenWithDialog + ::Core Open File With... Fájl megnyitása ezzel... @@ -9072,7 +8903,7 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line) - PasteBinComSettingsWidget + ::CodePaster Form Forma @@ -9090,27 +8921,10 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Note that the plugin will use this for posting as well as fetching.</span></p></body></html> - - - PasteBinDotComProtocol Error during paste Hiba történt beillesztés közben - - - PasteBinDotComSettings - - Pastebin.com - Pastebin.com - - - Code Pasting - Kód beillesztés - - - - PasteView Paste Beillesztés @@ -9923,27 +9737,7 @@ p, li { white-space: pre-wrap; } - PluginDialog - - Details - Részletek - - - Error Details - Hiba részletek - - - Installed Plugins - Telepített beépülő modulok - - - Plugin Details of %1 - %1 beépülő modul részletek - - - Plugin Errors of %1 - %1 beépülő modul hibák - + ::Core ::ExtensionSystem @@ -12178,7 +11972,7 @@ a verziókövetőhöz (%2)? - QrcEditor + ::ResourceEditor Add Hozzáadás @@ -14732,9 +14526,6 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok untitled cím nélküli - - - ::ResourceEditor Creates a Qt Resource file (.qrc). Egy Qt forrásfájl létrehozása (.qrc). @@ -14755,16 +14546,13 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok &Redo &Helyreállít - - - ::ResourceEditor untitled címtelen - SaveItemsDialog + ::Core Save Changes Változtatások elmentése @@ -14897,7 +14685,7 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok - SharedTools::QrcEditor + ::ResourceEditor Add Files Fájlok hozzáadása @@ -14946,9 +14734,6 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok Could not copy the file to %1. A fájl %1-be másolása nem sikerült. - - - SharedTools::ResourceView Add Files... Fájl hozzáadása... @@ -14993,29 +14778,17 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok Change Language Nyelv megváltoztatása - - Language: - Nyelv: - Change File Alias Fájl álnevek megváltoztatása - - Alias: - Álnév: - - ShortcutSettings + ::Core Keyboard Shortcuts Gyorsbillentyű - - Filter: - Szűrő: - Command Parancs @@ -15052,10 +14825,6 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok Reset Újraindítás - - Remove - Eltávolítás - ShowBuildLog @@ -15076,30 +14845,11 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok - StartExternalDialog - - Start Debugger - Debugger elindítása - - - Executable: - Futtatható: - - - Arguments: - Argumentumok: - + ::Debugger Break at 'main': Töréspont a 'main'-re: - - - StartRemoteDialog - - Start Debugger - Debugger elindítása - Host and port: Hoszt és port: @@ -16869,7 +16619,7 @@ A következő kódolás valószínűleg erre illik: - TopicChooser + ::Help Choose Topic Topik kiválasztása diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 20ac4f79b8a..acb3c75923e 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -25,18 +25,16 @@ - AttachCoreDialog + ::Debugger Start Debugger Avvia il Debug - Executable: Eseguibile: - Core File: File Core: @@ -48,17 +46,14 @@ Avvia il Debug - Attach to Process ID: Collegati all'ID di Processo: - Filter: Filtro: - Clear Cancella @@ -104,22 +99,18 @@ Aggiungi un Segnalibro - Bookmark: Segnalibro: - Add in Folder: Inserisci nella Cartella: - + + - New Folder Nuova Cartella @@ -247,19 +238,17 @@ Imposta l'Interruzione alla Funzione - Function to break on: Funzione dove interrompere: - BreakCondition + ::Debugger Condition: Condizione: - Ignore count: Numero di scarti: @@ -457,23 +446,19 @@ Queste opzioni saranno effettive dal prossimo riavvio di Qt Creator. - Cdb Placeholder Cdb - Debugger Paths Percorsi del Debugger - Symbol paths: Percorsi dei Simboli: - Source paths: Percorso dei sorgenti: @@ -486,7 +471,6 @@ - Path: Percorso: @@ -508,7 +492,6 @@ - Verbose Symbol Loading @@ -520,12 +503,10 @@ Posizione del deposito: - Select Seleziona - Change: Cambia: @@ -577,7 +558,6 @@ Incolla: - Protocol: @@ -590,37 +570,30 @@ Nome utente: - Copy Paste URL to clipboard Copia l'URL negli appunti - Display Output Pane after sending a post Mostra la Finestra di Output dopo una spedizione - General Generale - CodePaster CodePaster - Default Protocol: - Pastebin.ca - Pastebin.com @@ -632,23 +605,19 @@ Interfaccia utente - Checking this will populate the source file view automatically but might slow down debugger startup considerably. Marcando questa casella la vista dei file sorgente sarà riempita automaticamente, ma l'avvio del debugger risulterà rallentato. - Populate source file view automatically Riempimento automatico della vista dei file sorgente - When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. Quando questa casella è marcata 'Entra in' comprime più passi in uno in certe situazioni, rendendo il debug 'meno rumoroso'. Ad esempio il reference counting atomico sarà saltato, e un "Entra in" relativo all'emissione di un segnale porterà direttamente allo slot connesso al segnale. - Skip known frames when stepping Semplifica le sequenze note @@ -657,17 +626,14 @@ Usa i suggerimenti durante il debug - Maximal stack depth: Dimesione massima dello stack: - <unlimited> <illimitata> - Use alternating row colors in debug views Alterna i colori delle righe nelle finestre di debug @@ -676,60 +642,51 @@ Marcando questa casella si abiliteranno i suggerimenti dei valori delle variabili durante il debug. Dato che questo può rallentare il debug e non fornisce informazioni affidabili dato che non usa informazioni di contesto, questa opzione è normalmente disattivata. - Enable reverse debugging Abilita il debug all'indietro - Show a message box when receiving a signal - Use tooltips in main editor while debugging - CompletionSettingsPage + ::TextEditor Code Completion Completamento del Codice - Do a case-sensitive match for completion items. Distingui le maiuscole negli elementi del completamento. - &Case-sensitive completion Distingui le &Maiuscole - Automatically insert (, ) and ; when appropriate. Inserisci automaticamente (, ) e ; dove appropriato. - Insert the common prefix of available completion items. Inserisci il prefisso comune dei completamenti disponibili. - Autocomplete common &prefix Autocompleta il prefisso &comune - &Automatically insert brackets &Parentesi automatiche - ContentWindow + ::Help Open Link Apri il Collegamento @@ -1136,52 +1093,42 @@ Vuoi sovrascriverli? Impostazioni Generali - User &interface color: Colore &interfaccia utente: - Reset to default Ripristina predefinito - R R - Terminal: Terminale: - External editor: Editor esterno: - ? ? - When files are externally modified: - Always ask - Reload all modified files - Ignore modifications @@ -1347,7 +1294,6 @@ Vuoi sovrascriverli? Nuovo Progetto - 1 1 @@ -1813,32 +1759,26 @@ Vuoi sovrascriverli? Nome classe: - Base class: Classe Base: - Header file: File Header: - Source file: File Sorgente: - Generate form: Genera form: - Form file: File form: - Path: Percorso: @@ -1919,12 +1859,10 @@ Vuoi sovrascriverli? Introduzione e posizione del progetto - Name: Nome: - Create in: Crea in: @@ -1949,12 +1887,10 @@ Vuoi sovrascriverli? Invio Subversion - Des&cription Des&crizione - F&iles F&ile @@ -2066,22 +2002,18 @@ Vuoi sovrascriverli? Estensione header: - Source suffix: Estensione sorgente: - File Naming Conventions Convenzioni sui Nomi dei File - Lower case file names Nomi dei file in minuscolo - License Template: @@ -2200,9 +2132,6 @@ Vuoi sovrascriverli? Select Core File Scegli il File Core - - - ::Debugger Process ID ID di Processo @@ -2219,9 +2148,6 @@ Vuoi sovrascriverli? Refresh Aggiorna - - - ::Debugger Select start address @@ -2230,16 +2156,10 @@ Vuoi sovrascriverli? Enter an address: - - - ::Debugger Settings... Impostazioni... - - - ::Debugger Marker File: File Marker: @@ -2284,10 +2204,6 @@ Vuoi sovrascriverli? Line Number: Numero Riga: - - Condition: - Condizione: - Ignore Count: Numero di Scarti: @@ -2312,9 +2228,6 @@ Vuoi sovrascriverli? Breakpoint will only be hit after being ignored so many times. L'interruzione avverrà dopo essere stata ignorata per queste volte. - - - ::Debugger Breakpoints Punti di Interruzione @@ -2367,9 +2280,6 @@ Vuoi sovrascriverli? Conditions on Breakpoint %1 Condizioni sul punto di interruzione %1 - - - ::Debugger Unable to load the debugger engine library '%1': %2 Impossibile caricare la libreria del debugger '%1': %2 @@ -2483,9 +2393,6 @@ Vuoi sovrascriverli? Thread %1: No debug information available (%2). - - - ::Debugger injection iniezione @@ -2530,9 +2437,6 @@ Vuoi sovrascriverli? Querying dumpers for '%1'/'%2' (%3) Interrogazione dei dumper per '%1'/'%2' (%3) - - - ::Debugger Cdb Cdb @@ -2555,9 +2459,6 @@ Vuoi sovrascriverli? Autodetection Autorilevamento - - - ::Debugger Symbol Server... Server dei Simboli... @@ -2570,9 +2471,6 @@ Vuoi sovrascriverli? Pick a local cache directory Scegli una cartella di cache locale - - - ::Debugger Continue Continua @@ -2701,9 +2599,6 @@ Vuoi sovrascriverli? The debugging helper is used to nicely format the values of Qt data types and some STL data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper. La libreria helper per il debug serve a presentare i valori dei tipi di dati Qt e di alcuni tipi STL. Deve essere compilata per ogni versione di Qt e per farlo è necessario aprire le preferenze Qt, selezionare una versione di Qt e fare clic su 'Ricompila'. - - - ::Debugger Start and Debug External Application... Avvio e Debug di Applicazione Esterna... @@ -2796,16 +2691,10 @@ Vuoi sovrascriverli? Attaching to core %1. - - - ::Debugger Debug Debug - - - ::Debugger Debugger properties... Proprietà del Debugger... @@ -2966,9 +2855,6 @@ Vuoi sovrascriverli? Execute line Esegui riga - - - ::Debugger Debugging Helper Helper del Debug @@ -2981,9 +2867,6 @@ Vuoi sovrascriverli? Ctrl+Shift+F11 Ctrl+Shift+F11 - - - ::Debugger The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program. Il progesso Gdb non è partito. Può essere che manchi il programma '%1' o che i permessi siano insufficienti. @@ -3355,9 +3238,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Retrieving data for tooltip... Recupero dei dati per il suggerimento... - - - ::Debugger Gdb Gdb @@ -3370,9 +3250,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Choose Location of Startup Script File Scegli la posizione dello Script di Avvio - - - ::Debugger Module name Nome del Modulo @@ -3389,9 +3266,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. End address Indirizzo di fine - - - ::Debugger Modules Moduli @@ -3456,9 +3330,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Symbols in "%1" Simboli in "%1" - - - ::Debugger Cannot create temporary file: %2 Impossibile creare il file temporaneo: %2 @@ -3475,16 +3346,10 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Cannot open FiFo %1: %2 Impossibile aprire la FiFo %1: %2 - - - ::Debugger Value (base %1) - - - ::Debugger Registers Registri @@ -3497,9 +3362,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Always reload register listing Ricarica sempre i registri - - - ::Debugger '%1' contains no identifier '%1' non contiene identificatori @@ -3550,9 +3412,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Open file "%1"' Apri file "%1" - - - ::Debugger ... ... @@ -3605,9 +3464,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Thread ID ID del Thread - - - ::Debugger Stack Stack @@ -3616,9 +3472,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Copy contents to clipboard Copia il contenuto negli appunti - - - ::Debugger Executable: Eseguibile: @@ -3711,9 +3564,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Insert new watch item Inserisci una nuova osservazione - - - ::Debugger Clear contents Cancella il contenuto @@ -3730,32 +3580,26 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Marcando questa casella si abilita la visualizzazione dei tipi Qt e STL nella vista Variabili Locali & Osservazione - Use debugging helper Usa l'helper del debug - This will load a dumper library Marcando questa casella si caricherà una libreria di dumper - Use debugging helper from custom location Usa un helper del debug personale - Location: Posizione: - Debug debugging helper Debug dell'helper di debug - Debugging helper Helper del Debug @@ -3830,12 +3674,10 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Scegli il nome della classe - Class Classe - Configure... Configura... @@ -4055,18 +3897,16 @@ La ricompilazione del progetto potrebbe aiutare. - DocSettingsPage + ::Help Registered Documentation Documentazione Registrata - Add... Aggiungi... - Remove Rimuovi @@ -4112,7 +3952,6 @@ La ricompilazione del progetto potrebbe aiutare. Tema: - Use Virtual Box Note: This adds the toolchain to the build environment and runs the program inside a virtual machine. It also automatically sets the correct Qt version. @@ -4128,47 +3967,38 @@ Imposta automaticamente la Versione di Qt corretta. Nome: - Version: Versione: - Compatibility Version: Versione di Compatibilità: - Vendor: Produttore: - Url: Url: - Location: Posizione: - Description: Descrizione: - Copyright: Copyright: - License: Licenza: - Dependencies: Dipendenze: @@ -4177,7 +4007,6 @@ Imposta automaticamente la Versione di Qt corretta. Stato: - Error Message: Messaggio d'Errore: @@ -4198,22 +4027,18 @@ Imposta automaticamente la Versione di Qt corretta. Stato - Name Nome - Version Versione - Vendor Produttore - Location Posizione @@ -4443,82 +4268,66 @@ Causa: %3 Usa FakeVim - Vim style settings Impostazioni dello stile Vim - vim's "expandtab" option opzione "expandtab" di vim - Expand tabulators: Espandi le tabulazioni: - Highlight search results: Evidenzia i risultati della ricerca: - Shift width: Larghezza spostamento: - Smart tabulators: Tabulazioni intelligenti: - Start of line: Inizio della riga: - vim's "tabstop" option opzione "tabstop" di vim - Tabulator size: Larghezza della tabulazione: - Backspace: Backspace: - VIM's "autoindent" option opzione "autoindent" di vim - Automatic indentation: Indentazione automatica: - Copy text editor settings Copia stile dall'editor di testo - Set Qt style Stile Qt - Set plain style Stile semplice - Incremental search: Ricerca incrementale: @@ -4530,7 +4339,6 @@ Causa: %3 Aggiungi Nome Filtrato - Filter Name: Filtra il Nome: @@ -4542,65 +4350,52 @@ Causa: %3 Filtri - 1 1 - Add Aggiungi - Remove Rimuovi - Attributes Attributi - Find::Internal::FindDialog + ::Core Search for... Cerca... - Sc&ope: Ambit&o: - &Search &Cerca - Search &for: Co&sa: - Close Chiudi - &Case sensitive Distingui le &Maiuscole - &Whole words only &Parole intere - - - Find::Internal::FindPlugin &Find/Replace &Cerca/Sostituisci @@ -4617,9 +4412,6 @@ Causa: %3 Ctrl+Shift+F - - - Find::Internal::FindToolBar Current Document Documento Corrente @@ -4668,36 +4460,26 @@ Causa: %3 Use Regular Expressions Usa Espressioni Regolari - - - Find::Internal::FindWidget Find Trova - Find: Trova: - Replace with: Sostituisci con: - All Tutti - ... ... - - - Find::SearchResultWindow No matches found! Nessuna corrispondenza trovata! @@ -4724,80 +4506,67 @@ Causa: %3 - GdbOptionsPage + ::Debugger Gdb interaction Interazione con gdb - Gdb location: Posizione gdb: - Environment: Ambiente: - This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up. Questo può essere vuoto, o puntare ad un file contenente comandi gdb che saranno eseguiti all'avvio di gdb. - Gdb startup script: Script di avvio gdb: - Behaviour of breakpoint setting in plugins Impostazione di punti di interruzione nei plugin - This is the slowest but safest option. Questa è l'impostazione più lenta e più sicura. - Try to set breakpoints in plugins always automatically. Imposta i punti di interruzione nei plugin automaticamente. - Try to set breakpoints in selected plugins Imposta i punti di interruzione nei plugin selezionati - Matching regular expression: Secondo l'espressione regolare: - Never set breakpoints in plugins automatically Non impostare mai i punti di interruzione automaticamente - This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH. Questo può essere il percorso assoluto completo dell'eseguibile gdb che vuoi usare, oppure il nome di un eseguibile che sarà cercato nel tuo PATH. - GenericMakeStep + ::ProjectExplorer Override %1: Ridefinisci %1: - Make arguments: Parametri make: - Targets: Destinazioni: @@ -4884,17 +4653,14 @@ Causa: %3 Rami - General information Informazioni Generali - Repository: Deposito: - Remote branches Rami remoti @@ -5329,32 +5095,26 @@ Causa: %3 Informazioni Generali - repository deposito - Branch: Ramo: - branch ramo - Commit Information Informazioni del Commit - Author: Autore: - Email: Email: @@ -5371,37 +5131,30 @@ Causa: %3 Variabili d'ambiente - PATH: PATH: - From system Dal sistema - <b>Note:</b> <b>Nota:</b> - Git needs to find Perl in the environment as well. Git necessita di tovare anche Perl nell'ambiente. - Log commit display count: Numero di revisioni da mostrare per un Log: - Note that huge amount of commits might take some time. Un numero elevato di revisioni può richiedere parecchio tempo. - Timeout (seconds): Timeout (secondi): @@ -5418,7 +5171,6 @@ Causa: %3 Prompt del submit - Omit date from annotation output @@ -5535,18 +5287,10 @@ Causa: %3 Filters Filtri - - Help - Guida - Help index Indice della guida - - Help - Guida - Contents Contenuti @@ -5647,10 +5391,6 @@ Causa: %3 Copy &Link Location Copia il &Collegamento - - Open Link in New Tab - Apri il Collegamento in una Nuova Scheda - Select All Seleziona Tutto @@ -5690,22 +5430,14 @@ Causa: %3 - IndexWindow + ::Help &Look for: &Cerca: - - Open Link - Apri il Collegamento - - - Open Link in New Tab - Apri il Collegamento in una Nuova Scheda - - InputPane + ::Debugger Type Ctrl-<Return> to execute a line. Premi Ctrl-<Invio> per eseguire la riga. @@ -5838,16 +5570,7 @@ nel tuo file .pro. - MakeStep - - Override %1: - Ridefinisci %1: - - - - Make arguments: - Parametri make: - + ::ProjectExplorer MyMain @@ -5863,24 +5586,21 @@ nel tuo file .pro. Nick Name - Filter: Filtro: - Clear Cancella - OpenWithDialog + ::Core Open File With... Apri il file con... - Open file extension with: Apri l'estensione del file con: @@ -5916,7 +5636,6 @@ nel tuo file .pro. Numero della Modifica - Change Number: Numero della Modifica: @@ -5925,12 +5644,10 @@ nel tuo file .pro. P4 Modifiche in Sospeso - Submit Invio - Cancel Annulla @@ -6242,7 +5959,6 @@ nel tuo file .pro. Richiesta Perforce - OK OK @@ -6251,27 +5967,22 @@ nel tuo file .pro. Comando P4: - Use default P4 environment variables Usa le variabili d'ambiente predefinite di P4 - Environment variables Variabili d'ambiente - P4 Client: Client P4: - P4 User: Utente P4: - P4 Port: Porta P4: @@ -6284,7 +5995,6 @@ nel tuo file .pro. Prova - Prompt to submit Prompt del submit @@ -6301,43 +6011,20 @@ nel tuo file .pro. Comando Perforce - Change: Cambia: - Client: Client: - User: Utente: - PluginDialog - - Details - Dettagli - - - Error Details - Dettagli Errore - - - Installed Plugins - Plugin Installati - - - Plugin Details of %1 - Dettagli Plugin di %1 - - - Plugin Errors of %1 - Errore Plugin di %1 - + ::Core ::ExtensionSystem @@ -6818,22 +6505,18 @@ Nome di base della libreria: %1 Gestione della Sessione - Create New Session Crea Nuova - Clone Session Clona - Delete Session Elimina - <a href="qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">What is a Session?</a> <a href="qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">Cos'è una Sessione?</a> @@ -6887,22 +6570,18 @@ Nome di base della libreria: %1 Abilita fase speciale - Command: Comando: - Working Directory: Directory di Lavoro: - Command Arguments: Parametri del Comando: - Enable Custom Process Step @@ -7001,17 +6680,14 @@ Nome di base della libreria: %1 Rimozione del File - File to remove: File da rimuovere: - &Delete file permanently &Cancella il file in modo permanente - &Remove from Version Control &Rimuovi dal sistema di revisione @@ -7028,7 +6704,6 @@ Nome di base della libreria: %1 + - - - @@ -7037,7 +6712,6 @@ Nome di base della libreria: %1 Impostazioni - Edit run configuration: @@ -7079,22 +6753,18 @@ Nome di base della libreria: %1 Gestione progetto - &Add to Project &Aggiungi al Progetto - &Project &Progetto - Add to &version control Aggiungi al &VCS - The following files will be added: @@ -7451,22 +7121,18 @@ al VCS (%2)? Configurazione di QMake: - debug debug - release release - Additional arguments: Parametri aggiuntivi: - Effective qmake call: Chiamata effettiva a qmake: @@ -7616,33 +7282,28 @@ al VCS (%2)? - QrcEditor + ::ResourceEditor Add Aggiungi - Remove Rimuovi - Properties Proprietà - Prefix: Prefisso: - Language: Lingua: - Alias: Alias: @@ -7758,17 +7419,14 @@ al VCS (%2)? Nuovo - Remove Rimuovi - Up Su - Down Giu @@ -7929,7 +7587,6 @@ al VCS (%2)? Nome della Configurazione: - Qt Version: Versione Qt: @@ -7938,22 +7595,18 @@ al VCS (%2)? Gestione Versioni Qt - This Qt-Version is invalid. Questa Versione Qt non è valida. - Shadow Build: Compila in cartella separata: - Build Directory: Cartella di Compilazione: - <a href="import">Import existing build</a> <a href="import">Importa compilazione esistente</a> @@ -7986,7 +7639,6 @@ al VCS (%2)? - Tool Chain: @@ -8144,17 +7796,14 @@ al VCS (%2)? Versioni Qt - + + - - - - Name Nome @@ -8163,12 +7812,10 @@ al VCS (%2)? Percorso - Debugging Helper Helper del Debug - Version Name: Nome della Versione: @@ -8177,37 +7824,30 @@ al VCS (%2)? Percorso: - MinGW Directory: Cartella MinGW: - Debugging Helper: Helper del Debug: - Show &Log Mostra &Log - &Rebuild &Ricompila - Default Qt Version: Versione Qt Predefinita: - MSVC Version: Versione MSVC: - <!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; } @@ -8220,17 +7860,14 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Impossibile rilevare la versione di MSVC.</span></p></body></html> - QMake Location - QMake Location: - MWC Directory: @@ -8243,67 +7880,54 @@ p, li { white-space: pre-wrap; } Modifica Variabile - Variable Name: Nome Variabile: - Assignment Operator: Operatore di Assegnazione: - Variable: Variabile: - Append (+=) Aggiungi (+=) - Remove (-=) Rimuovi (-=) - Replace (~=) Sostituisci (~=) - Set (=) Imposta (=) - Unique (*=) Unica (*=) - Select Item Scegli Elemento - Edit Item Modifica Elemento - Select Items Scegli Elementi - Edit Items Modifica Elementi - New Nuovo @@ -8630,47 +8254,38 @@ p, li { white-space: pre-wrap; } Nome: - File Types: Tipi di File: - Specify file name filters, separated by comma. Filters may contain wildcards. Specifica filtri sul nome, separati da una virgola. I filtri possono contenere wildcard. - Prefix: Prefisso: - Limit to prefix Limita al prefisso - Add... Aggiungi... - Edit... Modifica... - Remove Rimuovi - Directories: Cartelle: - Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree. To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for. Specifica la parola breve/abbreviazione che sarà usata per restringere il completamento ai file di queste cartelle. @@ -8685,12 +8300,10 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Configurazione del filtro - Include hidden files Includi i file nascosti - Filter: Filtro: @@ -8731,22 +8344,18 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Configura i Filtri - Add Aggiungi - min min - Refresh now! Aggiorna adesso! - Refresh Interval: Intervallo di aggiornamento: @@ -8755,7 +8364,6 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da %1 (Prefisso: %2) - Edit Modifica @@ -8865,27 +8473,22 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da &Redo &Ripeti - - - ::ResourceEditor untitled senza titolo - SaveItemsDialog + ::Core Save Changes Salva le Modifiche - The following files have unsaved changes: Questi file hanno delle modifiche non salvate: - Automatically save all files before building Salva i file automaticamente prima di @@ -8897,13 +8500,12 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Opzioni - 0 0 - SharedTools::QrcEditor + ::ResourceEditor Add Files Aggiungi File @@ -8952,9 +8554,6 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Could not copy the file to %1. Impossibile copiare il file su %1. - - - SharedTools::ResourceView Add Files... Aggiungi File... @@ -8999,80 +8598,53 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Change Language Cambia Lingua - - Language: - Lingua: - Change File Alias Cambia l'Alias del file - - Alias: - Alias: - - ShortcutSettings + ::Core Keyboard Shortcuts Scorciatoie della Tastiera - - Filter: - Filtro: - - - Command Comando - Label Etichetta - Shortcut Scorciatoia - Defaults Predefiniti - Import... Importa... - Export... Esporta... - Key Sequence Sequenza di Tasti - Shortcut: Scorciatoia: - Reset Ripristina - - - Remove - Rimuovi - ShowBuildLog @@ -9089,50 +8661,28 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da - StartExternalDialog + ::Debugger - Start Debugger - Avvia il Debug - - - - Executable: - Eseguibile: - - - Arguments: Parametri: - Break at 'main': Interrompi su 'main' - - - StartRemoteDialog - Start Debugger - Avvia il Debug - - - Host and port: Host e porta: - Architecture: Architettura: - Use server start script: Usa script di avvio del server: - Server start script: Script di avvio del server: @@ -9144,17 +8694,14 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Comando Subversion: - Authentication Autenticazione - User name: Nome utente: - Password: Password: @@ -9415,92 +8962,74 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Salvataggio - Removes trailing whitespace on saving. Rimuove gli spazi in coda al salvataggio. - &Clean whitespace &Pulizia spaziature - Clean whitespace in entire document instead of only for changed parts. Pulisce gli spazi in tutto il documento, non solo nelle parti modificate. - In entire &document In tutto il &documento - Correct leading whitespace according to tab settings. Correggi le tabulazioni del documento. - Clean indentation Pulizia indentazione - &Ensure newline at end of file &Garantisci una riga vuota alla fine del file - Tabs and Indentation Tab ed Indentazione - Ta&b size: Ta&b: - &Indent size: &Indentazione: - Backspace will go back one indentation level instead of one space. Backspace cancellerà un livello di indentazione al posto di uno spazio. - &Backspace follows indentation &Backspace segue l'indentazione - Insert &spaces instead of tabs Inserisci &spazi invece che tab - Enable automatic &indentation Abilita l'&indentazione automatica - Tab key performs auto-indent: Il tasto Tab auto-indenta: - Never Mai - Always Sempre - In leading white space Sugli spazi all'inizio @@ -9509,67 +9038,54 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da Visualizzazione - Display line &numbers Mostra il &numero della righe - Display &folding markers Mostra i segni di &raggruppamento del codice - Show tabs and spaces. Mostra i tab e gli spazi. - &Visualize whitespace &Mostra spaziature - Highlight current &line Evidenzia la r&iga corrente - Highlight &blocks Evidenzia i &blocchi - Text Wrapping Ritorno a capo - Enable text &wrapping Abilita il ri&torno a capo - Display right &margin at column: Mostra il &margine destro alla colonna: - Animate matching parentheses Mostra l'animazione sulle parentesi - Navigation Navigazione - Enable &mouse navigation Abitila la navigazione con il &mouse - Mark text changes @@ -9670,17 +9186,14 @@ Queste codifiche dovrebbero andare bene: Tipo di carattere - Family: Famiglia: - Size: Dimensione: - Color Scheme Schema dei Colori @@ -9713,17 +9226,14 @@ Queste codifiche dovrebbero andare bene: Anteprima: - Antialias Antialiasing - Copy... - Delete Elimina @@ -10073,23 +9583,20 @@ Queste codifiche dovrebbero andare bene: - TopicChooser + ::Help Choose Topic Scelta Argomento - &Topics &Argomenti - &Display &Visualizza - &Close &Chiudi @@ -10177,39 +9684,32 @@ Queste codifiche dovrebbero andare bene: Prompt del submit - Wrap submit message at: Ritorno a capo del messaggio alla colonna: - An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. Un eseguibile che sia chiamato con il file temporaneo contenente il messaggio di submit come primo parametro. Deve uscire con un valore != 0 e scrivere un messaggio sullo standard error per indicare un problema. - Submit message check script: Script di controllo del messaggio: - A file listing user names and email addresses in a 4-column mailmap format: name <email> alias <email> Un file contenente nomi utenti e mail nel formato mailmap a 4 colonne: nome <email> alias <email> - User/alias configuration file: File di configurazione utenti/alias: - A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. Un file semplice che contiene righe con nomi dei campi tipo "Reviewed-By:" che saranno aggiunti sotto l'editor del submit. - User fields configuration file: File di configurazione dei campi utente: @@ -10246,22 +9746,18 @@ Nota: questa operazione potrebbe cancellare il file locale. Invia a Codepaster - &Username: Nome &utente: - <Username> <Nome utente> - &Description: &Descrizione: - <Description> <Descrizione> @@ -10280,22 +9776,18 @@ p, li { white-space: pre-wrap; } Parti da inviare a codepaster - Patch 1 Patch 1 - Patch 2 Patch 2 - Protocol: - <!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; } @@ -10304,7 +9796,6 @@ p, li { white-space: pre-wrap; } - Parts to send to server @@ -10316,22 +9807,18 @@ p, li { white-space: pre-wrap; } main - Text1: Testo1: - N/A N/D - Text2: Testo2: - Text3: Testo3: @@ -10343,29 +9830,25 @@ p, li { white-space: pre-wrap; } - TextLabel - CheckBox - PasteBinComSettingsWidget + ::CodePaster Form - Server Prefix: - <!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; } @@ -10376,33 +9859,28 @@ p, li { white-space: pre-wrap; } - Cvs + ::CVS Prompt to submit Prompt del submit - When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed. - Describe all files matching commit id: - CVS Command: - CVS Root: - Diff Options: @@ -10418,37 +9896,30 @@ p, li { white-space: pre-wrap; } - Embedding of the UI Class - Aggregation as a pointer member Aggregazione come membro puntatore - Aggregation Aggregazione - Multiple Inheritance Eredità Multipla - Code Generation - Support for changing languages at runtime Supporta il cambio della lingua durante l'esecuzione - Use Qt module name in #include-directive @@ -10483,17 +9954,14 @@ p, li { white-space: pre-wrap; } - Filter: Filtro: - ... ... - Keep updating @@ -10513,12 +9981,10 @@ p, li { white-space: pre-wrap; } - Filter: Filtro: - ... ... @@ -10560,108 +10026,88 @@ p, li { white-space: pre-wrap; } - GeneralSettingsPage + ::Help Form - Font Tipo di carattere - Family: Famiglia: - Style: - Size: Dimensione: - Startup Avvio - On context help: - Show side-by-side if possible - Always show side-by-side - Always start full help - On help start: - Show my home page - Show a blank page - Show my tabs from last session - Home Page: - Use &Current Page - Use &Blank Page - Restore to Default - Help Bookmarks - Import... Importa... - Export... Esporta... @@ -10673,27 +10119,22 @@ p, li { white-space: pre-wrap; } Compila ed Esegui - Save all files before Build Salva tutti i file prima della Compilazione - Always build Project before Running Compila sempre il Progetto prima dell'Esecuzione - Show Compiler Output on building - Use jom instead of nmake - <i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. For more details, see the <a href="http://qt.gitorious.org/qt-labs/jom/">jom Homepage</a>. Disable it if you experience problems with your builds. @@ -10702,12 +10143,10 @@ p, li { white-space: pre-wrap; } - Manage Sessions... Gestisci le Sessioni... - Create New Project... Crea un Nuovo Progetto... @@ -10742,117 +10181,94 @@ p, li { white-space: pre-wrap; } - The header file - &Sources - Widget librar&y: - Widget project &file: - Widget h&eader file: - The header file has to be specified in source code. - Widge&t source file: - Widget &base class: - QWidget - Plugin class &name: - Plugin &header file: - Plugin sou&rce file: - Icon file: - &Link library - Create s&keleton - Include pro&ject - &Description - G&roup: - &Tooltip: - W&hat's this: - The widget is a &container - Property defa&ults - dom&XML: @@ -10869,42 +10285,34 @@ p, li { white-space: pre-wrap; } - Plugin and Collection Class Information - Specify the properties of the plugin library and the collection class. - Collection class: - Collection header file: - Collection source file: - Plugin name: - Resource file: - icons.qrc @@ -10913,17 +10321,14 @@ p, li { white-space: pre-wrap; } - Custom Widget List - Widget &Classes: - Specify the list of custom widgets and their properties. @@ -10931,12 +10336,10 @@ p, li { white-space: pre-wrap; } ::Welcome - Examples not installed Gli esempi non sono installati - Open Apri @@ -11061,22 +10464,18 @@ p, li { white-space: pre-wrap; } ::QmakeProjectManager - Installed S60 SDKs: - SDK Location - Qt Location - Refresh Aggiorna @@ -11092,27 +10491,22 @@ p, li { white-space: pre-wrap; } Grassetto - Italic Corsivo - Background: Sfondo: - Foreground: Primo piano: - Erase background Cancella sfondo - x x @@ -11124,12 +10518,10 @@ p, li { white-space: pre-wrap; } - Checkout Directory: - Path: Percorso: @@ -11178,7 +10570,6 @@ p, li { white-space: pre-wrap; } } - #headerFrame { border-image: url(:/welcome/images/center_frame_header.png) 0; border-width: 0; @@ -11187,12 +10578,10 @@ p, li { white-space: pre-wrap; } - Help us make Qt Creator even better Aiutaci a migliorare Qt Creator - Feedback Commenti @@ -11252,27 +10641,14 @@ p, li { white-space: pre-wrap; } Server: - - - PasteBinDotComProtocol Error during paste - - - PasteBinDotComSettings Pastebin.com - - CodePaster - CodePaster - - - - PasteView Paste Incolla @@ -11328,7 +10704,7 @@ p, li { white-space: pre-wrap; } - Cvs + ::CVS Checks out a project from a CVS repository. @@ -11790,9 +11166,6 @@ p, li { white-space: pre-wrap; } Save File - - - ::Help The file is not an XBEL version 1.0 file. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index d61674d2276..d136a33e974 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -2378,7 +2378,7 @@ These prefixes are used in addition to current file name on Switch Header/Source - Cvs + ::CVS Configuration 設定 @@ -2491,9 +2491,6 @@ These prefixes are used in addition to current file name on Switch Header/Source Second chance exceptions セカンドチャンスの例外 - - - ::Debugger <html><head/><body><p>The debugger is not configured to use the public Microsoft Symbol Server.<br/>This is recommended for retrieval of the symbols of the operating system libraries.</p><p><span style=" font-style:italic;">Note:</span> It is recommended, that if you use the Microsoft Symbol Server, to also use a local symbol cache.<br/>A fast internet connection is required for this to work smoothly,<br/>and a delay might occur when connecting for the first time and caching the symbols.</p><p>What would you like to set up?</p></body></html> <html><head/><body><p>このデバッガは Microsoft の公開シンボルサーバーを利用する設定ではありません。<br/>オペレーティングシステムのライブラリのシンボルはサーバーから取得することが推奨されています。</p><p><span style=" font-style:italic;">注意:</span> Microsoft のシンボルサーバーを用いる場合、ローカルにシンボルキャッシュを持つことも推奨されています。<br/>快適な作業には高速なインターネット回線が必要です。<br/>また、初めて接続しシンボルをキャッシュする際には遅延が生じるでしょう。</p><p>どのように設定しますか？</p></body></html> @@ -5635,9 +5632,6 @@ Add, modify, and remove document filters, which determine the documentation set Edit 編集 - - - ::QtSupport Add... 追加... @@ -5658,9 +5652,6 @@ Add, modify, and remove document filters, which determine the documentation set Link with Qt... Qt にリンクする... - - - ::QtSupport Debugging Helper Build Log デバッグヘルパのビルドログ @@ -5764,9 +5755,6 @@ Add, modify, and remove document filters, which determine the documentation set Specific &key 特定のキー(&K) - - - ::RemoteLinux WizardPage ウィザードページ @@ -5820,7 +5808,7 @@ Add, modify, and remove document filters, which determine the documentation set - QrcEditor + ::ResourceEditor Add 追加 @@ -5853,10 +5841,6 @@ Add, modify, and remove document filters, which determine the documentation set Add Prefix プレフィックスの追加 - - Add Files - ファイルの追加 - ::Subversion @@ -7154,7 +7138,7 @@ SSH 認証が必要とされるリポジトリで使用されます(SSH の SSH_ - TopicChooser + ::Help Choose Topic トピックの選択 @@ -8659,7 +8643,7 @@ preferShaping プロパティを false に設定すると、このような機 - develop + ::ProjectExplorer Sessions セッション @@ -8678,14 +8662,11 @@ preferShaping プロパティを false に設定すると、このような機 - examples + ::QtSupport Search in Examples... サンプルを検索... - - - tutorials Search in Tutorials... チュートリアルを検索... @@ -8714,7 +8695,7 @@ preferShaping プロパティを false に設定すると、このような機 - SessionItem + ::ProjectExplorer Clone 複製 @@ -8727,9 +8708,6 @@ preferShaping プロパティを false に設定すると、このような機 Delete 削除 - - - Sessions %1 (last session) %1 (最後のセッション) @@ -14847,7 +14825,7 @@ Flags: %3 - Cvs + ::CVS &Edit 編集(&E) @@ -15720,9 +15698,6 @@ Flags: %3 Add Breakpoint ブレークポイントを追加 - - - ::Debugger The console process "%1" could not be started. コンソールプロセス "%1" を起動できませんでした。 @@ -15811,9 +15786,6 @@ Maintenance Tool で %2 を更新した場合は、Maintenance Tool を再実行 "Select Widget to Watch": Please stop the application first. "監視対象のウィジェットの選択": 先にアプリケーションを停止してください。 - - - ::Debugger C++ exception C++ 例外 @@ -15838,9 +15810,6 @@ Maintenance Tool で %2 を更新した場合は、Maintenance Tool を再実行 Output: 出力: - - - ::Debugger Symbol Paths シンボルのパス @@ -15853,9 +15822,6 @@ Maintenance Tool で %2 を更新した場合は、Maintenance Tool を再実行 CDB Paths CDB のパス - - - ::Debugger Behavior 動作 @@ -16233,9 +16199,6 @@ Maintenance Tool で %2 を更新した場合は、Maintenance Tool を再実行 Display thread names スレッド名を表示する - - - ::Debugger Start Debugger デバッガ起動 @@ -16355,9 +16318,6 @@ You can choose another communication channel here, such as a serial line or cust Attach to %1 %1 にアタッチ - - - ::Debugger Kit: キット: @@ -16366,9 +16326,6 @@ You can choose another communication channel here, such as a serial line or cust &Port: ポート(&P): - - - ::Debugger <html><body><p>The remote CDB needs to load the matching Qt Creator CDB extension (<code>%1</code> or <code>%2</code>, respectively).</p><p>Copy it onto the remote machine and set the environment variable <code>%3</code> to point to its folder.</p><p>Launch the remote CDB as <code>%4 &lt;executable&gt;</code> to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p><pre>%5</pre></body></html> <html><body><p>リモート CDB には対応する Qt Creator CDB エクステンション(<code>%1</code> か <code>%2</code>)が必要です。</p><p>エクステンションをリモートマシンにコピーして、環境変数 <code>%3</code> にそのフォルダを設定してください。</p><p>リモート CDB は TCP/IP を接続プロトコルとして使用するように <code>%4 &lt;executable&gt;</code> と実行してください。</p><p>接続パラメータには以下を使用してください:</p><pre>%5</pre></body></html> @@ -16385,9 +16342,6 @@ You can choose another communication channel here, such as a serial line or cust &Connection: 接続(&C): - - - ::Debugger Select Start Address 開始アドレスの選択 @@ -16396,9 +16350,6 @@ You can choose another communication channel here, such as a serial line or cust Enter an address: アドレスを入力: - - - ::Debugger Start Remote Engine リモートエンジン開始 @@ -16423,9 +16374,6 @@ You can choose another communication channel here, such as a serial line or cust &Inferior path: 対象プログラムのパス(&I): - - - ::Debugger Type Formats 型の表示形式 @@ -17798,9 +17746,6 @@ markers in the source code editor. Interrupting not possible 割り込み不可 - - - ::Debugger Remote Error リモートエラー @@ -17919,16 +17864,10 @@ markers in the source code editor. An unknown error in the LLDB process occurred. LLDB プロセスにて未知のエラーが発生しました。 - - - ::Debugger Download of remote file succeeded. リモートファイルのダウンロードが成功しました。 - - - ::Debugger Load Core File コアファイルを読み込み @@ -17981,9 +17920,6 @@ markers in the source code editor. Select Remote Core File リモートコアファイルの選択 - - - ::Debugger Clear Contents 内容をクリア @@ -17996,16 +17932,10 @@ markers in the source code editor. Reload Debugging Helpers デバッグヘルパを再読込する - - - ::Debugger Type Ctrl-<Return> to execute a line. 1行だけ実行するには、Ctrl+<リターン>キーを押してください。 - - - ::Debugger Debugger Log デバッガログ @@ -18050,9 +17980,6 @@ You may be asked to share the contents of this log when reporting bugs related t Log File ログファイル - - - ::Debugger Memory at Register "%1" (0x%2) レジスタ "%1" (0x%2) の指すメモリ @@ -18097,9 +18024,6 @@ You may be asked to share the contents of this log when reporting bugs related t None シンボルなし - - - ::Debugger Cannot create temporary file: %1 一時ファイルを作成できません: %1 @@ -18112,9 +18036,6 @@ You may be asked to share the contents of this log when reporting bugs related t Cannot open FiFo %1: %2 FiFo %1 を開けません: %2 - - - ::Debugger Adapter start failed アダプタの開始に失敗しました @@ -18151,9 +18072,6 @@ You may be asked to share the contents of this log when reporting bugs related t An unknown error in the Pdb process occurred. Pdb プロセスにて未知のエラーが発生しました。 - - - ::Debugger The slave debugging engine required for combined QML/C++-Debugging could not be created: %1 QML と C++ の同時デバッグに必要なスレーブ側のデバッグエンジンが作成できませんでした: %1 @@ -18166,9 +18084,6 @@ You may be asked to share the contents of this log when reporting bugs related t QML debugger activated QML デバッガがアクティブになりました - - - ::Debugger No application output received in time 時間内にアプリケーション出力を受信できません @@ -18187,10 +18102,6 @@ Do you want to retry? QML Debugger: Remote host closed connection. QML デバッガ: リモートホストが接続を閉じました。 - - JS Source for %1 - %1 の JavaScript ソース - Could not connect to the in-process QML debugger. %1 プロセス内 QML デバッガに接続できませんでした。 %1 @@ -18239,9 +18150,6 @@ Do you want to retry? QML Debugger: Connection failed. QML デバッガの接続に失敗しました。 - - - ::Debugger Success: 成功: @@ -18254,9 +18162,6 @@ Do you want to retry? Properties プロパティ - - - ::Debugger Content as ASCII Characters ASCII 文字列としての値 @@ -18345,9 +18250,6 @@ Do you want to retry? Cannot Create 作成不可 - - - ::Debugger Insert Symbol Server... シンボルサーバーの挿入... @@ -18384,9 +18286,6 @@ Do you want to retry? Remove Snapshot スナップショットを削除 - - - ::Debugger Internal Name 内部名 @@ -20806,13 +20705,6 @@ instead of its installation directory when run outside git bash. Git リポジトリブラウザコマンド - - ::GLSLEditor - - GLSL - シェーダ記述言語(GLSL) - - ::Help @@ -23328,10 +23220,6 @@ Excluding: %2 Name 名前 - - Clone - 複製 - Make Default 既定にする @@ -24304,10 +24192,6 @@ to project "%2". Rename and &Open 名前変更して開く(&O) - - New Project - 新しいプロジェクト - Open Session #%1 セッション #%1 を開く @@ -24341,22 +24225,6 @@ to project "%2". Appears in "Open session <name>" セッション - - %1 (last session) - %1 (最後のセッション) - - - %1 (current session) - %1 (現在のセッション) - - - Rename - 名前を変更 - - - Delete - 削除 - project Appears in "Open project <name>" @@ -24382,20 +24250,6 @@ to project "%2". Open 開く - - Sessions - セッション - - - - TargetSettingsPanelFactory - - Build & Run - ビルドと実行 - - - - ::ProjectExplorer Summary 概要 @@ -27793,9 +27647,6 @@ Do you want to save the data first? Main QML file: メイン QML ファイル: - - - QmlManager <Current File> <現在のファイル> @@ -28057,9 +27908,6 @@ Do you want to save the data first? Qt version is used for Boot2Qt development Boot2Qt - - - BaseQtVersion Device type is not supported by Qt version. Qt がサポートしていないデバイスの種類です。 @@ -28124,9 +27972,6 @@ Do you want to save the data first? Requires Qt 5.0.0 or newer. Qt 5.0.0 以降が必要です。 - - - ::QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -28218,17 +28063,6 @@ cannot be found in the path. Cannot Copy Project プロジェクトをコピーできません - - Search in Examples... - サンプルを検索... - - - Search in Tutorials... - チュートリアルを検索... - - - - ::QtSupport Qt version: Qt バージョン: @@ -28237,9 +28071,6 @@ cannot be found in the path. %1 (invalid) %1 (無効) - - - ::QtSupport <specify a name> <名前を入力> @@ -28348,9 +28179,6 @@ cannot be found in the path. qmake Location qmake のパス - - - ::QtSupport Full path to the host bin directory of the current project's Qt version. 現在のプロジェクトの Qt のホスト上の bin ディレクトリのフルパスです。 @@ -28359,9 +28187,6 @@ cannot be found in the path. Full path to the target bin directory of the current project's Qt version.<br>You probably want %1 instead. 現在のプロジェクトの Qt のターゲット上の bin ディレクトリのフルパスです。%1 が使用できるかもしれません。 - - - ::QtSupport No factory found for qmake: "%1" qmake 用ファクトリが見つかりません: "%1" @@ -28397,9 +28222,6 @@ cannot be found in the path. Connection error: %1 接続エラー: %1 - - - ::RemoteLinux Cannot deploy: %1 デプロイエラー: %1 @@ -28416,9 +28238,6 @@ cannot be found in the path. Deploy step finished. デプロイステップが完了しました。 - - - ::RemoteLinux Successfully uploaded package file. パッケージファイルのアップロードが成功しました。 @@ -28431,9 +28250,6 @@ cannot be found in the path. Package installed. パッケージをインストールしました。 - - - ::RemoteLinux SFTP initialization failed: %1 SFTP 初期化失敗: %1 @@ -28470,9 +28286,6 @@ cannot be found in the path. All files successfully deployed. すべてのファイルのデプロイが成功しました。 - - - ::RemoteLinux Incremental deployment 増分デプロイ @@ -28485,16 +28298,10 @@ cannot be found in the path. Upload files via SFTP SFTP 経由でファイルをアップロード - - - ::RemoteLinux New Generic Linux Device Configuration Setup 新しい一般的な Linux デバイスの設定 - - - ::RemoteLinux Connection 接続 @@ -28503,9 +28310,6 @@ cannot be found in the path. Choose a Private Key File 秘密鍵ファイルの選択 - - - ::RemoteLinux Summary 概要 @@ -28516,9 +28320,6 @@ In addition, device connectivity will be tested. 新しいデバイス設定が作成されます。 あわせてデバイスの接続確認も実行されます。 - - - ::RemoteLinux Generic Linux 一般的な Linux @@ -28531,9 +28332,6 @@ In addition, device connectivity will be tested. Deploy Public Key... 公開鍵をデプロイ... - - - ::RemoteLinux Connecting to host... ホストに接続中... @@ -28570,9 +28368,6 @@ In addition, device connectivity will be tested. The following specified ports are currently in use: %1 以下の指定されたポートは既に使用中です: %1 - - - ::RemoteLinux Preparing SFTP connection... SFTP 接続の準備中... @@ -28597,9 +28392,6 @@ In addition, device connectivity will be tested. Failed to upload package: %2 パッケージアップロード失敗: %2 - - - ::RemoteLinux Choose Public Key File 公開鍵ファイルを選択してください @@ -28620,9 +28412,6 @@ In addition, device connectivity will be tested. Close 閉じる - - - ::RemoteLinux Creating remote socket ... リモートソケットを作成しています ... @@ -28639,9 +28428,6 @@ In addition, device connectivity will be tested. Failure running remote process. リモートプロセスの実行に失敗しました。 - - - ::RemoteLinux Remote process crashed. リモートプロセスがクラッシュしました。 @@ -28666,9 +28452,6 @@ In addition, device connectivity will be tested. リモートのファイルシステムは %n MBytes の空き容量がありますので、続行します。 - - - ::RemoteLinux Remote path to check for free space: 空き容量を確認するリモートのパス: @@ -28685,9 +28468,6 @@ In addition, device connectivity will be tested. Check for free disk space ディスクの空き容量チェック - - - ::RemoteLinux No command line given. コマンドラインが設定されていません。 @@ -28716,9 +28496,6 @@ In addition, device connectivity will be tested. Remote command finished successfully. リモートコマンドは正常に終了しました。 - - - ::RemoteLinux Checking available ports... 使用可能なポートを確認中... @@ -28739,16 +28516,10 @@ In addition, device connectivity will be tested. Initial setup failed: %1 初回セットアップ失敗: %1 - - - ::RemoteLinux Deploy to Remote Linux Host リモート Linux ホストにデプロイ - - - ::RemoteLinux Clean Environment 環境変数なし @@ -28757,9 +28528,6 @@ In addition, device connectivity will be tested. System Environment システム環境変数 - - - ::RemoteLinux Fetch Device Environment デバイス環境の取得 @@ -28776,9 +28544,6 @@ In addition, device connectivity will be tested. Fetching environment failed: %1 環境の取得に失敗: %1 - - - ::RemoteLinux Error: No device エラー: デバイスなし @@ -28799,9 +28564,6 @@ In addition, device connectivity will be tested. Remote stderr was: "%1" リモート側の標準エラー出力: "%1" - - - ::RemoteLinux Connection failure: %1 接続エラー: %1 @@ -28810,9 +28572,6 @@ In addition, device connectivity will be tested. Installing package failed. パッケージのインストールに失敗しました。 - - - ::RemoteLinux %1 (on Remote Device) %1 (リモートデバイス上) @@ -28822,16 +28581,10 @@ In addition, device connectivity will be tested. Remote Linux run configuration default display name リモートデバイスで実行 - - - ::RemoteLinux (on Remote Generic Linux Host) (リモートの一般的な Linux ホスト上) - - - ::RemoteLinux Executable on host: ホスト上の実行可能ファイル: @@ -28864,9 +28617,6 @@ In addition, device connectivity will be tested. Remote path not set リモートのパスが設定されていません - - - ::RemoteLinux Cannot debug: Kit has no device. デバッグエラー: キットにデバイスがありません。 @@ -28879,16 +28629,10 @@ In addition, device connectivity will be tested. Cannot debug: Local executable is not set. デバッグエラー: ローカル実行ファイルが設定されていません。 - - - ::RemoteLinux Exit code is %1. stderr: 終了コードは %1 です。 標準エラー出力: - - - ::RemoteLinux Public key error: %1 公開鍵エラー: %1 @@ -28897,9 +28641,6 @@ In addition, device connectivity will be tested. Key deployment failed: %1. 鍵ファイルの転送に失敗: %1。 - - - ::RemoteLinux Packaging finished successfully. パッケージ化が成功しました。 @@ -28960,16 +28701,10 @@ In addition, device connectivity will be tested. Create tarball tar ファイルの作成 - - - ::RemoteLinux %1 (default) %1 (既定) - - - ::RemoteLinux No tarball creation step found. tarball 作成ステップが見つかりません。 @@ -28985,10 +28720,6 @@ In addition, device connectivity will be tested. Add Files ファイルを追加 - - Add Prefix - プレフィックスを追加 - Invalid file location 不正なファイルパス @@ -29029,9 +28760,6 @@ In addition, device connectivity will be tested. Could not copy the file to %1. ファイル %1 をコピーできませんでした。 - - - ::ResourceEditor The file name is empty. ファイル名が未入力です。 @@ -29044,16 +28772,10 @@ In addition, device connectivity will be tested. The <RCC> root element is missing. <RCC> にルート要素がありません。 - - - ::ResourceEditor All files (*) すべてのファイル (*) - - - ::ResourceEditor &Undo 元に戻す(&U) @@ -29078,10 +28800,6 @@ In addition, device connectivity will be tested. Remove Prefix... プレフィックスを削除する... - - Remove Missing Files - 存在しないファイルを削除する - Rename... 名前を変更... @@ -29122,9 +28840,6 @@ In addition, device connectivity will be tested. Rename Prefix プレフィックス名の変更 - - - ::ResourceEditor Open File ファイルを開く @@ -30320,9 +30035,6 @@ Will not be applied to whitespace in comments and strings. Calls 呼出回数 - - - ::Valgrind Previous command has not yet finished. 前のコマンドが完了していません。 @@ -30359,9 +30071,6 @@ Will not be applied to whitespace in comments and strings. Downloading remote profile data... リモートプロファイルデータをダウンロード中... - - - ::Valgrind Function: 関数: @@ -30432,9 +30141,6 @@ Will not be applied to whitespace in comments and strings. Incl. Cost: %1 全体コスト: %1 - - - ::Valgrind %1 in %2 %2 の %1 @@ -30443,9 +30149,6 @@ Will not be applied to whitespace in comments and strings. %1:%2 in %3 %3 の %1:%2 - - - ::Valgrind Last-level 最終レベル @@ -30502,16 +30205,10 @@ Will not be applied to whitespace in comments and strings. Position: 位置: - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) 全体のコスト率が %1 より高いすべての関数 (%2 個の関数が非表示) - - - ::Valgrind XmlServer on %1: %1 の XmlServer: @@ -30520,16 +30217,10 @@ Will not be applied to whitespace in comments and strings. LogServer on %1: %1 の LogServer: - - - ::Valgrind Analyzing memory of %1 %1 のメモリ解析中 - - - ::Valgrind in %1 %1 @@ -30538,16 +30229,10 @@ Will not be applied to whitespace in comments and strings. %1%2 %1%2 - - - ::Valgrind Suppress Error エラーを抑制 - - - ::Valgrind External Errors 外部エラー @@ -30670,9 +30355,6 @@ When a problem is detected, the application is interrupted and can be debugged.< ログファイルを解析しました。%n 個の問題が見つかりました。 - - - ::Valgrind Save Suppression 抑制ファイルの保存 @@ -30689,9 +30371,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Select Suppression File 抑制ファイルを選択 - - - ::Valgrind Valgrind options: %1 Valgrind オプション: %1 @@ -30730,16 +30409,10 @@ When a problem is detected, the application is interrupted and can be debugged.< Could not determine remote PID. リモートの PID が取得できませんでした。 - - - ::Valgrind Valgrind Settings Valgrind の設定 - - - ::Valgrind Issue 問題 @@ -30748,9 +30421,6 @@ When a problem is detected, the application is interrupted and can be debugged.< %1 in function %2 関数 %2 の %1 - - - ::Valgrind Location: パス: @@ -30759,9 +30429,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Instruction pointer: 命令ポインタ: - - - ::Valgrind Could not parse hex number from "%1" (%2) "%1" (%2) からの16進数を解析できません @@ -30814,9 +30481,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Unexpected exception caught during parsing. 解析中に予期せぬ例外を catch しました。 - - - ::Valgrind Description 説明 @@ -31102,15 +30766,7 @@ When a problem is detected, the application is interrupted and can be debugged.< - ContentWindow - - Open Link - リンクを開く - - - Open Link as New Page - リンクを新しいページで開く - + ::Help MimeType @@ -32965,7 +32621,7 @@ API バージョンが %1 以上の SDK をインストールしてください - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character 文字を削除する @@ -34477,11 +34133,7 @@ the program. - SessionActionLabel - - Clone - 複製 - + ::ProjectExplorer ::ExtensionSystem @@ -35365,9 +35017,6 @@ the program. Show Data Functions データ関数を表示する - - - ::Autotest Tests テスト @@ -35426,9 +35075,6 @@ the program. Execution took %1. 実行時間は %1 でした。 - - - ::Autotest Stop Test Run テスト実行の停止 @@ -35545,9 +35191,6 @@ the program. %2 - - - ::Autotest Test run canceled by user. テスト実行はユーザーによってキャンセルされました。 @@ -36975,7 +36618,7 @@ Do you want to check them out now? - Cvs + ::CVS Annotate revision "%1" リビジョン "%1" のアノテーション @@ -37270,9 +36913,6 @@ Setting breakpoints by file name and line number may fail. Jump to Line %1 %1 行目にジャンプ - - - ::Debugger Not recognized 不明 @@ -37450,9 +37090,6 @@ Affected are breakpoints %1 Tries to install missing debug information. 不足するデバッグ情報のインストールを試みます。 - - - ::Debugger Cannot start %1 without a project. Please open the project and try again. プロジェクト無しでは %1 を開始できません。プロジェクトを開いた後に再度試してください。 @@ -37485,9 +37122,6 @@ Affected are breakpoints %1 <html><head/><body><p>You are trying to run the tool "%1" on an application in %2 mode. The tool is designed to be used %3.</p><p>Run-time characteristics differ significantly between optimized and non-optimized binaries. Analytical findings for one mode may or may not be relevant for the other.</p><p>Running tools that need debug symbols on binaries that don't provide any may lead to missing function names or otherwise insufficient output.</p><p>Do you want to continue and run the tool in %2 mode?</p></body></html> <html><head/><body><p>%2モードのアプリケーションに対してツール "%1" を実行しようとしています。このツールは%3モードでの利用を想定しています。</p><p>バイナリが最適化済みかどうかによって実行時の特性は大きく異なります。あるモードでの解析結果が別のモードには当てはまらない場合もあります。</p><p>デバッグシンボルが含まれないバイナリに対してデバッグシンボルが必要なツールを実行する場合には関数名が取得できなかったり結果が不十分なものになることもあります。</p><p>%2モードでのツールの実行を継続しますか？</p></body></html> - - - ::Debugger Debugger Settings デバッガ設定 @@ -37508,9 +37142,6 @@ Affected are breakpoints %1 <a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a> <a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">前提条件は？</a> - - - ::Debugger %1 (Previous) %1 (直前) @@ -37535,9 +37166,6 @@ Affected are breakpoints %1 Expression too complex 複雑すぎる式 - - - QmlEngine JS Source for %1 %1 の JS ソース @@ -37546,9 +37174,6 @@ Affected are breakpoints %1 Anonymous Function 無名関数 - - - ::Debugger Terminal: Cannot open /dev/ptmx: %1 ターミナル: /dev/ptmx を開けません: %1 @@ -37577,9 +37202,6 @@ Affected are breakpoints %1 Terminal: Read failed: %1 ターミナル: 読み込みに失敗しました: %1 - - - ::Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -39139,7 +38761,7 @@ Leave empty to search through the file system. - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -39170,9 +38792,6 @@ Would you like to overwrite it? %1 は既に存在しています。 上書きしますか？ - - - ::ImageViewer Export %1 %1 のエクスポート @@ -40705,13 +40324,6 @@ Android パッケージソースディレクトリのファイルはビルドデ グリフ - - ::QtSupport - - [Inexact] - [不完全] - - ::QtSupport @@ -40725,17 +40337,6 @@ Android パッケージソースディレクトリのファイルはビルドデ ::ResourceEditor - - Prefix: - プレフィックス: - - - Language: - 言語: - - - - ResourceTopLevelNode %1 Prefix: %2 %1 プレフィックス: %2 @@ -41719,18 +41320,11 @@ Android パッケージソースディレクトリのファイルはビルドデ - GTestFramework + ::Autotest Google Tests Google Tests - - Google Test - Google Test - - - - GTestTreeItem parameterized パラメータ化 @@ -41739,9 +41333,6 @@ Android パッケージソースディレクトリのファイルはビルドデ typed 型付け - - - QtTestFramework Qt Tests Qt テスト @@ -41750,16 +41341,10 @@ Android パッケージソースディレクトリのファイルはビルドデ Qt Test Qt Test - - - QuickTestFramework Quick Tests Quick テスト - - - QuickTestTreeItem <unnamed> <無名> @@ -41768,23 +41353,14 @@ Android パッケージソースディレクトリのファイルはビルドデ <p>Give all test cases a name to ensure correct behavior when running test cases and to be able to select them.</p> <p>テストケースの実行や選択が正常に動作するようにすべてのテストケースに名前を付けてください。</p> - - - ::Autotest AutoTest Debug 自動テストのデバッグ - - - ::Autotest You will not be able to use the AutoTest plugin without having at least one active test framework. 有効なテストフレームワークが存在しないため、AutoTest プラグインを使用できません。 - - - TestTreeItem (none) (なし) @@ -42510,9 +42086,6 @@ Output: Directory ディレクトリ - - - ::Autotest Walltime 総経過時間 @@ -42558,7 +42131,7 @@ Output: - ClangFormat::ClangFormatConfigWidget + ::ClangFormat Format instead of indenting インデントの代わりにフォーマットを行う @@ -43328,9 +42901,6 @@ Output: None of the following variants could be correctly parsed: 以下のデータのいずれも正しく解析できませんでした: - - - JsonRpcMessageHandler Could not parse JSON message "%1". JSON メッセージ "%1" を解析できませんでした。 @@ -43339,9 +42909,6 @@ Output: Expected a JSON object, but got a JSON "%1". 読み込まれた JSON "%1" は JSON オブジェクトではありませんでした。 - - - ::LanguageServerProtocol No parameters in "%1". "%1" にはパラメータがありません。 @@ -43648,13 +43215,6 @@ in "%2". クリックして選択... - - AutoTest - - Testing - 自動テスト - - ::Autotest @@ -43745,27 +43305,14 @@ in "%2". Selected test was not found (%1). 選択したテストが見つかりませんでした (%1)。 - - - BoostTestFramework Boost Test Boost Test - - - ::Autotest Test execution took %1 テストの実行時間: %1 - - - BoostTestTreeItem - - parameterized - パラメータ化 - fixture フィクスチャ @@ -43774,16 +43321,6 @@ in "%2". templated テンプレ化 - - - CatchFramework - - Catch Test - Catch Test - - - - ::Autotest Executing %1 "%2" 実行中: %1 "%2" @@ -43804,41 +43341,18 @@ in "%2". Finished executing %1 "%2" %1 "%2" の実行を終了しました - - - CatchTestFramework Catch Test キャッチテスト - - - CatchTreeItem - - parameterized - パラメータ化 - - - fixture - フィクスチャ - - - - ::Autotest Running tests for %1 %1のテストを実行中 - - - CTestTool CTest CTest - - - ::Autotest Global グローバル @@ -43859,23 +43373,14 @@ in "%2". None なし - - - QtTestTreeItem inherited 継承 - - - ::Autotest Test executable crashed. テストの実行ファイルがクラッシュしました。 - - - ::Autotest Select Run Configuration 実行構成を選択する @@ -44237,19 +43742,11 @@ The name of the release build configuration created by default for a qmake proje - RunControl - - %1 crashed. - %1 がクラッシュしました。 - + ::ProjectExplorer %2 exited with code %1 %2 はコード %1 で終了しました - - Starting %1 %2... - 起動中 %1 %2... - ::BareMetal @@ -44673,9 +44170,6 @@ The name of the release build configuration created by default for a qmake proje <Select Symbol> <シンボルの選択> - - - ClangDiagnosticConfig Project: %1 (based on %2) プロジェクト: %1 (%2 を使用) @@ -44684,9 +44178,6 @@ The name of the release build configuration created by default for a qmake proje Changes applied in Projects Mode > Clang Code Model Projects Mode > Clang コードモデルで適用される変更点 - - - ::ClangCodeModel Code Model Warning コードモデルの警告 @@ -44703,9 +44194,6 @@ The name of the release build configuration created by default for a qmake proje Disable Diagnostic in Current Project 現在のプロジェクトの診断を無効化する - - - ClangUtils Could not retrieve build directory. ビルドディレクトリを取得できませんでした。 @@ -44714,9 +44202,6 @@ The name of the release build configuration created by default for a qmake proje Could not create "%1": %2 ファイル %1 を作成できませんでした: %2 - - - ::ClangCodeModel Clazy Issue Clazy の問題 @@ -44727,7 +44212,7 @@ The name of the release build configuration created by default for a qmake proje - ClangFormat::ClangFormatPlugin + ::ClangFormat Open Used .clang-format Configuration File 使用した clang-format 設定ファイルを開く @@ -44883,54 +44368,10 @@ Output: Save with Encoding 指定された文字コードで保存 - - - ExternalTool System Environment システム環境変数 - - - ::Core - - - EditorManager - - Go Back - 戻る - - - Go Forward - 進む - - - &Save - 保存(&S) - - - Save &As... - 名前を付けて保存(&A)... - - - Split - 上下に分割 - - - Split Side by Side - 左右に分割 - - - Open in New Window - 新規ウィンドウで開く - - - Close Document - ドキュメントを閉じる - - - - ::Core %1 %2%3 %1 %2%3 @@ -45177,11 +44618,7 @@ Output: - DeviceProcessesDialog - - &Attach to Process - プロセスにアタッチ(&A) - + ::ProjectExplorer ::Debugger @@ -45309,9 +44746,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Show Sections セクションを表示 - - - ::Debugger N/A N/A @@ -45473,37 +44907,6 @@ Stepping into the module or setting breakpoints by file and line is expected to 拡大率: %1% - - Imageviewer - - Ctrl+= - Ctrl+= - - - Switch Background - バックグラウンド切替 - - - Ctrl+[ - Ctrl+[ - - - Switch Outline - 外枠表示切替 - - - Ctrl+] - Ctrl+] - - - Toggle Animation - アニメーションの切替 - - - Export Image - 画像のエクスポート - - ::ImageViewer @@ -45600,17 +45003,11 @@ Stepping into the module or setting breakpoints by file and line is expected to Provisioning profile expired. Expiration date: %1 プロビジョニング・プロファイルの有効期限が切れています。有効期限: %1 - - - DevelopmentTeam Yes はい - - ::Ios - ::LanguageClient @@ -46023,11 +45420,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - RunConfigSelector - - Run Without Deployment - デプロイせずに実行 - + ::Autotest ::ProjectExplorer @@ -46075,10 +45468,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Run as root user 管理者として実行する - - %2 exited with code %1 - %2 はコード %1 で終了しました - Files ファイル @@ -47333,28 +46722,6 @@ Stepping into the module or setting breakpoints by file and line is expected to 既定 - - QmlJSHoverHandler - - Library at %1 - %1 のライブラリ - - - Dumped plugins successfully. - プラグインのダンプに成功しました。 - - - Read typeinfo files successfully. - typeinfo ファイルの読み込みに成功しました。 - - - - AddAnalysisMessageSuppressionComment - - Add a Comment to Suppress This Message - このメッセージを抑止する為のコメントを追加します - - ::QmlJSEditor @@ -47414,21 +46781,6 @@ Stepping into the module or setting breakpoints by file and line is expected to QCC - - ::QtSupport - - Device type is not supported by Qt version. - Qt がサポートしていないデバイスの種類です。 - - - The compiler "%1" (%2) cannot produce code for the Qt version "%3" (%4). - コンパイラ "%1" (%2) は、Qt バージョン "%3" (%4) 用のコードを生成できません。 - - - The compiler "%1" (%2) may not produce code compatible with the Qt version "%3" (%4). - コンパイラ "%1" (%2) は Qt バージョン "%3" (%4) と互換性のあるコードを生成しない可能性があります。 - - ::QtSupport @@ -47519,17 +46871,11 @@ Stepping into the module or setting breakpoints by file and line is expected to Path to the qmake executable qmake 実行ファイルのパス - - - ProMessageHandler [Inexact] Prefix used for output from the cumulative evaluation of project files. [不完全] - - - ::QtSupport Disables QML debugging. QML profiling will still work. QML デバッグを無効化します。QML プロファイラは利用可能です。 @@ -47549,9 +46895,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Install root: インストールルート: - - - ::RemoteLinux Command line: コマンドライン: @@ -47560,9 +46903,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Run custom remote command カスタムリモートコマンド実行 - - - ::RemoteLinux Trying to kill "%1" on remote device... リモート・デバイス上の "%1" を終了中です... @@ -47579,9 +46919,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Kill current application instance 現在のアプリケーションのインスタンスを強制終了 - - - ::RemoteLinux X11 Forwarding X11 フォワーディング @@ -47590,9 +46927,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Forward to local display ローカルディスプレイに転送する - - - ::RemoteLinux Failed to create remote directories: %1 リモート・ディレクトリの作成に失敗しました: %1 @@ -47609,9 +46943,6 @@ Stepping into the module or setting breakpoints by file and line is expected to rsync failed with exit code %1. rsync は終了コード %1 で失敗しました。 - - - ::RemoteLinux Flags: フラグ: @@ -48181,9 +47512,6 @@ Row: %4, Column: %5 Profiling %1 %1 のプロファイル中 - - - HeobDialog New 新規作成 @@ -48204,9 +47532,6 @@ Row: %4, Column: %5 %1 (copy) %1 (コピー) - - - HeobData Process %1 プロセス %1 @@ -48217,18 +47542,6 @@ Row: %4, Column: %5 Analyzing finished. 解析が終了しました。 - - Error: "%1" could not be started: %2 - エラー: "%1" を開始できませんでした: %2 - - - Error: no Valgrind executable set. - エラー: Valgrind の実行ファイルが指定されていません。 - - - Process terminated. - プロセスが終了しました。 - ::VcsBase diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 3df147e0b55..15de566f1ea 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -313,7 +313,7 @@ - Cvs + ::CVS CVS CVS @@ -1349,7 +1349,7 @@ - TopicChooser + ::Help Choose Topic Wybierz temat @@ -1376,7 +1376,7 @@ - QrcEditor + ::ResourceEditor Add Dodaj @@ -2725,7 +2725,7 @@ Kontynuować? - Cvs + ::CVS &CVS &CVS @@ -3494,9 +3494,6 @@ Kontynuować? Breakpoint will only be hit in the specified thread(s). Program przerwie działanie w pułapce tylko we wskazanych wątkach. - - - ::Debugger Startup Placeholder @@ -3542,9 +3539,6 @@ Kontynuować? Use Python dumper Używaj Python dumpera - - - ::Debugger Insert Symbol Server... Dodaj serwer z symbolami... @@ -3569,9 +3563,6 @@ Kontynuować? Configure Symbol paths that are used to locate debug symbol files. - - - ::Debugger Use Alternating Row Colors Używaj naprzemiennych kolorów wierszy @@ -3789,9 +3780,6 @@ Kontynuować? Show Address Data in Stack View when Debugging Pokazuj adresy w widoku stosu podczas debugowania - - - ::Debugger Locals && Expressions '&&' will appear as one (one is marking keyboard shortcut) @@ -3801,9 +3789,6 @@ Kontynuować? <Encoding error> <Błąd kodowania> - - - ::Debugger Load Core File Załaduj plik zrzutu @@ -3836,9 +3821,6 @@ Kontynuować? Select Startup Script Wybierz startowy skrypt - - - ::Debugger Select Start Address Wybierz adres startowy @@ -3847,9 +3829,6 @@ Kontynuować? Enter an address: Podaj adres: - - - ::Debugger Reading %1... Wczytywanie %1... @@ -4138,9 +4117,6 @@ Spróbuj: %2 Adapter crashed Adapter przerwał pracę - - - ::Debugger General Ogólne @@ -4304,9 +4280,6 @@ receives a signal like SIGSEGV during debugging. GDB GDB - - - ::Debugger Cannot create temporary file: %1 Nie można utworzyć tymczasowego pliku: %1 @@ -4319,9 +4292,6 @@ receives a signal like SIGSEGV during debugging. Cannot open FiFo %1: %2 Nie można otworzyć FiFo %1: %2 - - - ::Debugger Content as ASCII Characters Zawartość jako znaki ASCII @@ -4394,9 +4364,6 @@ receives a signal like SIGSEGV during debugging. Edit bits %1...%2 of register %3 Edytuj bity %1...%2 rejestru %3 - - - ::Debugger ... ... @@ -4533,9 +4500,6 @@ receives a signal like SIGSEGV during debugging. Note that most distributions ship debug information in separate packages. Zwróć uwagę, że niektóre dystrybucje dostarczają źródła debugowe w oddzielnych pakietach. - - - ::Debugger Thread&nbsp;id: Identyfikator&nbsp;wątku: @@ -8429,10 +8393,6 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos Remove Prefix... Usuń przedrostek... - - Remove Missing Files - Usuń brakujące pliki - Rename... Zmień nazwę... @@ -8481,9 +8441,6 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos Rename Prefix Zmień nazwę przedrostka - - - ::ResourceEditor Open With Otwórz przy pomocy @@ -9514,17 +9471,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych Zakładka - - ContentWindow - - Open Link - Otwórz odsyłacz - - - Open Link as New Page - Otwórz odsyłacz na nowej stronie - - ::Help @@ -11411,16 +11357,10 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM QMLRunConfiguration display name. QML Viewer - - - QmlManager <Current File> <Bieżący plik> - - - ::QmlProjectManager QML Viewer QML Viewer @@ -12639,9 +12579,6 @@ you will need to build a separate CDB extension with the same bitness as the CDB "Select Widget to Watch": Please stop the application first. "Wybierz widżet do obserwowania": Najpierw zatrzymaj aplikację. - - - ::Debugger Select Local Cache Folder Wybierz katalog z lokalnym cache'em @@ -12662,9 +12599,6 @@ you will need to build a separate CDB extension with the same bitness as the CDB Cannot Create Nie można utworzyć - - - ::Debugger Clear Contents Wyczyść zawartość @@ -12677,16 +12611,10 @@ you will need to build a separate CDB extension with the same bitness as the CDB Reload Debugging Helpers Przeładuj programy pomocnicze debuggera - - - ::Debugger Type Ctrl-<Return> to execute a line. Naciśnij Ctrl-<Return> aby wykonać linię. - - - ::Debugger Debugger &Log &Log debuggera @@ -12713,9 +12641,6 @@ Możesz zostać poproszony o podzielenie się zawartością tego loga podczas tw Log File Plik logu - - - ::Debugger Internal Name Wewnętrzna nazwa @@ -13851,9 +13776,6 @@ Local pulls are not applied to the master branch. %1 in function %2 %1 w funkcji %2 - - - ::Valgrind Location: Położenie: @@ -13862,9 +13784,6 @@ Local pulls are not applied to the master branch. Instruction pointer: Wskaźnik do instrukcji: - - - ::Valgrind Could not parse hex number from "%1" (%2) Błąd parsowania liczby szesnastkowej z "%1" (%2) @@ -13917,9 +13836,6 @@ Local pulls are not applied to the master branch. Unexpected exception caught during parsing. Złapano nieoczekiwany wyjątek podczas parsowania. - - - ::Valgrind Description Opis @@ -14407,9 +14323,6 @@ do systemu kontroli wersji (%2) &Connection: &Połączenie: - - - ::Debugger No function selected. Nie wybrano żadnej funkcji. @@ -14819,9 +14732,6 @@ Qt Creator nie może się do niego podłączyć. Threads: Wątki: - - - ::Debugger <new source> <nowe źródło> @@ -14878,9 +14788,6 @@ Qt Creator nie może się do niego podłączyć. Qt Sources Źródła Qt - - - ::Debugger Memory at Register "%1" (0x%2) Pamięć pod rejestrem "%1" (0x%2) @@ -14893,9 +14800,6 @@ Qt Creator nie może się do niego podłączyć. Memory at 0x%1 Pamięć w 0x%1 - - - ::Debugger C++ debugger activated Uaktywniono debugger C++ @@ -14904,9 +14808,6 @@ Qt Creator nie może się do niego podłączyć. QML debugger activated Uaktywniono debugger QML - - - ::Debugger No application output received in time Nie otrzymano o czasie żadnego wyjściowego komunikatu aplikacji @@ -14985,13 +14886,6 @@ Ponowić próbę? Pomiń datę - - ::GLSLEditor - - GLSL - GLSL - - ::Macros @@ -15657,9 +15551,6 @@ if (a && Edit Modyfikuj - - - ::QtSupport Remove Usuń @@ -15691,9 +15582,6 @@ if (a && Save Suppression Zachowaj tłumienie - - - ::Valgrind Generic Settings Ustawienia ogólne @@ -16292,9 +16180,6 @@ With cache simulation, further event counters are enabled: Calls Wywołania - - - ::Valgrind Previous command has not yet finished. Poprzednia komenda jeszcze się nie zakończyła. @@ -16327,9 +16212,6 @@ With cache simulation, further event counters are enabled: Callgrind unpaused. Callgrind wznowił pracę. - - - ::Valgrind Function: Funkcja: @@ -16398,9 +16280,6 @@ With cache simulation, further event counters are enabled: Incl. Cost: %1 Łączny koszt: %1 - - - ::Valgrind %1 in %2 %1 w %2 @@ -16409,9 +16288,6 @@ With cache simulation, further event counters are enabled: %1:%2 in %3 %1: %2 w %3 - - - ::Valgrind Last-level Ostatni poziom @@ -16783,7 +16659,7 @@ Do you want to save the data first? - BaseQtVersion + ::QtSupport Device type is not supported by Qt version. Typ urządzenia nie jest obsługiwany przez wersję Qt. @@ -16848,9 +16724,6 @@ Do you want to save the data first? This Qt Version does not contain Qt Quick Compiler. Ta wersja Qt nie zawiera kompilatora Qt Quick. - - - ::QtSupport <specify a name> <Podaj nazwę> @@ -16966,9 +16839,6 @@ Do you want to save the data first? All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Wszystkie funkcje ze współczynnikiem łącznego kosztu wyższym niż %1 (ilość ukrytych: %2) - - - ::Valgrind %1%2 %1%2 @@ -16977,16 +16847,10 @@ Do you want to save the data first? in %1 w %1 - - - ::Valgrind Suppress Error Wytłum błąd - - - ::Valgrind External Errors Błędy zewnętrzne @@ -17231,9 +17095,6 @@ Kiedy zostaje wykryty problem, aplikacja jest zatrzymywana i może zostać zdebu New Generic Linux Device Configuration Setup Nowa konfiguracja ogólnego urządzenia linuksowego - - - ::RemoteLinux Connection Połączenie @@ -17242,9 +17103,6 @@ Kiedy zostaje wykryty problem, aplikacja jest zatrzymywana i może zostać zdebu Choose a Private Key File Wybierz plik z kluczem prywatnym - - - ::RemoteLinux Summary Podsumowanie @@ -17255,9 +17113,6 @@ In addition, device connectivity will be tested. Zostanie teraz utworzona nowa konfiguracja urządzenia. Dodatkowo, przetestowane zostanie połączenie z urządzeniem. - - - ::RemoteLinux Choose Public Key File Wybierz plik z kluczem publicznym @@ -17278,9 +17133,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Close Zamknij - - - ::RemoteLinux Executable on host: Plik wykonywalny na hoście: @@ -17317,9 +17169,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Remote path not set Nie ustawiono zdalnej ścieżki - - - ::RemoteLinux Package modified files only Upakuj tylko zmodyfikowane pliki @@ -17332,9 +17181,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Create tarball: Utwórz tarball: - - - ::RemoteLinux (on Remote Generic Linux Host) (na zdalnym hoście linuksowym) @@ -17651,9 +17497,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Connection error: %1 Błąd połączenia: %1 - - - ::RemoteLinux Cannot deploy: %1 Nie można zainstalować: %1 @@ -17670,9 +17513,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Deploy step finished. Zakończono krok instalacji. - - - ::RemoteLinux Successfully uploaded package file. Przesłano poprawnie plik pakietu. @@ -17685,9 +17525,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Package installed. Zainstalowano pakiet. - - - ::RemoteLinux SFTP initialization failed: %1 Błąd inicjalizacji SFTP: %1 @@ -17724,9 +17561,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. All files successfully deployed. Wszystkie pliki poprawnie zainstalowane. - - - ::RemoteLinux Incremental deployment Instalacja przyrostowa @@ -17739,23 +17573,14 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Command line: Linia komend: - - - ::RemoteLinux Upload files via SFTP Prześlij pliki przez SFTP - - - ::RemoteLinux Generic Linux Device Ogólne urządzenie linuksowe - - - ::RemoteLinux Connecting to host... Łączenie z hostem... @@ -17792,9 +17617,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Checking if specified ports are available... Sprawdzanie czy podane porty są dostępne... - - - ::RemoteLinux Preparing SFTP connection... Przygotowywanie połączenia SFTP... @@ -17815,16 +17637,10 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Failed to upload package: %2 Nie można przesłać pakietu: %2 - - - ::RemoteLinux Run custom remote command Uruchom własną zdalną komendę - - - ::RemoteLinux No command line given. Nie podano linii komendy. @@ -17849,16 +17665,10 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Remote command finished successfully. Zdalna komenda poprawnie zakończona. - - - ::RemoteLinux Deploy to Remote Linux Host Zainstaluj na zdalnym hoście linuksowym - - - ::RemoteLinux Error: No device Błąd: brak urządzenia @@ -17879,9 +17689,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Remote stderr was: "%1" Zawartość zdalnego stderr: "%1" - - - ::RemoteLinux Connection failure: %1 Błąd połączenia: %1 @@ -17890,9 +17697,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Installing package failed. Błąd instalowania pakietu. - - - ::RemoteLinux Public key error: %1 Błąd klucza publicznego: %1 @@ -17905,9 +17709,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Key deployment failed: %1. Błąd instalacji klucza: %1. - - - ::RemoteLinux Packaging finished successfully. Pakowanie poprawnie zakończone. @@ -17956,16 +17757,10 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Create tarball Utwórz tarball - - - ::RemoteLinux %1 (default) %1 (domyślnie) - - - ::RemoteLinux No tarball creation step found. Brak kroku tworzenia tarballa. @@ -18984,9 +18779,6 @@ Przedrostki te, w dodatku do nazwy bieżącego pliku, używane są do przełącz Key via ssh-agent Poprzez ssh-agenta - - - ::RemoteLinux WizardPage StronaKreatora @@ -20391,9 +20183,6 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Misc Types Inne typy - - - ::Debugger Attaching to process %1. Dołączanie do procesu %1. @@ -20450,9 +20239,6 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Continuing nevertheless. Mimo to praca jest kontynuowana. - - - ::Debugger The upload process failed to start. Shell missing? Nie można rozpocząć procesu przesyłania. Brak powłoki? @@ -20513,9 +20299,6 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Interrupting not possible Przerwanie nie jest możliwe - - - ::Debugger Remote Error Zdalny błąd @@ -20592,9 +20375,6 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.End Address Adres końcowy - - - ::Debugger Success: Zakończono poprawnie: @@ -20615,16 +20395,10 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Remove Snapshot Usuń zrzut - - - ::Debugger Stack Stos - - - ::Debugger Locals and Expressions Zmienne lokalne i wyrażenia @@ -21328,9 +21102,6 @@ poinstruuje Qt Creatora o URI. Tags: Tagi: - - - ::QtSupport Qt Versions Wersje Qt @@ -21350,9 +21121,6 @@ poinstruuje Qt Creatora o URI. Deploy Public Key... Zainstaluj klucz publiczny... - - - ::RemoteLinux Remote process crashed. Zdalny proces przerwał pracę. @@ -21381,23 +21149,14 @@ poinstruuje Qt Creatora o URI. Zdalny system plików ma %n megabajtów wolnego miejsca, wznowiono pracę. - - - ::RemoteLinux MB MB - - - ::RemoteLinux Check for free disk space Sprawdź ilość wolnego miejsca na dysku - - - ::RemoteLinux Cannot debug: Local executable is not set. Nie można debugować: brak ustawionego lokalnego pliku wykonywalnego. @@ -21453,9 +21212,6 @@ poinstruuje Qt Creatora o URI. Could not copy the file to %1. Nie można skopiować pliku do %1. - - - ::ResourceEditor Open File Otwórz plik @@ -22178,9 +21934,6 @@ You can choose another communication channel here, such as a serial line or cust Debugger: Debugger: - - - ::Debugger No debugger set up. Brak ustawionego debuggera. @@ -22453,9 +22206,6 @@ You can choose another communication channel here, such as a serial line or cust %1 (invalid) %1 (niepoprawna) - - - ::QtSupport Qt version Wersja Qt @@ -23929,7 +23679,7 @@ Więcej informacji w dokumentacji "Checking Code Syntax". - Cvs + ::CVS &Edit &Edycja @@ -23949,23 +23699,14 @@ Więcej informacji w dokumentacji "Checking Code Syntax".Source Paths Ścieżki ze źródłami - - - ::Debugger CDB Paths Ścieżki CDB - - - ::Debugger Debugger settings Ustawienia debuggera - - - ::Debugger GDB Extended Rozszerzony GDB @@ -24980,9 +24721,6 @@ Zdalny: %4 Full path to the target bin directory of the current project's Qt version.<br>You probably want %1 instead. Pełna ścieżka docelowego podkatalogu "bin" w katalogu instalacji bieżącej wersji Qt. Prawdopodobnie powinno być: %1. - - - ::QtSupport No factory found for qmake: "%1" Brak fabryki dla qmake: "%1" @@ -24998,9 +24736,6 @@ Zdalny: %4 System Environment Środowisko systemowe - - - ::RemoteLinux Fetch Device Environment Pobierz środowisko urządzenia @@ -26004,9 +25739,6 @@ Czy odinstalować istniejący pakiet? Label text for path configuration. %2 is "x-bit version". <html><body><p>Podaj ścieżkę do <a href="%1">pliku wykonywalnego Windows Console Debugger</a> (%2).</p></body></html> - - - ::Debugger Starting executable failed: Nie można uruchomić programu: @@ -26651,9 +26383,6 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani Valgrind Valgrind - - - ::Valgrind Valgrind Settings Ustawienia Valgrinda @@ -28957,7 +28686,7 @@ Do you want to check them out now? - Cvs + ::CVS Annotate revision "%1" Dołącz adnotację do wersji "%1" @@ -28997,9 +28726,6 @@ Do you want to check them out now? Display string length: Wyświetlaj długości ciągów tekstowych: - - - ::Debugger Debug Debug @@ -29131,9 +28857,6 @@ Dotyczy to następujących pułapek: %1 Tries to install missing debug information. Próbuje zainstalować brakujące informacje debugowe. - - - ::Debugger %1 (Previous) %1 (poprzedni) @@ -30165,7 +29888,7 @@ Use this only if you are prototyping. You cannot create a full application with - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character Usuń znak @@ -30571,7 +30294,7 @@ Use this only if you are prototyping. You cannot create a full application with - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -31382,14 +31105,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan ::ResourceEditor - - Prefix: - Przedrostek: - - - Language: - Język: - ::Subversion @@ -32135,9 +31850,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Attempting to interrupt. Próba przerwania. - - - ::Debugger No Memory Viewer Available Brak dostępnej przeglądarki pamięci @@ -32298,9 +32010,6 @@ Ustawianie pułapek w liniach plików może się nie udać. Jump to Line %1 Skocz do linii %1 - - - ::Debugger Clone Sklonuj @@ -32325,9 +32034,6 @@ Ustawianie pułapek w liniach plików może się nie udać. Debuggers Debuggery - - - ::Debugger Debugger Settings Ustawienia debuggera @@ -32352,9 +32058,6 @@ Ustawianie pułapek w liniach plików może się nie udać. Enable Debugging of Subprocesses Odblokuj debugowanie podprocesów - - - ::Debugger Terminal: Cannot open /dev/ptmx: %1 Terminal: Nie można otworzyć /dev/ptmx: %1 @@ -32607,7 +32310,7 @@ Ustawianie pułapek w liniach plików może się nie udać. - ResourceTopLevelNode + ::ResourceEditor %1 Prefix: %2 %1 Przedrostek: %2 @@ -33186,11 +32889,7 @@ Ustawianie pułapek w liniach plików może się nie udać. - QmlEngine - - JS Source for %1 - Źródło JS dla %1 - + ::Debugger Anonymous Function Anonimowa funkcja @@ -34801,9 +34500,6 @@ Te pliki są zabezpieczone. Alt+Shift+T,Alt+S Alt+Shift+T,Alt+S - - - ::Autotest AutoTest Plugin WARNING: No files left after filtering test scan folders. Check test filter settings. Ostrzeżenie wtyczki AutoTest: Brak plików po przeskanowaniu przefiltrowanych katalogów z testami. Sprawdź ustawienia filtra testów. @@ -34812,9 +34508,6 @@ Te pliki są zabezpieczone. Scanning for Tests Odświeżanie zbioru testów - - - ::Autotest Tests Testy @@ -34871,9 +34564,6 @@ Te pliki są zabezpieczone. Show Data Functions Pokaż funkcje z danymi - - - ::Autotest %1 %2 per iteration (total: %3, iterations: %4) %1 %2 na iterację (w sumie: %3, ilość iteracji: %4) @@ -34918,9 +34608,6 @@ Te pliki są zabezpieczone. Test execution took %1 ms. Wykonanie testu zajęło %1 ms. - - - ::Autotest (iteration %1) (iteracja %1) @@ -35070,9 +34757,6 @@ Te pliki są zabezpieczone. %2 - - - ::Autotest Test run canceled by user. Wykonywanie testów anulowane przez użytkownika. @@ -35622,16 +35306,10 @@ Ustaw prawdziwy plik wykonywalny Clang. Use Global Settings Użyj globalnych ustawień - - - ::Debugger Copy Skopiuj - - - ::Debugger Start Remote Analysis Rozpocznij zdalną analizę @@ -35652,9 +35330,6 @@ Ustaw prawdziwy plik wykonywalny Clang. Working directory: Katalog roboczy: - - - ::Debugger Show debug, log, and info messages. Pokazuj komunikaty debugowe, log i informacje. @@ -35675,9 +35350,6 @@ Ustaw prawdziwy plik wykonywalny Clang. Debugger Console Konsola debuggera - - - ::Debugger &Copy S&kopiuj @@ -35775,9 +35447,6 @@ Would you like to overwrite it? %1 już istnieje. Czy nadpisać go? - - - ::ImageViewer Export %1 Wyeksportuj %1 @@ -36388,14 +36057,11 @@ po naciśnięciu klawisza backspace - GTestFramework + ::Autotest Google Test Google Test - - - GTestTreeItem parameterized sparametryzowany @@ -36404,23 +36070,14 @@ po naciśnięciu klawisza backspace typed - - - QtTestFramework Qt Test Qt Test - - - QuickTestFramework Quick Tests Testy Quick - - - QuickTestTreeItem <unnamed> <nienazwany> @@ -36429,16 +36086,10 @@ po naciśnięciu klawisza backspace <p>Give all test cases a name to ensure correct behavior when running test cases and to be able to select them.</p> <p>Nadanie nazw wszystkim wariantom testu zapewnia poprawne zachowanie podczas wykonywania wariantów testu i daje możliwość wyboru poszczególnych z nich.</p> - - - ::Autotest AutoTest Debug - - - ::Autotest No active test frameworks. Brak aktywnych frameworków testowych. @@ -36463,9 +36114,6 @@ po naciśnięciu klawisza backspace <p>Specify a filter expression that will replace "%1".<br/>Wildcards are not supported.</p> <p>Podaj wyrażenie określające filtr, który zastąpi "%1".<br/>Brak obsługi symboli wieloznacznych.</p> - - - TestTreeItem %1 (none) %1 (brak) @@ -37080,9 +36728,6 @@ w ścieżce. Shuffles tests automatically on every iteration by the given seed. Automatycznie miesza testy przy każdej iteracji na podstawie podanego ziarna. - - - ::Autotest Form Formularz @@ -37454,7 +37099,7 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc - AutoTest + ::Autotest Test Settings Ustawienia testu @@ -37594,11 +37239,7 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc - Debuggger::Internal::ModulesHandler - - Unknown - Nieznany - + ::Debugger No Nie @@ -37607,10 +37248,6 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc Yes Tak - - None - Brak - Plain Zwykłe @@ -39015,7 +38652,7 @@ Błąd: %2 - QtTestTreeItem + ::Autotest inherited dziedziczony @@ -39105,16 +38742,12 @@ Błąd: %2 - CMakeBuildConfigurationFactory + ::CMakeProjectManager Default The name of the build configuration created by default for a cmake project. Domyślna - - Build - Wersja - Debug Debug @@ -39131,23 +38764,14 @@ Błąd: %2 Release with Debug Information Wersja z informacją debugową - - - ::CMakeProjectManager Failed to open %1 for reading. Błąd otwierania %1 do odczytu. - - - CMakeFilesProjectNode CMake Modules Moduły CMake - - - CMakeTargetNode Target type: Typ docelowy: @@ -39160,9 +38784,6 @@ Błąd: %2 Build artifacts:<br> - - - ::CMakeProjectManager CMake SnippetProvider @@ -39371,7 +38992,7 @@ Błąd: %2 - Cvs + ::CVS Ignore Whitespace Ignoruj białe znaki @@ -39403,9 +39024,6 @@ Błąd: %2 Manual Ustawione ręcznie - - - ::Debugger Auto-detected CDB at %1 Automatycznie wykryty CDB w %1 @@ -39428,7 +39046,7 @@ Błąd: %2 - DevelopmentTeam + ::Ios %1 - Free Provisioning Team : %2 @@ -40001,14 +39619,11 @@ Błąd: %5 - BreakHandler + ::Debugger Breakpoint Pułapka - - - ::Debugger No executable specified. Nie podano pliku wykonywalnego. @@ -40041,9 +39656,6 @@ Błąd: %5 Debugged executable Debugowany program - - - ::Debugger Checking available ports... Sprawdzanie dostępnych portów... @@ -40200,7 +39812,7 @@ Błąd: %5 - QmlJSHoverHandler + ::QmlJSEditor Library at %1 Biblioteka w %1 @@ -40224,9 +39836,6 @@ Błąd: %5 Created fifo: %1 Utworzono fifo: %1 - - - ::RemoteLinux FIFO for profiling data could not be created. Nie można utworzyć FIFO dla danych profilowania. @@ -40249,16 +39858,10 @@ Błąd: %5 Profiling %1 Profilowanie %1 - - - ::Valgrind Analyzing Memory Analiza pamięci - - - ::Valgrind Valgrind options: %1 Opcje valgrinda: %1 @@ -40287,9 +39890,6 @@ Błąd: %5 Process terminated. Zakończono proces. - - - ::Valgrind XmlServer on %1: XmlServer na %1: diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 9859d9542e8..62abd7775ee 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -191,7 +191,7 @@ - AddAnalysisMessageSuppressionComment + ::QmlJSEditor Add a Comment to Suppress This Message Добавьте комментарий для подавления этого сообщения @@ -2381,14 +2381,11 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen(). - AutoTest + ::Autotest Testing Тестирование - - - ::Autotest &Run Test Under Cursor &Запустить тест под курсором @@ -2397,13 +2394,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen(). &Debug Test Under Cursor &Отладить тест под курсором - - - ::Autotest - - Testing - Тестирование - &Tests &Тесты @@ -2472,9 +2462,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen(). Selected test was not found (%1). Не удалось найти выбранный тест (%1). - - - ::Autotest Test suite execution took %1 Выполнение набора тестов заняло %1 @@ -2519,9 +2506,6 @@ Executable: %2 Running tests without output. Тестирование выполнялось без вывода. - - - ::Autotest Executing %1 "%2" Выполнение %1 «%2» @@ -2542,9 +2526,6 @@ Executable: %2 Finished executing %1 "%2" Завершено выполнение %1 «%2» - - - ::Autotest Running tests failed. %1 @@ -2577,9 +2558,6 @@ Executable: %2 Execution took %1. Выполнение заняло %1. - - - ::Autotest Break on failure while debugging Останавливаться при ошибках @@ -2658,9 +2636,6 @@ See Google Test documentation for further information on GTest filters. Задайте фильтр GTest для группировки. Информацию о GTest фильтрах смотрите в документации Google Test. - - - ::Autotest Global Общие @@ -2689,9 +2664,6 @@ See Google Test documentation for further information on GTest filters. Selected Выбранных - - - ::Autotest %1 %2 per iteration (total: %3, iterations: %4) %1 %2 за итерацию (всего: %3, итераций: %4) @@ -2740,9 +2712,6 @@ See Google Test documentation for further information on GTest filters. Test execution took %1 ms. Выполнение теста заняло %1 мс. - - - ::Autotest Enables interrupting tests on assertions. Включение прерывания тестов на утверждениях. @@ -2819,9 +2788,6 @@ Warning: Plain text misses some information, such as duration. Предупреждение: простой текст не содержит некоторую информацию, например, длительность. - - - ::Autotest Select Run Configuration Выбор конфигурации запуска @@ -2850,16 +2816,10 @@ Warning: Plain text misses some information, such as duration. Working Directory: Рабочий каталог: - - - ::Autotest Scanning for Tests Поиск тестов - - - ::Autotest Run Without Deployment Запустить без развёртывания @@ -2904,16 +2864,10 @@ Warning: Plain text misses some information, such as duration. Show Data Functions Показывать функции Data - - - ::Autotest Tests Тесты - - - ::Autotest Expand All Развернуть всё @@ -3046,16 +3000,10 @@ Warning: Plain text misses some information, such as duration. %2 - - - ::Autotest AutoTest Debug Отладка автотеста - - - ::Autotest Test run canceled by user. Тест прерван пользователем. @@ -3162,9 +3110,6 @@ This might cause trouble during execution. Build failed. Canceling test run. Сборка не удалась. Выполнение теста отменяется. - - - ::Autotest General Основное @@ -3291,9 +3236,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Runs chosen tests automatically if a build succeeded. Автоматически запускать выбранные тесты после успешной сборки. - - - ::Autotest No active test frameworks. Нет активных сред тестирования. @@ -3310,9 +3252,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Enable or disable grouping of test cases by folder. Включение/отключение объединения тестов по каталогам. - - - ::Autotest Test executable crashed. Сбой программы тестирования. @@ -4070,7 +4009,7 @@ Warning: this is an experimental feature and might lead to failing to execute th - BaseQtVersion + ::QtSupport Name: Название: @@ -5173,14 +5112,11 @@ For example, "Revision: 15" will leave the branch at revision 15. - BoostTestFramework + ::Autotest Boost Test Тест Boost - - - BoostTestTreeItem parameterized параметрический @@ -5273,7 +5209,7 @@ For example, "Revision: 15" will leave the branch at revision 15. - BreakHandler + ::Debugger Breakpoint Точка останова @@ -5381,14 +5317,11 @@ For example, "Revision: 15" will leave the branch at revision 15. - CMakeFilesProjectNode + ::CMakeProjectManager CMake Modules Модули CMake - - - ::CMakeProjectManager Current CMake: %1 Текущий CMake: %1 @@ -6094,9 +6027,6 @@ For example, "Revision: 15" will leave the branch at revision 15.<Headers> <Заголовки> - - - CMakeTargetNode Target type: Тип цели: @@ -6137,14 +6067,7 @@ For example, "Revision: 15" will leave the branch at revision 15. - CatchFramework - - Catch Test - Тест Catch - - - - CatchTestFramework + ::Autotest Catch Test Тест Catch @@ -6251,15 +6174,7 @@ For example, "Revision: 15" will leave the branch at revision 15. - CatchTreeItem - - parameterized - параметрический - - - fixture - фиксированный - + ::Autotest ::Tracing @@ -6408,9 +6323,6 @@ However, using the relaxed and extended rules means also that no highlighting/co Display name Clang - - - ClangDiagnosticConfig Project: %1 (based on %2) Проект: %1 (на основе %2) @@ -6455,7 +6367,7 @@ However, using the relaxed and extended rules means also that no highlighting/co - ClangFormat::ClangFormatConfigWidget + ::ClangFormat Apply Применить @@ -6492,9 +6404,6 @@ However, using the relaxed and extended rules means also that no highlighting/co Fallback configuration Запасная конфигурация - - - ClangFormat::ClangFormatPlugin Open Used .clang-format Configuration File Открыть использованный файл настроек .clang-format @@ -7116,7 +7025,7 @@ Set a valid executable first. - ClangUtils + ::ClangCodeModel Could not retrieve build directory. Не удалось получить каталог сборки. @@ -8023,7 +7932,7 @@ p, li { white-space: pre-wrap; } - ContentWindow + ::Help Open Link Открыть ссылку @@ -12333,7 +12242,7 @@ Do you want to display them anyway? - Cvs + ::CVS Annotate revision "%1" Аннотация ревизии «%1» @@ -12709,10 +12618,6 @@ Do you want to display them anyway? Could not determine debugger type Не удалось определить тип отладчика - - Unknown - Неизвестный - Name: Название: @@ -12759,9 +12664,6 @@ Do you want to display them anyway? Auto-detected uVision at %1 Обнаруженный uVision в %1 - - - ::Debugger Type of Debugger Backend Тип отладчика @@ -12830,9 +12732,6 @@ Do you want to display them anyway? %1 using "%2" %1 (%2) - - - ::Debugger Clone Копировать @@ -12869,9 +12768,6 @@ Do you want to display them anyway? Debuggers Отладчики - - - ::Debugger Debugger settings Настройки отладчика @@ -12896,9 +12792,6 @@ Do you want to display them anyway? Additional startup commands: Дополнительные команды запуска: - - - ::Debugger Unpacking core file to %1 Распаковка файла дампа в %1 @@ -12947,16 +12840,10 @@ Do you want to display them anyway? Debugged executable Отлаживаемая программа - - - ::Debugger Copy Копировать - - - ::Debugger Select Start Address Выбор начального адреса @@ -13013,9 +12900,6 @@ Do you want to display them anyway? &Port: &Порт: - - - ::Debugger Marker File: Отмеченный файл: @@ -13280,10 +13164,6 @@ Do you want to display them anyway? Breakpoint Type: Тип точки останова: - - Breakpoint - Точка останова - Internal ID: Внутренний ID: @@ -13420,9 +13300,6 @@ Do you want to display them anyway? Breakpoint will only be hit in the specified thread(s). Точка останова сработает только в указанных потоках. - - - ::Debugger Debuggee Отлаживаемая программа @@ -13479,9 +13356,6 @@ Do you want to display them anyway? Are you sure you want to remove all breakpoints from all files in the current session? Удалить все точки останова из всех файлов текущей сессии? - - - ::Debugger Select Local Cache Folder Выбор каталога локального кэша @@ -13502,9 +13376,6 @@ Do you want to display them anyway? Cannot Create Невозможно создать - - - ::Debugger C++ exception Исключение C++ @@ -13529,9 +13400,6 @@ Do you want to display them anyway? Output: Вывод: - - - ::Debugger Failed to Start the Debugger Не удалось запустить отладчик @@ -13584,9 +13452,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne Value 0 obtained from evaluating the condition of breakpoint %1, continuing. При вычисление условия точки останова %1 получено значение 0, продолжаем. - - - ::Debugger Break on: Остановка на: @@ -13648,9 +13513,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne Second chance exceptions Неперехваченные исключения - - - ::Debugger Symbol Paths Пути к символам @@ -13663,9 +13525,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne CDB Paths Пути CDB - - - ::Debugger Insert Symbol Server... Вставить сервер символов... @@ -13690,9 +13549,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne Configure Symbol paths that are used to locate debug symbol files. Настройка путей, используемых для поиска файлов отладочных символов. - - - ::Debugger Behavior Поведение @@ -13793,9 +13649,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne Always adds a breakpoint on the <i>%1()</i> function. Всегда устанавливать точку останова на функцию <i>%1()</i>. - - - ::Debugger Show debug, log, and info messages. Показывать сообщения уровней: отладка, журнал и информация. @@ -13816,9 +13669,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne QML Debugger Console Консоль отладчика QML - - - ::Debugger &Copy &Копировать @@ -13831,9 +13681,6 @@ If you build %2 from sources and want to use a CDB executable with another bitne C&lear &Очистить - - - ::Debugger Loading finished. Загрузка завершена. @@ -14059,9 +13906,6 @@ Setting breakpoints by file name and line number may fail. Jump to Line %1 Перейти к строке %1 - - - ::Debugger Continue %1 Продолжить %1 @@ -14154,9 +13998,6 @@ Setting breakpoints by file name and line number may fail. This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session. Эта возможность очень медленная и нестабильная на стороне GDB. Приводит к непредсказуемым результатам при обратном переходе через системный вызов и может разрушить сессию отладки. - - - ::Debugger Clear Contents Очистить содержимое @@ -14169,9 +14010,6 @@ Setting breakpoints by file name and line number may fail. Reload Debugging Helpers Перезагрузить помощники отладчика - - - ::Debugger Show %1 Column Показать столбец %1 @@ -14264,9 +14102,6 @@ Affected are breakpoints %1 Not enough free ports for QML debugging. Недостаточно свободных портов для отладки QML. - - - ::Debugger Continue Продолжить @@ -14627,9 +14462,6 @@ Affected are breakpoints %1 Show Application on Top Показывать приложение поверх всех - - - ::Debugger Use Alternating Row Colors Использовать чередующиеся цвета строк @@ -14826,9 +14658,6 @@ Affected are breakpoints %1 Use Tooltips in Breakpoints View when Debugging Подсказки в обзоре точек останова при отладке - - - ::Debugger <new source> <новый путь к исходникам> @@ -14889,9 +14718,6 @@ Affected are breakpoints %1 Qt Sources Исходники Qt - - - ::Debugger %1 (Previous) %1 (предыдущее) @@ -14933,9 +14759,6 @@ Affected are breakpoints %1 Abort Debugger Прервать отладку - - - ::Debugger Reading %1... Чтение %1... @@ -15286,9 +15109,6 @@ You can choose between waiting longer or aborting debugging. Setting breakpoints... Установка точек останова... - - - ::Debugger General Основное @@ -15456,23 +15276,14 @@ In this case, the value should be increased. <html><head/><body>Keeps debugging all children after a fork.</body></html> <html><head/><body>Продолжать отладку всех потомков после выполнения fork.</body></html> - - - ::Debugger Global Debugger &Log Общий &журнал отладки - - - ::Debugger Type Ctrl-<Return> to execute a line. Нажмите Ctrl-<Ввод> для выполнения строки. - - - ::Debugger Adapter start failed. Не удалось запустить адаптер. @@ -15513,9 +15324,6 @@ In this case, the value should be increased. An error occurred when attempting to read from the Lldb process. For example, the process may not be running. Ошибка при получении данных от процесса Lldb. Например, процесс уже перестал работать. - - - ::Debugger Upload failed: %1 Не удалось выгрузить: %1 @@ -15548,9 +15356,6 @@ In this case, the value should be increased. Error Ошибка - - - ::Debugger Use Debugging Helper Использовать помощник отладчика @@ -15587,9 +15392,6 @@ In this case, the value should be increased. Display string length: Длина отображаемых строк: - - - ::Debugger Debugger &Log &Журнал отладки @@ -15616,9 +15418,6 @@ You may be asked to share the contents of this log when reporting bugs related t Log File Файл журнала - - - ::Debugger Memory at Register "%1" (0x%2) Память по регистру «%1» (0x%2) @@ -15631,9 +15430,6 @@ You may be asked to share the contents of this log when reporting bugs related t Memory at 0x%1 Память с 0x%1 - - - ::Debugger Module Name Название модуля @@ -15658,9 +15454,6 @@ You may be asked to share the contents of this log when reporting bugs related t End Address Конечный адрес - - - ::Debugger Cannot create temporary file: %1 Не удалось создать временный файл: %1 @@ -15673,9 +15466,6 @@ You may be asked to share the contents of this log when reporting bugs related t Cannot open FiFo %1: %2 Не удалось открыть FiFo %1: %2 - - - ::Debugger Running requested... Потребовано выполнение... @@ -15716,9 +15506,6 @@ You may be asked to share the contents of this log when reporting bugs related t An unknown error in the Pdb process occurred. У процесса Pdb возникла неопознанная ошибка. - - - ::Debugger RO RO @@ -15751,9 +15538,6 @@ You may be asked to share the contents of this log when reporting bugs related t Format Формат - - - ::Debugger No application output received in time Вывод приложения не получен вовремя @@ -15804,9 +15588,6 @@ Do you want to retry? QML Debugger: Connection failed. QML Debugger: сбой соединения. - - - ::Debugger Success: Успешно: @@ -15819,9 +15600,6 @@ Do you want to retry? Properties Свойства - - - ::Debugger Content as ASCII Characters В виде ASCII символов @@ -15886,16 +15664,10 @@ Do you want to retry? Edit bits %1...%2 of register %3 Изменение битов %1...%2 регистра %3 - - - ::Debugger Download of remote file succeeded. Загрузка внешнего файла успешно завершена. - - - ::Debugger Internal Name Внутреннее имя @@ -15916,9 +15688,6 @@ Do you want to retry? Open File "%1" Открыть файл «%1» - - - ::Debugger ... ... @@ -16043,9 +15812,6 @@ Do you want to retry? Note that most distributions ship debug information in separate packages. Большинство дистрибутивов поставляют отладочную информацию в отдельных пакетах. - - - ::Debugger Start Debugger Запуск отладчика @@ -16161,9 +15927,6 @@ You can choose another communication channel here, such as a serial line or cust &Recent: &Недавние: - - - ::Debugger <html><body><p>The remote CDB needs to load the matching %1 CDB extension (<code>%2</code> or <code>%3</code>, respectively).</p><p>Copy it onto the remote machine and set the environment variable <code>%4</code> to point to its folder.</p><p>Launch the remote CDB as <code>%5 &lt;executable&gt;</code> to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p><pre>%6</pre></body></html> <html><body><p>Удалённый CDB должен загрузить подходящее %1 расширение (<code>%2</code> или <code>%3</code>, соответственно).</p><p>Скопируйте его на удалённую машину и задайте переменной среды <code>%4</code> путь к каталогу с расширением.</p><p>Запустите удалённых CDB так: <code>%5 &lt;программа&gt;</code> при использовании протокола TCP/IP.</p><p>Введите следующие параметры соединения:</p><pre>%6</pre></body></html> @@ -16176,9 +15939,6 @@ You can choose another communication channel here, such as a serial line or cust &Connection: &Подключение: - - - ::Debugger Start Remote Engine Запустить внешний отладчик @@ -16203,9 +15963,6 @@ You can choose another communication channel here, such as a serial line or cust &Inferior path: Путь к п&рограмме: - - - ::Debugger Use Local Symbol Cache Использовать локальный кэш символов @@ -16222,9 +15979,6 @@ You can choose another communication channel here, such as a serial line or cust Set up Symbol Paths Задание путей к символам - - - ::Debugger Terminal: Cannot open /dev/ptmx: %1 Терминал: не удалось открыть /dev/ptmx: %1 @@ -16253,9 +16007,6 @@ You can choose another communication channel here, such as a serial line or cust Terminal: Read failed: %1 Терминал: ошибка чтения: %1 - - - ::Debugger Thread&nbsp;id: Id&nbsp;потока: @@ -16328,9 +16079,6 @@ You can choose another communication channel here, such as a serial line or cust Misc Types Другие типы - - - ::Debugger Attach to Process Not Yet Started Подключение процессу ещё не началось @@ -16387,9 +16135,6 @@ You can choose another communication channel here, such as a serial line or cust Attach Подключить - - - ::Debugger %1.%2 %1,%2 @@ -16402,9 +16147,6 @@ You can choose another communication channel here, such as a serial line or cust Connection is not open. Подключение не открыто. - - - ::Debugger Internal error: Invalid TCP/IP port specified %1. Внутренняя ошибка: указан недопустимый порт TCP/IP %1. @@ -16537,9 +16279,6 @@ You can choose another communication channel here, such as a serial line or cust Не удалось остановить отлаживаемый процесс: - - - ::Debugger Expression Выражение @@ -17048,9 +16787,6 @@ You can choose another communication channel here, such as a serial line or cust Locals and Expressions Переменные и выражения - - - ::Debugger Start Remote Analysis Запуск удалённой отладки @@ -17071,9 +16807,6 @@ You can choose another communication channel here, such as a serial line or cust Working directory: Рабочий каталог: - - - Debuggger::Internal::ModulesHandler Unknown Неизвестная @@ -17086,10 +16819,6 @@ You can choose another communication channel here, such as a serial line or cust Yes Да - - None - Отсутствует - Plain Простой @@ -17393,7 +17122,7 @@ Rebuilding the project might help. - DevelopmentTeam + ::Ios %1 - Free Provisioning Team : %2 %1 - Свободная провизионная команда: %2 @@ -17733,7 +17462,7 @@ Rebuilding the project might help. - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character Удалить символ @@ -19016,14 +18745,7 @@ when they are not required, which will improve performance in most cases. - ::GLSLEditor - - GLSL - - - - - GTestFramework + ::Autotest Google Test Google Test @@ -19034,9 +18756,6 @@ See also Google Test settings. Включение или выключение группировки тестов по каталогу или фильтру GTest. Смотрите также настройки Google Test. - - - GTestTreeItem <matching> <совпадает> @@ -19049,10 +18768,6 @@ See also Google Test settings. Change GTest filter in use inside the settings. Изменить используемый в настройках фильтр GTest. - - parameterized - параметрический - typed типизированный @@ -21418,7 +21133,7 @@ Leave empty to search through the file system. - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -22092,14 +21807,6 @@ Add, modify, and remove document filters, which determine the documentation set &Look for: &Искать: - - Open Link - Открыть ссылку - - - Open Link as New Page - Открыть ссылку в новой странице - Copy Link Скопировать ссылку @@ -22162,7 +21869,7 @@ Add, modify, and remove document filters, which determine the documentation set - HeobData + ::Valgrind Process %1 Процесс %1 @@ -22223,9 +21930,6 @@ Add, modify, and remove document filters, which determine the documentation set Heob: Failure in process attach handshake (%1). Heob: не удалось выполнить рукопожатие при подключении к процессу (%1). - - - HeobDialog New Создать @@ -22490,9 +22194,6 @@ Add, modify, and remove document filters, which determine the documentation set Open Image Viewer Открыть просмотр изображений - - - ::ImageViewer File: Файл: @@ -22512,9 +22213,6 @@ Would you like to overwrite it? %1 уже существует. Перезаписать его? - - - ::ImageViewer Export %1 Экспорт %1 @@ -22535,9 +22233,6 @@ Would you like to overwrite it? Could not write file "%1". Не удалось записать файл «%1». - - - ::ImageViewer Play Animation Воспроизвести анимацию @@ -22546,9 +22241,6 @@ Would you like to overwrite it? Pause Animation Приостановить анимацию - - - ::ImageViewer Image format not supported. Формат изображения не поддерживается. @@ -23579,7 +23271,7 @@ Error: %5 - JsonRpcMessageHandler + ::LanguageServerProtocol Could not parse JSON message "%1". Не удалось разобрать сообщение JSON «%1». @@ -24544,7 +24236,7 @@ Error: %5 - Marketplace::Internal::QtMarketplaceWelcomePage + ::Marketplace Marketplace Магазин @@ -27323,7 +27015,7 @@ You might find further explanations in the Application Output view. - ProMessageHandler + ::QtSupport [Inexact] Prefix used for output from the cumulative evaluation of project files. @@ -37380,11 +37072,7 @@ This is independent of the visibility property in QML. - QmlEngine - - JS Source for %1 - Исходник JS для %1 - + ::Debugger Anonymous Function Анонимная функция @@ -38220,9 +37908,6 @@ For more information, see the "Checking Code Syntax" documentation.Split Initializer Разделить инициализатор - - - QmlJSHoverHandler Library at %1 Библиотека в %1 @@ -38289,7 +37974,7 @@ the QML editor know about a likely URI. - QmlManager + ::QmlProjectManager <Current File> <Текущий файл> @@ -39507,7 +39192,7 @@ Are you sure you want to continue? - QrcEditor + ::ResourceEditor Remove Удалить @@ -39612,9 +39297,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Qt Class Generation Создание класса Qt - - - ::QtSupport Device type is not supported by Qt version. Устройства этого типа не поддерживается профилем Qt. @@ -39631,9 +39313,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf The kit has a Qt version, but no C++ compiler. У комплекта задан профиль Qt, но нет компилятора C++. - - - ::QtSupport Embedding of the UI Class Встраивание класса UI @@ -39666,9 +39345,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Add Qt version #ifdef for module names Добавлять #ifdef по версии Qt для имён модулей - - - ::QtSupport Examples Примеры @@ -39717,9 +39393,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Search in Tutorials... Поиск по учебникам... - - - ::QtSupport %1 (invalid) %1 (неверный) @@ -39860,9 +39533,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Incompatible Qt Versions Несовместимые профили Qt - - - ::QtSupport Link with a Qt installation to automatically register Qt versions and kits? To do this later, select Options > Kits > Qt Versions > Link with Qt. Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Параметры > Комплекты > Профили Qt > Связать с Qt. @@ -39875,9 +39545,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Full path to the target bin directory of the current project's Qt version.<br>You probably want %1 instead. Полный путь каталогу bin профиля Qt, используемого в текущем проекте.<br>Возможно, нужен %1. - - - ::QtSupport Version name: Название профиля: @@ -39890,9 +39557,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Edit Изменить - - - ::QtSupport Remove Удалить @@ -39909,16 +39573,10 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Register documentation: Регистрация документации: - - - ::QtSupport Debugging Helper Build Log Журнал сборки помощника отладчика - - - ::QtSupport If you plan to provide translations for your project's user interface via the Qt Linguist tool, please select a language here. A corresponding translation (.ts) file will be generated for you. Укажите здесь язык, если планируете обеспечить проект переводами интерфейса утилитой Qt Linguist. Будет создан соответствующий файл перевода (.ts). @@ -39935,9 +39593,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Translation file: Файл перевода: - - - ::QtSupport QML debugging and profiling: Отладка и профилирование QML: @@ -39946,9 +39601,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Might make your application vulnerable.<br/>Only use in a safe environment. Может сделать приложение уязвимым.<br/>Используйте только в безопасной среде. - - - ::QtSupport Qt version Профиль Qt @@ -40049,9 +39701,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Path to the qmake executable Путь к программе qmake - - - ::QtSupport Qt Quick Compiler: Компилятор Qt Quick: @@ -40060,9 +39709,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Disables QML debugging. QML profiling will still work. Отключает отладку QML. Профилирование QML продолжит работать. - - - ::QtSupport Qt Version Профиль Qt @@ -40071,23 +39717,17 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Location of qmake Размещение qmake - - - ::QtSupport No factory found for qmake: "%1" Не удалось найти фабрику для qmake: «%1» - QtTestFramework + ::Autotest Qt Test Qt Test - - - QtTestTreeItem inherited наследовано @@ -40199,14 +39839,11 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QuickTestFramework + ::Autotest Quick Test Тест Quick - - - QuickTestTreeItem <unnamed> <безымянный> @@ -40290,9 +39927,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Deploy to Remote Linux Host Развернуть на удалённую машину с Linux - - - ::RemoteLinux No deployment action necessary. Skipping. Нет необходимости в развёртывании. Пропущено. @@ -40321,9 +39955,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Connection error: %1 Ошибка подключения: %1 - - - ::RemoteLinux Cannot deploy: %1 Невозможно развернуть: %1 @@ -40340,9 +39971,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Deploy step finished. Этап развёртывания завершён. - - - ::RemoteLinux Connection failure: %1 Ошибка подключения: %1 @@ -40351,9 +39979,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Installing package failed. Не удалось установить пакет. - - - ::RemoteLinux Successfully uploaded package file. Успешно отправлен файл пакета. @@ -40366,9 +39991,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Package installed. Пакет установлен. - - - ::RemoteLinux Failed to retrieve remote timestamp for file "%1". Incremental deployment will not work. Error message was: %2 Не удалось получить временную метку внешнего файла «%1». Инкрементальное развёртывание не будет работать. Ошибка: %2 @@ -40401,9 +40023,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Remote chmod failed for file "%1": %2 Не удалось выполнить внешний chmod для файла «%1»: %2 - - - ::RemoteLinux Incremental deployment Инкрементальное развёртывание @@ -40412,9 +40031,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Upload files via SFTP Отправить файлы через SFTP - - - ::RemoteLinux Authentication type: Тип авторизации: @@ -40491,16 +40107,10 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Specific &key &Особый ключ - - - ::RemoteLinux New Generic Linux Device Configuration Setup Настройка новой конфигурации устройства на базе Linux - - - ::RemoteLinux Summary Итог @@ -40511,9 +40121,6 @@ In addition, device connectivity will be tested. Будет создана новая конфигурация устройства. А заодно произведена проверка качества соединения устройства. - - - ::RemoteLinux Key Deployment Установка ключа @@ -40544,16 +40151,10 @@ If you do not have a private key yet, you can also create one here. Private key file: Файл секретного ключа: - - - ::RemoteLinux Connection Подключение - - - ::RemoteLinux Connecting to host... Подключение к узлу... @@ -40642,9 +40243,6 @@ If you do not have a private key yet, you can also create one here. Checking if specified ports are available... Проверка на доступность указанных портов... - - - ::RemoteLinux WizardPage @@ -40661,9 +40259,6 @@ If you do not have a private key yet, you can also create one here. The username to log into the device: Имя пользователя для входа в устройство: - - - ::RemoteLinux Generic Linux Обычный Linux @@ -40688,9 +40283,6 @@ If you do not have a private key yet, you can also create one here. Error starting remote shell. Ошибка запуска удалённой оболочки. - - - ::RemoteLinux Preparing SFTP connection... Подготовка подключения SFTP... @@ -40707,9 +40299,6 @@ If you do not have a private key yet, you can also create one here. Failed to upload package: %2 Не удалось отправить пакет: %2 - - - ::RemoteLinux Remote executable: Внешняя программа: @@ -40731,9 +40320,6 @@ If you do not have a private key yet, you can also create one here. Run "%1" Запустить «%1» - - - ::RemoteLinux Error: No device Ошибка: Нет устройства @@ -40754,9 +40340,6 @@ If you do not have a private key yet, you can also create one here. Remote stderr was: "%1" Содержимое внешнего stderr: «%1» - - - ::RemoteLinux Executable on device: Программа на устройстве: @@ -40769,9 +40352,6 @@ If you do not have a private key yet, you can also create one here. Executable on host: Программа на машине: - - - ::RemoteLinux Failed to create remote directories: %1 Не удалось создать внешние каталоги: %1 @@ -40788,16 +40368,10 @@ If you do not have a private key yet, you can also create one here. rsync failed with exit code %1. rsync завершился с кодом %1. - - - ::RemoteLinux %1 (default) %1 (по умолчанию) - - - ::RemoteLinux Command: Команда: @@ -40846,9 +40420,6 @@ If you do not have a private key yet, you can also create one here. You need to add an install statement to your CMakeLists.txt file for deployment to work. Для работы развёртывания необходимо добавить оператор установки в файл CMakeLists.txt. - - - ::RemoteLinux Choose Public Key File Выбор файла открытого ключа @@ -40869,9 +40440,6 @@ If you do not have a private key yet, you can also create one here. Close Закрыть - - - ::RemoteLinux Unexpected output from remote process: "%1" Неожиданный вывод удалённого процесса: «%1» @@ -40896,9 +40464,6 @@ If you do not have a private key yet, you can also create one here. Внешняя файловая система имеет %n мегабайтов свободного пространства. - - - ::RemoteLinux Remote path to check for free space: Внешний путь для проверки свободного места: @@ -40915,9 +40480,6 @@ If you do not have a private key yet, you can also create one here. Check for free disk space Проверить место на диске - - - ::RemoteLinux No command line given. Командная строка не задана. @@ -40938,9 +40500,6 @@ If you do not have a private key yet, you can also create one here. Remote command finished successfully. Внешняя команда успешно завершилась. - - - ::RemoteLinux Command line: Командная строка: @@ -40949,9 +40508,6 @@ If you do not have a private key yet, you can also create one here. Run custom remote command Выполнить особую внешнюю команду - - - ::RemoteLinux Clean Environment Чистая среда @@ -40960,9 +40516,6 @@ If you do not have a private key yet, you can also create one here. System Environment Системная среда - - - ::RemoteLinux Fetch Device Environment Загрузить среду устройства @@ -40987,9 +40540,6 @@ If you do not have a private key yet, you can also create one here. Fetching environment failed: %1 Не удалось загрузить окружение: %1 - - - ::RemoteLinux Trying to kill "%1" on remote device... Попытка уничтожить «%1» на внешнем устройстве... @@ -41006,16 +40556,10 @@ If you do not have a private key yet, you can also create one here. Kill current application instance Уничтожение текущего экземпляра приложения - - - ::RemoteLinux Exit code is %1. stderr: Код завершения %1. stderr: - - - ::RemoteLinux Flags: Флаги: @@ -41024,9 +40568,6 @@ If you do not have a private key yet, you can also create one here. Deploy files via rsync Установка файлов через rsync - - - ::RemoteLinux Public key error: %1 Ошибка открытого ключа: %1 @@ -41035,9 +40576,6 @@ If you do not have a private key yet, you can also create one here. Key deployment failed: %1. Не удалось установить ключ: %1. - - - ::RemoteLinux Packaging finished successfully. Пакет успешно создан. @@ -41102,9 +40640,6 @@ If you do not have a private key yet, you can also create one here. Create tarball Создание тарбола - - - ::RemoteLinux No tarball creation step found. Не найден этап сборки тарбола. @@ -41113,9 +40648,6 @@ If you do not have a private key yet, you can also create one here. Deploy tarball via SFTP upload Установить тарбол через загрузку по SFTP - - - ::RemoteLinux X11 Forwarding Проброска портов X11 @@ -41132,17 +40664,6 @@ If you do not have a private key yet, you can also create one here. Сбросить вид - - ::ResourceEditor - - Prefix: - Префикс: - - - Language: - Язык: - - ::ResourceEditor @@ -41185,9 +40706,6 @@ If you do not have a private key yet, you can also create one here. Could not copy the file to %1. Не удалось скопировать файл в %1. - - - ::ResourceEditor &Undo От&менить @@ -41212,10 +40730,6 @@ If you do not have a private key yet, you can also create one here. Recheck Existence of Referenced Files Перепроверить наличие необходимых файлов - - Remove Missing Files - Удалить отсутствующие файлы - Rename... Переименовать... @@ -41248,10 +40762,6 @@ If you do not have a private key yet, you can also create one here. Copy URL "%1" Скопировать URL «%1» - - Add Prefix - Добавление префикса - Remove Prefix Удаление префикса @@ -41272,9 +40782,6 @@ If you do not have a private key yet, you can also create one here. Rename Prefix Переименование префикса - - - ::ResourceEditor Rename File... Переименовать файл... @@ -41287,9 +40794,6 @@ If you do not have a private key yet, you can also create one here. Sort Alphabetically Сортировать по алфавиту - - - ::ResourceEditor Open File Открытие файла @@ -41298,9 +40802,6 @@ If you do not have a private key yet, you can also create one here. All files (*) Все файлы (*) - - - ::ResourceEditor The file name is empty. Пустое имя файла. @@ -41317,9 +40818,6 @@ If you do not have a private key yet, you can also create one here. Cannot save file. Не удалось сохранить файл. - - - ResourceTopLevelNode %1 Prefix: %2 Префикс %1: %2 @@ -41355,11 +40853,7 @@ If you do not have a private key yet, you can also create one here. - RunConfigSelector - - Run Without Deployment - Запустить без развёртывания - + ::Autotest ::ScxmlEditor @@ -42983,7 +42477,7 @@ Row: %4, Column: %5 - TestTreeItem + ::Autotest %1 (none) %1 (нет) @@ -45824,7 +45318,7 @@ The trace data is lost. - TopicChooser + ::Help Filter Фильтр @@ -46903,9 +46397,6 @@ To disable a variable, prefix the line with "#". Calls Вызовы - - - ::Valgrind Previous command has not yet finished. Предыдущая команда ещё не завершена. @@ -46938,9 +46429,6 @@ To disable a variable, prefix the line with "#". Callgrind unpaused. Callgrind продолжает работу. - - - ::Valgrind Function: Функция: @@ -47013,9 +46501,6 @@ To disable a variable, prefix the line with "#". Incl. Cost: %1 Полная цена: %1 - - - ::Valgrind %1 in %2 %1 в %2 @@ -47024,9 +46509,6 @@ To disable a variable, prefix the line with "#". %1:%2 in %3 %1: %2 в %3 - - - ::Valgrind Last-level Последний уровень @@ -47083,9 +46565,6 @@ To disable a variable, prefix the line with "#". Position: Положение: - - - ::Valgrind %1%2 %1%2 @@ -47094,9 +46573,6 @@ To disable a variable, prefix the line with "#". in %1 в %1 - - - ::Valgrind Valgrind Function Profiler uses the Callgrind tool to record function calls when a program runs. Профайлер функций Valgrind использует утилиту Callgrind для записи вызовов функций при работе программы. @@ -47265,9 +46741,6 @@ To disable a variable, prefix the line with "#". Parsing Profile Data... Обработка данных профилирования... - - - ::Valgrind Profiling Профилирование @@ -47276,16 +46749,10 @@ To disable a variable, prefix the line with "#". Profiling %1 Профилирование %1 - - - ::Valgrind Suppress Error Игнорировать ошибку - - - ::Valgrind External Errors Внешние ошибки @@ -47340,10 +46807,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Анализатор памяти Valgrind с GDB использует утилиту Memcheck для поиска утечек памяти. При обнаружении проблем программа останавливается для отладки. - - Heob - Heob - Ctrl+Alt+H Ctrl+Alt+H @@ -47448,9 +46911,6 @@ When a problem is detected, the application is interrupted and can be debugged.< XML Files (*.xml);;All Files (*) Файлы XML (*.xml);;Все файлы (*) - - - ::Valgrind Suppression File: Список исключений: @@ -47467,9 +46927,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Save Suppression Сохранить исключения - - - ::Valgrind Generic Settings Общие настройки @@ -47647,16 +47104,10 @@ With cache simulation, further event counters are enabled: KCachegrind executable: Программа KCachegrind: - - - ::Valgrind Valgrind Settings Настройки Valgrind - - - ::Valgrind Valgrind options: %1 Параметры Valgrind: %1 @@ -47691,16 +47142,10 @@ With cache simulation, further event counters are enabled: Процесс завершился с кодом %1 - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Все функции с полной ценой более %1 (%2 скрыто) - - - ::Valgrind XmlServer on %1: XmlServer на %1: @@ -47709,9 +47154,6 @@ With cache simulation, further event counters are enabled: LogServer on %1: LogServer на %1: - - - ::Valgrind Location: Размещение: @@ -47720,9 +47162,6 @@ With cache simulation, further event counters are enabled: Instruction pointer: Указатель инструкций: - - - ::Valgrind Issue Проблема @@ -47731,9 +47170,6 @@ With cache simulation, further event counters are enabled: %1 in function %2 %1 в функции %2 - - - ::Valgrind Could not parse hex number from "%1" (%2) Не удалось разобрать шестнадцатеричное число из «%1» (%2) @@ -47786,9 +47222,6 @@ With cache simulation, further event counters are enabled: Unexpected exception caught during parsing. Возникло неожиданное исключение при разборе. - - - ::Valgrind Description Описание diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 3133b08975a..bfc5e00f2c6 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -37,33 +37,28 @@ - AttachCoreDialog + ::Debugger Start Debugger Zaženi razhroščevalnik - &Executable: &Izvršljiva datoteka: - &Core file: Datoteka &posnetka: - &Tool chain: &Zaporedje orodij: - Sysroot Vrhnja mapa sistema - Override &Start script: Povozi &zagonski skript: @@ -83,12 +78,10 @@ Zaženi razhroščevalnik - Attach to &process ID: Priklopi se na &proces z ID-jem: - &Tool chain: &Zaporedje orodij: @@ -115,17 +108,14 @@ Dodaj zaznamek - Bookmark: Zaznamek: - + + - New Folder Nova mapa @@ -456,12 +446,10 @@ Izberi - Change: Spremeni: - Repository location: Mesto skladišča: @@ -501,7 +489,6 @@ Prilepi: - Protocol: Protokol: @@ -530,12 +517,10 @@ Po objavi prikaži podokno z izhodom - Copy-paste URL to clipboard Skopiraj URL na odložišče - Default protocol: Privzeti protokol: @@ -547,72 +532,58 @@ Samodejno zapolni prikaz datoteke z izvorno kodo - <unlimited> <neomejena> - Use alternating row colors in debug views V prikazih razhroščevalnika uporabi izmenjujoči se barvi vrstic - Use tooltips in main editor while debugging Med razhroščevanjem v glavnem oknu uporabljaj namige - Register Qt Creator for debugging crashed applications. Registriraj Qt Creator za razhroščevanje sesutih programov. - Use Qt Creator for post-mortem debugging Uporabi Qt Creator za razhroščevanje po sesutju - Behavior Obnašanje - Change the font size in the debugger views when the font size in the main editor changes. Spremeni velikost pisave v razhroščevalnih prikazih, ko se spremeni velikost pisave v glavnem urejevalniku. - Debugger font size follows main editor Velikost pisave razhroščevalnika sledi glavnemu urejevalniku - Populate the source file view automatically. This might slow down debugger startup considerably. Samodejno zapolni prikaz datoteke z izvorno kodo. To lahko občutno upočasni zagon razhroščevalnika. - Close temporary buffers on debugger exit. Ob izhodu iz razhroščevalnika zapri začasne medpomnilnike. - Close temporary buffers on debugger exit Ob izhodu iz razhroščevalnika zapri začasne medpomnilnike - Switch to previous mode on debugger exit. Ob izhodu iz razhroščevalnika preklopi v predhodni način. - Switch to previous mode on debugger exit Ob izhodu iz razhroščevalnika preklopi v predhodni način - Maximum stack depth: Največja globina sklada: @@ -642,73 +613,56 @@ - CompletionSettingsPage + ::TextEditor Insert the common prefix of available completion items. Vstavi skupni začetek razpoložljivih možnosti za dokončanje. - Autocomplete common &prefix Samodejno dokončaj skupni &začetek - &Automatically insert brackets &Samodejno vstavi oklepaje - - Behavior - Obnašanje - - - &Case-sensitivity: &Razločevanje velikosti črk - Full Polno - None Brez - First Letter Prva črka - Insert &space after function name Za imenom funkcije vstavi &presledek - Activate completion: Dokončevanje vklopi: - Manually Ročno - When Triggered Ko je sproženo - Always Vedno - Automatically insert brackets and semicolons when appropriate. Samodejno vstavi oklepaje in podpičja, ko je to primerno. @@ -718,7 +672,7 @@ - ContentWindow + ::Help Open Link Odpri povezavo @@ -932,14 +886,6 @@ Ali jih želite nadomestiti? Previous Open Document in History Predhodni odprti dokument v zgodovini - - Go Back - Pojdi nazaj - - - Go Forward - Pojdi naprej - Meta+E Meta+E @@ -1081,104 +1027,82 @@ Ali jih želite nadomestiti? Konzola: - ? ? - When files are externally modified: Ko so datoteke spremenjene od zunaj: - User Interface Uporabniški vmesnik - Color: Barva: - Language: Jezik: - System Sistem - External file browser: Zunanji brskalnik po datotekah: - Always Ask Vedno vprašaj - Reload All Unchanged Editors Znova naloži vse nespremenjene urejevalnike - Ignore Modifications Prezri spremembe - Reset to default. Color Ponastavi na privzeto. - Reset Ponastavi - Reset to default. Terminal Ponastavi na privzeto. - Reset to default. File Browser Ponastavi na privzeto. - Automatically create temporary copies of modified files. If Qt Creator is restarted after a crash or power failure, it asks whether to recover the auto-saved content. Samodejno ustvari začasne kopije spremenjenih datotek. Ko Qt Creator po sesutju ali po izpadu električnega omrežja zaženete znova, vas bo vprašal, ali naj obnovi samodejno shranjeno vsebino. - Auto-save modified files Samodejno shranjuj spremenjene datoteke - Interval: Razmik: - min unit for minutes min - - Reset to default - Ponastavi na privzeto - R P @@ -1345,7 +1269,6 @@ Ali jih želite nadomestiti? Nov projekt - Choose a template: Izberite predlogo: @@ -1621,17 +1544,14 @@ Ali jih želite nadomestiti? Končnica glave: - Source suffix: Končnica izvorne kode: - Lower case file names Imena datotek z malimi črkami - License template: Predloga za licenco: @@ -1775,9 +1695,6 @@ Qt Creator cannot attach to it. Proces %1 je že pod nadzorom razhroščevalnika. Qt Creator se nanj ne more priklopiti. - - - ::Debugger Select Start Address Izberite začetni naslov @@ -1790,9 +1707,6 @@ Qt Creator se nanj ne more priklopiti. Select start address Izberite začetni naslov - - - ::Debugger Marker File: Datoteka oznake: @@ -2019,9 +1933,6 @@ Qt Creator se nanj ne more priklopiti. Thread Specification: Določitev niti: - - - ::Debugger Breakpoints Prekinitvene točke @@ -2114,9 +2025,6 @@ Qt Creator se nanj ne more priklopiti. Conditions on Breakpoint %1 Pogoji pri prekinitveni točki %1 - - - ::Debugger Startup Placeholder @@ -2124,37 +2032,30 @@ Qt Creator se nanj ne more priklopiti. Zagon - Additional &arguments: Dodatni &argumenti: - <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> <html><head/><body><p>Za besedilne programe namesto Qt Creator-jeve konzole uporabi CDB-jevo lastno konzolo. CDB-jeva konzola ob izhodu iz programa ne prikaže poziva. Uporabna je za ugotavljanje vzrokov za nepravilen zagon programa v Qt Creator-jevi konzoli in kasnejše neuspešne priklope.</p></body></html> - Use CDB &console Uporabi CDB-jevo &konzolo - Debugger Paths Poti za razhroščevalnik - &Symbol paths: Poti za &simbole: - S&ource paths: Poti za &izvorno kodo: - Break on: Prekini pri: @@ -2190,9 +2091,6 @@ Qt Creator se nanj ne more priklopiti. Autodetection Samodejna zaznava - - - ::Debugger Symbol Server... Strežnik za simbole … @@ -2217,9 +2115,6 @@ Qt Creator se nanj ne more priklopiti. Pick a local cache directory Izberite mapo s krajevnim medpomnilnikom - - - ::Debugger This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions. To preklopi razhroščevalnik v način delovanja po ukazih. V tem načinu korakanje deluje po posameznih ukazih, prikaz mesta v izvorni kodi pa prikazuje ukaze v zbirniku. @@ -2428,9 +2323,6 @@ Qt Creator se nanj ne more priklopiti. Changes the debugger language according to the currently opened file. Spremeni jezik razhroščevalnika glede na trenutno odprto datoteko. - - - ::Debugger Reading %1... Branje %1 … @@ -2840,9 +2732,6 @@ To lahko privede do napačnih rezultatov. Choose Location of Startup Script File Izberite mesto datoteke zagonskega skripta - - - ::Debugger yes da @@ -2894,9 +2783,6 @@ To lahko privede do napačnih rezultatov. <neznan> - - - ::Debugger Modules Moduli @@ -2949,9 +2835,6 @@ To lahko privede do napačnih rezultatov. Show Dependencies of "%1" Prikaži odvisnosti za »%1« - - - ::Debugger Cannot create temporary file: %1 Ni moč ustvariti začasne datoteke: %1 @@ -2964,9 +2847,6 @@ To lahko privede do napačnih rezultatov. Cannot open FiFo %1: %2 Ni moč odpreti FIFO %1: %2 - - - ::Debugger Name Ime @@ -2975,9 +2855,6 @@ To lahko privede do napačnih rezultatov. Value (base %1) Vrednost (osnova %1) - - - ::Debugger Registers Registri @@ -3022,9 +2899,6 @@ To lahko privede do napačnih rezultatov. Open File "%1"' Odpri datoteko »%1« - - - ::Debugger ... … @@ -3121,9 +2995,6 @@ To lahko privede do napačnih rezultatov. Open Disassembler Odpri razstavljalnik - - - ::Debugger Select Executable Izberite izvršljivo datoteko @@ -3132,10 +3003,6 @@ To lahko privede do napačnih rezultatov. Select Working Directory Izberite delovno mapo - - Executable: - Izvršljiva datoteka: - Arguments: Argumenti: @@ -3160,16 +3027,10 @@ To lahko privede do napačnih rezultatov. Select Start Script Izberite zagonski skript - - - ::Debugger Thread Nit - - - ::Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -3580,28 +3441,23 @@ To lahko privede do napačnih rezultatov. Uporabi Qt Creatorjev model kode, da ugotovi, ali je ob prekinitvi razhroščevalnika spremenljivki že bila prirejena vrednost. - Use code model Uporabi model kode - Use Debugging Helper Uporabi razhroščevalnega pomočnika - <html><head/><body> <p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html> <html><head/><body><p>Razhroščevalni pomočnik se uporablja le za lepo oblikovan prikaz objektov določenih vrst, na primer QString in std::map, v prikazu »Krajevno in izrazi«. Ni obvezen za razhroščevanje s Qt Creatorjem.</p></body></html> - Displays names of QThread based threads. Prikazuje imena niti, ki temeljijo na QThread. - Display thread names Prikaži imena niti @@ -3702,7 +3558,6 @@ Morda lahko pomaga ponovna gradnja projekta. Razred - Choose a Class Name Izberite ime razreda @@ -3874,23 +3729,20 @@ Morda lahko pomaga ponovna gradnja projekta. - DocSettingsPage + ::Help Remove Odstrani - Registered Documentation Registrirana dokumentacija - Add and remove compressed help files, .qch. Dodajanje in odstranjevanje stisnjenih datotek s pomočjo, *.qch. - Add Dodaj @@ -3906,52 +3758,42 @@ Morda lahko pomaga ponovna gradnja projekta. Ime: - Version: Različica: - Vendor: Proizvajalec: - Location: Mesto: - Description: Opis: - Copyright: Avtorske pravice: - License: Licenca: - Dependencies: Odvisnosti: - Group: Skupina: - Compatibility version: Združljiva različica: - URL: URL: @@ -3968,7 +3810,6 @@ Morda lahko pomaga ponovna gradnja projekta. Stanje: - Error message: Sporočilo napake: @@ -3997,17 +3838,14 @@ Morda lahko pomaga ponovna gradnja projekta. Ime - Version Različica - Vendor Proizvajalec - Load Naloži @@ -4244,102 +4082,82 @@ Razlog: %3 Uporabi FakeVim - Shift width: Širina zamika: - Tabulator size: Velikost tabulatorja: - Backspace: Vračalka: - Vim Behavior Obnašanje Vim - Automatic indentation Samodejno zamikanje - Start of line Začetek vrstice - Smart indentation Pametno zamikanje - Use search dialog Uporabi pogovorno okno za iskanje - Expand tabulators Razširi tabulatorje - Show position of text marks Prikaži položaje besedilnih oznak - Smart tabulators Pametni tabulatorji - Highlight search results Poudari rezultate iskanja - Incremental search Postopno iskanje - Keyword characters: Znaki ključnih besed: - Copy Text Editor Settings Skopiraj nastavitve urejevalnika besedil - Set Qt Style Nastavi slog Qt - Set Plain Style Nastavi navaden slog - Pass key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim. Kombinacije tipk, kot je Ctrl+S, posreduj jedru Qt Creatorja in jih ne tolmači v FakeVim. To olajša dostop do osrednjih funkcij Qt Creatorja, ob tem pa se izgubi nekaj zmožnosti FakeVim. - Pass control key Posreduj kombinacije s tipko Ctrl - Vim tabstop option Vim-ova možnost »tabstop« @@ -4355,7 +4173,6 @@ Razlog: %3 Dodaj ime filtra - Filter Name: Ime filtra: @@ -4367,27 +4184,22 @@ Razlog: %3 1 - Add Dodaj - Remove Odstrani - Filters Filtri - Attributes Lastnosti - <html><body> <p> Add, modify, and remove document filters, which determine the documentation set displayed in the Help mode. The attributes are defined in the documents. Select them to display a set of relevant documentation. Note that some attributes are defined in several documents. @@ -4395,65 +4207,44 @@ Add, modify, and remove document filters, which determine the documentation set <html><body><p>Dodajte, spreminjajte in odstranite filtre za dokumente, ki določajo nabor dokumentacije, ki je prikazana v načinu pomoči. Lastnosti so določene v dokumentih. Izberite jih, tako da bo prikazana ustrezna dokumentacija. Vedite, da so nekatere lastnosti določene v več dokumentih.</p></body></html> - No user defined filters available or no filter selected. Na voljo ni nobenega uporabniškega filtra ali pa noben ni izbran. - Find::Internal::FindDialog + ::Core Search for... Poišči … - Sc&ope: D&oseg: - &Search &Išči - Search &for: Poi&šči: - - Close - Zapri - - - &Case sensitive O&bčutljivo na velikost črk - &Whole words only Samo &cele besede - Search && Replace Iskanje in zamenjevanje - Use regular e&xpressions Uporabi r&egularne izraze - - - Cancel - Prekliči - - - - Find::Internal::FindToolBar Find/Replace Najdi in zamenjaj @@ -4462,10 +4253,6 @@ Add, modify, and remove document filters, which determine the documentation set Enter Find String Vnesite iskani niz - - Ctrl+E - Ctrl+E - Find Next Najdi naslednje @@ -4478,10 +4265,6 @@ Add, modify, and remove document filters, which determine the documentation set Replace Zamenjaj - - Replace && Find - Zamenjaj in najdi - Ctrl+= Ctrl+= @@ -4490,10 +4273,6 @@ Add, modify, and remove document filters, which determine the documentation set Replace && Find Previous Zamenjaj in najdi prejšnje - - Replace All - Zamenjaj vse - Case Sensitive Občutljivo na velikost črk @@ -4510,55 +4289,30 @@ Add, modify, and remove document filters, which determine the documentation set Replace && Find Next Zamenjaj in najdi naslednje - - - Find::Internal::FindWidget Find Najdi - Find: Najdi: - - Replace with: - Zamenjaj z: - - - ... ... - - Replace - Zamenjaj - - - Replace && Find Zamenjaj in najdi - Replace All Zamenjaj vse - - - Advanced... - Napredno ... - All Vse - - - Find::SearchResultWindow Search Results Rezultati iskanja @@ -4579,10 +4333,6 @@ Add, modify, and remove document filters, which determine the documentation set Replace all occurrences Zamenjaj vse pojavitve - - Replace - Zamenjaj - This change cannot be undone. Te spremembe ni moč razveljaviti. @@ -4597,63 +4347,48 @@ Add, modify, and remove document filters, which determine the documentation set - GdbOptionsPage + ::Debugger This is the slowest but safest option. To je najpočasnejša in najvarnejša možnost. - Try to set breakpoints in selected plugins Poskusi nastaviti prekinitvene točke v izbranih vstavkih - Matching regular expression: Ujemajoče z regularnim izrazom: - Never set breakpoints in plugins automatically Nikoli samodejno ne nastavljaj prekinitvenih točk v vstavkih - Enable reverse debugging Omogoči obratno razhroščevanje - Skip known frames when stepping Med stopanjem preskoči znane okvirje - Show a message box when receiving a signal Ob prejemu signala prikaži okno s sporočilom - Behavior of Breakpoint Setting in Plugins Obnašanje nastavljanja prekinitvenih točk v vstavkih - - GDB - GDB - - - This is either empty or points to a file containing GDB commands that will be executed immediately after GDB starts up. To je bodisi prazno bodisi kaže na datoteko, ki vsebuje ukaze za GDB, ki bodo izvršeni takoj po zagonu GDB-ja. - GDB startup script: Zagonski skript za GDB: - This is the number of seconds Qt Creator will wait before it terminates a non-responsive GDB process. The default value of 20 seconds should be sufficient for most applications, but there are situations when @@ -4666,64 +4401,52 @@ nalaganje velikih knjižnic ali izpisovanje izvorne kode traja precej dlje. V tem primeru zvišajte vrednost. - GDB timeout: Razpoložljivi čas za GDB: - Allows 'Step Into' to compress several steps into one step for less noisy debugging. For example, the atomic reference counting code is skipped, and a single 'Step Into' for a signal emission ends up directly in the slot connected to it. Omogoči ukazu »Vstopi«, da več korakov združi v enega in tako zmanjša »zgovornost« razhroščevanja. Preskoči se na primer koda za atomarno štetje sklicev, en »Vstop« v oddajo signala pa prav tako privede neposredno do reže, ki je povezana s signalom. - This will show a message box as soon as your application receives a signal like SIGSEGV during debugging. Takoj ko program med razhroščevanjem prejme signal kot je SIGSEGV, bo prikazano pogovorno okno s sporočilom. - <html><head/></body><p>GDB allows setting breakpoints on source lines for which no code was generated. In such situations the breakpoint is shifted to the next source code line for which code was actually generated. This option reflects such temporary change by moving the breakpoint markers in the source code editor.</p></body></html> <html><head/></body><p>GDB omogoča nastavljanje prekinitvenih točk v vrsticah izvorne kode, za katere strojna koda ni bila ustvarjena. V takih primerih se prekinitvene točke premakne v prvo naslednjo vrstico izvorne kode, za katero je bila strojna koda dejansko ustvarjena. Ta možnost tako začasno spremembo upodobi s premikom oznak prekinitvenih točk v urejevalniku izvorne kode.</p></body></html> - Adjust breakpoint locations Prilagodi mesta prekinitvenih točk - This allows or inhibits reading the user's default .gdbinit file on debugger startup. To ob zagonu razhroščevalnika omogoči ali onemogoči branje uporabnikove privzete datoteke .gdbinit. - Load .gdbinit file on startup Ob zagonu naloži datoteko .gdbinit - Use asynchronous mode to control the inferior Za nadzor podprocesa uporabi asinhroni način - Stop when a qWarning is issued Ob klicu funkcije qWarning se ustavi - Stop when a qFatal is issued Ob klicu funkcije qFatal se ustavi - <html><head/><body><p>Selecting this enables reverse debugging.</p><.p><b>Note:</b>This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session.</p><body></html> <html><head/><body><p>To omogoči obratno razhroščevanje.</p><.p><b>Opomba:</b> Ta zmožnost je zelo počasna in nestabilna. Ob vračanju prek sistemskih klicev se obnaša nepredvidljivo in lahko uniči razhroščevalno sejo.</p><body></html> - Always try to set breakpoints in plugins automatically Prekinitvene točke v vstavkih vedno poskušaj nastaviti samodejno @@ -4778,18 +4501,16 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - GenericMakeStep + ::ProjectExplorer Override %1: Povozi %1: - Make arguments: Argumenti za Make: - Targets: Cilji: @@ -4905,32 +4626,26 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Veje - Re&fresh Os&veži - &Add... &Dodaj ... - &Remove &Odstrani - &Diff &Razlike - &Log D&nevnik - &Checkout &Prevzemi @@ -5821,32 +5536,26 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Splošni podatki - Repository: Skladišče: - repository skladišče - branch veja - Commit Information Podatki o zapisu - Author: Avtor: - Email: E-pošta: @@ -5863,72 +5572,58 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr PATH: - <b>Note:</b> <b>Opomba:</b> - Git needs to find Perl in the environment as well. Git mora v okolju najti tudi Perl. - Log commit display count: Število prikazanih dnevniških zapisov: - Note that huge amount of commits might take some time. Vedite, da je za veliko število zapisov morda potrebno veliko časa. - Environment Variables Okoljske spremenljivke - From System Od sistema - Miscellaneous Razno - Timeout: Razpoložljivi čas: - s s - Prompt on submit Vprašaj ob pošiljanju - Pull with rebase Potegni s ponastavitvijo izhodišča - Set "HOME" environment variable Nastavi okoljsko spremenljivko »HOME« - Gitk Gitk - Arguments: Argumenti: @@ -6159,14 +5854,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Indexing Documentation... Indeksiranje dokumentacije … - - Open Link - Odpri povezavo - - - Open Link as New Page - Odpri povezavo kot novo stran - Copy Link Skopiraj povezavo @@ -6191,21 +5878,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Napaka 404</title><div align="center"><br><br><h1>Strani ni bilo moč najti</h1><br><h3>»%1«</h3></div> - - - IndexWindow &Look for: &Išči: - - Open Link - Odpri povezavo - - - Open Link as New Page - Odpri povezavo kot novo stran - ::Core @@ -6219,16 +5895,7 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - MakeStep - - Override %1: - Povozi %1: - - - - Make arguments: - Argumenti za Make: - + ::ProjectExplorer MyMain @@ -6249,13 +5916,12 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - OpenWithDialog + ::Core Open File With... Odpri datoteko v … - Open file extension with: Odpri končnico datoteke v: @@ -6267,7 +5933,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Številka spremembe - Change Number: Številka spremembe: @@ -6276,7 +5941,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Čakajoče spremembe P4 - Cancel Prekliči @@ -6623,7 +6287,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Poziv Perforce - OK V redu @@ -6636,62 +6299,50 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Preizkus - Configuration Nastavitve - P4 command: Ukaz P4: - Environment Variables Okoljske spremenljivke - P4 client: Odjemalec P4: - P4 user: Uporabnik P4: - P4 port: Vrata P4: - Miscellaneous Razno - Timeout: Razpoložljivi čas: - s s - Prompt on submit Vprašaj ob pošiljanju - Log count: Dolžina dnevnika: - Automatically open files when editing Med urejanjem samodejno odpiraj datoteke @@ -6712,44 +6363,18 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Pošiljanje - Change: Sprememba: - Client: Odjemalec: - User: Uporabnik: - - PluginDialog - - Details - Podrobnosti - - - Error Details - Podrobnosti napake - - - Installed Plugins - Nameščeni vstavki - - - Plugin Details of %1 - Podrobnosti vstavka %1 - - - Plugin Errors of %1 - Napake vstavka %1 - - ::ExtensionSystem @@ -7099,17 +6724,14 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Nastavitve urejevalnika: - Global Globalne - Custom Po meri - Restore Global Obnovi globalne @@ -7136,32 +6758,26 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Upravljalnik sej - &New &Nova - &Rename Pre&imenuj - C&lone &Podvoji - &Delete &Izbriši - &Open &Odpri - <a href="qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html">What is a Session?</a> <a href="qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html">Kaj je seja?</a> @@ -7178,7 +6794,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Ob zagonu Qt Creator-ja samodejno obnovi zadnjo sejo. - Restore last session on startup Ob zagonu obnovi zadnjo sejo @@ -7205,17 +6820,14 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Ukaz: - Enable custom process step Omogoči korak postopka po meri - Working directory: Delovna mapa: - Command arguments: Argumenti za ukaz: @@ -7313,17 +6925,14 @@ v projekt »%2« ni uspelo. Odstrani datoteko - &Delete file permanently &Dokončno izbriši datoteko - &Remove from Version Control &Odstrani iz sistema za nadzor različic - File to remove: Datoteka za odstraniti: @@ -7356,22 +6965,14 @@ v projekt »%2« ni uspelo. Nastavitev za zagon: - Deployment: Razmestitev: - - Add - Dodaj - - - Remove Odstrani - Rename Preimenuj ... @@ -7392,22 +6993,18 @@ v projekt »%2« ni uspelo. - Add to &project: Dodaj v &projekt: - Add to &version control: Dodaj &v sistem za nadzor različic: - Project Management Upravljanje projektov - Manage Upravljanje ... @@ -7850,59 +7447,49 @@ v sistem za nadzor različic (%2)? Dodatni argumenti: - Effective qmake call: Dejanski klic qmake: - qmake build configuration: Nastavitev gradnje s QMake: - Debug Razhroščevanje - Release Izdaja - Link QML debugging library: Poveži razhroščevalno knjižnico QML: - QrcEditor + ::ResourceEditor Add Dodaj - Remove Odstrani - Properties Lastnosti - Prefix: Predpona: - Language: Jezik: - Alias: Drugo ime: @@ -8156,27 +7743,22 @@ Preselects a desktop Qt for building the application if available. Upravljanje - Qt version: Različica Qt: - Tool chain: Zaporedje orodij: - Shadow build: Gradnja v ločeni mapi: - Build directory: Mapa za gradnjo: - problemLabel oznakaTežave @@ -8447,33 +8029,28 @@ Preselects a desktop Qt for building the application if available. Creates a Qt Resource file (.qrc) that you can add to a Qt C++ project. Ustvari datoteko z viri za Qt (*.qrc), katero lahko dodate v projekt Qt C++. - - - ::ResourceEditor untitled neimenovana - SaveItemsDialog + ::Core Save Changes Shrani spremembe - The following files have unsaved changes: Naslednje datoteke vsebujejo neshranjene spremembe: - Automatically save all files before building Pred gradnjo samodejno shrani vse datoteke - SharedTools::QrcEditor + ::ResourceEditor Add Files Dodaj datoteke @@ -8534,9 +8111,6 @@ Preselects a desktop Qt for building the application if available. Copying failed Kopiranje ni uspelo - - - SharedTools::ResourceView Add Files... Dodaj datoteke … @@ -8581,18 +8155,10 @@ Preselects a desktop Qt for building the application if available. Change Language Spremeni jezik - - Language: - Jezik: - Change File Alias Spremeni drugo ime datoteke - - Alias: - Drugo ime: - Open file Odpri datoteko @@ -8610,102 +8176,60 @@ Preselects a desktop Qt for building the application if available. - StartExternalDialog + ::Debugger - Start Debugger - Zaženi razhroščevalnik - - - - &Executable: - &Izvršljiva datoteka: - - - &Arguments: &Argumenti: - Run in &terminal: Zaženi v &terminalu: - &Working directory: &Delovna mapa: - - &Tool chain: - &Zaporedje orodij: - - - Break at '&main': Prekini pri »&main()«: - - Executable: - Izvršljiva datoteka: - - - Arguments: - Argumenti: - Break at 'main': Prekini pri »main()«: - - - StartRemoteDialog - Start Debugger - Zaženi razhroščevalnik - - - &Debugger: &Razhroščevalnik: - Local &executable: Krajevni &program: - &Host and port: &Gostitelj in vrata: - &Architecture: &Arhitektura: - &GNU target: &Cilj GNU: - Sys&root: &Vrhnja mapa sistema: - Override s&tart script: Povozi &zagonski skript: - &Use server start script: &Uporabi skript za zagon strežnika: - &Server start script: &Skript za zagon strežnika: @@ -8745,7 +8269,6 @@ Preselects a desktop Qt for building the application if available. Overjanje - Password: Geslo: @@ -8758,42 +8281,34 @@ Preselects a desktop Qt for building the application if available. Nastavitve - Subversion command: Ukaz Subversion: - Username: Uporabniško ime: - Miscellaneous Razno - Timeout: Razpoložljivi čas: - s s - Prompt on submit Vprašaj ob pošiljanju - Ignore whitespace changes in annotation Prezri spremembe presledkov v opombi - Log count: Dolžina dnevnika: @@ -9098,67 +8613,54 @@ Preselects a desktop Qt for building the application if available. Prikaz - Display line &numbers Prikaži &številke vrstic - Display &folding markers Prikaži &oznake za zvijanje - Show tabs and spaces. Prikaži tabulatorje in presledke. - &Visualize whitespace &Poudari presledke - Highlight current &line Poudari &trenutno vrstico - Text Wrapping Prelamljanje besedila - Enable text &wrapping Omogoči pre&lamljanje vrstic - Display right &margin at column: Prikaži desni &rob pri stolpcu: - Highlight &blocks Poudari &bloke - Mark &text changes Označi &spremembe besedila - &Animate matching parentheses Animiraj &ujemanje oklepajev - Auto-fold first &comment Samodejno zvij prvi &komentar - Center &cursor on scroll Ob premiku &usredišči kazalec @@ -9245,42 +8747,34 @@ Naslednji nabori znakov so verjetno ustrezni: Pisava - Family: Družina: - Size: Velikost: - Color Scheme Barvna shema - Antialias Glajenje robov - Copy... Skopiraj … - Delete Izbriši - % % - Zoom: Povečava: @@ -9826,7 +9320,7 @@ Naslednji nabori znakov so verjetno ustrezni: - TopicChooser + ::Help Filter Filter @@ -9840,17 +9334,14 @@ Naslednji nabori znakov so verjetno ustrezni: Izberite temo - &Topics &Teme - &Display &Prikaz - &Close &Zapri @@ -9965,42 +9456,34 @@ Naslednji nabori znakov so verjetno ustrezni: Pošlji na CodePaster - &Username: &Uporabniško ime: - <Username> <uporabniško ime> - &Description: &Opis: - <Description> <opis> - Patch 1 Popravek 1 - Patch 2 Popravek 2 - Protocol: Protokol: - <!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; } @@ -10013,7 +9496,6 @@ p, li { white-space: pre-wrap; } <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;Komentar&gt;</span></p></body></html> - Parts to Send to Server Deli, ki bodo poslani na strežnik @@ -10037,7 +9519,6 @@ p, li { white-space: pre-wrap; } Ime: - Choose the Location Izberite mesto @@ -10066,62 +9547,50 @@ p, li { white-space: pre-wrap; } Ime &razreda: - &Base class: &Osnovni razred: - &Type information: Podatki o &vrsti: - None Brez - Inherits QWidget Podeduje od QWidget - Based on QSharedData Temelji na QSharedData - &Header file: Datoteka z &glavo: - &Source file: Datoteka z &izvorno kodo: - &Generate form: &Ustvari obrazec: - &Form file: Datoteka z &obrazcem: - &Path: &Pot: - Inherits QDeclarativeItem Podeduje od QDeclarativeItem - Create in: Ustvari v: @@ -10142,7 +9611,6 @@ p, li { white-space: pre-wrap; } Uporabi kot privzeto mesto projekta - Introduction and Project Location Uvod in mesto projekta @@ -10155,17 +9623,14 @@ p, li { white-space: pre-wrap; } Pošiljanje Subversion - F&iles &Datoteke - Descriptio&n &Opis - Check &all Označi &vse @@ -10200,23 +9665,20 @@ p, li { white-space: pre-wrap; } - PasteBinComSettingsWidget + ::CodePaster Form Obrazec - Server prefix: Predpona strežnika: - <a href="http://pastebin.com">pastebin.com</a> allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix. <a href="http://pastebin.com">pastebin.com</a> omogoča pošiljanje na poddomene po meri (npr. kde.pastebin.com). Vnesite želeno predpono. - <i>Note: The plugin will use this for posting as well as fetching.</i> <i>Opomba: vstavek jo bo uporabil za pošiljanje in pridobivanje.</i> @@ -10230,7 +9692,7 @@ p, li { white-space: pre-wrap; } - Cvs + ::CVS CVS CVS @@ -10240,47 +9702,38 @@ p, li { white-space: pre-wrap; } Nastavitve - CVS command: Ukaz CVS: - CVS root: Vrhnja mapa CVS: - Miscellaneous Razno - Diff options: Možnosti za razlike: - Prompt on submit Vprašaj ob pošiljanju - When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit ID). Otherwise, only the respective file will be displayed. Ko je omogočeno, bodo ob kliku na številko revizije v prikazu opomb prikazane vse datoteke, ki so del zapisa. V nasprotnem bo prikazana le ustrezna datoteka. - Describe all files matching commit id Opiši vse datoteke, ki se ujemajo v ID-ju zapisa - Timeout: Razpoložljivi čas: - s s @@ -10292,37 +9745,30 @@ p, li { white-space: pre-wrap; } Obrazec - Embedding of the UI Class Vgrajevanje razreda uporabniškega vmesnika - Aggregation as a pointer member Združevanje s kazalcem kot članom - Aggregation Združevanje - Code Generation Ustvarjanje kode - Support for changing languages at runtime Podpora za preklapljanje jezikov med tekom - Use Qt module name in #include-directive V navodilu #include uporabi ime modula Qt - Multiple inheritance Dedovanje od mnogih @@ -10357,12 +9803,10 @@ p, li { white-space: pre-wrap; } StranČarovnika - ... … - Keep updating Redno posodabljaj @@ -10423,133 +9867,108 @@ p, li { white-space: pre-wrap; } - GeneralSettingsPage + ::Help Form Obrazec - Font Pisava - Family: Družina: - Style: Slog: - Size: Velikost: - Startup Zagon - On context help: Kontekstna pomoč: - On help start: Ob zagonu pomoči: - Use &Current Page Uporabi &trenutno stran - Use &Blank Page Uporabi &prazno stran - Help Bookmarks Zaznamki pomoči - Import... Uvozi … - Export... Izvozi … - Show Side-by-Side if Possible Prikaži ob strani, če je možno - Always Show Side-by-Side Vedno prikaži ob strani - Always Start Full Help Vedno zaženi polno pomoč - Show My Home Page Prikaži mojo domačo stran - Show a Blank Page Prikaži prazno stran - Show My Tabs from Last Session Prikaži moje zavihke iz zadnje seje - Home page: Domača stran: - Always Show Help in External Window Pomoč vedno prikaži v zunanjem oknu - Reset to default Ponastavi na privzeto - Reset Ponastavi - Behaviour Obnašanje - Switch to editor context after last help page is closed. Po zaprtju zadnje strani s pomočjo preklopi v urejevalnik. - Return to editor on closing the last page Po zaprtju zadnje strani se vrni v urejevalnik @@ -10565,34 +9984,28 @@ p, li { white-space: pre-wrap; } Ime: - Specify file name filters, separated by comma. Filters may contain wildcards. Določite filtre imen datotek, ločenih z vejico. Filtri lahko vsebujejo nadomestitelje. - Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree. To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for. Določite kratko besedo ali okrajšavo, ki se lahko uporabi za omejitev dokončevanja za datoteke iz tega drevesa map. Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskano besedo. - Remove Odstrani - Directories: Mape: - File types: Vrste datotek: - Add Dodaj @@ -10609,12 +10022,10 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Nastavitev filtra - Include hidden files Vključi skrite datoteke - Filter: Filter: @@ -10623,17 +10034,14 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Nastavitev filtrov - Edit Urejanje - min min - Refresh interval: Interval osveževanja: @@ -10645,92 +10053,74 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Gradnja in zagon - Use jom instead of nmake Namesto nmake uporabi jom - Projects Directory Projektna mapa - Current directory Trenutna mapa - Directory Mapa - Save all files before build Pred gradnjo shrani vse datoteke - Clear old application output on a new run Ob novem zagonu počisti stari izhod programa - <i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="ftp://ftp.qt.nokia.com/jom/">ftp://ftp.qt.nokia.com/jom/</a>. Disable it if you experience problems with your builds. <i>jom</i> je nadomestek za <i>nmake</i>, ki prevajanje porazdeli med več jeder CPE-ja. Najnovejša različica je na voljo na strani <a href="ftp://ftp.qt.nokia.com/jom/">ftp.qt.nokia.com/jom</a>. Onemogočite ga, če se med gradnjami pojavljajo težave. - Always build project before deploying it Pred razmeščanjem vedno zgradi projekt - Always deploy project before running it Pred zagonom vedno razmesti projekt - Open compiler output pane when building Med gradnjo odpri podokno izhoda prevajalnika - Open application output pane when running Med zaganjanjem odpri podokno izhoda programa - Enabling this option ensures that the order of interleaved messages from stdout and stderr is preserved, at the cost of disabling highlighting of stderr. Če omogočite to možnost, bo zagotovljen prvotni vrstni red izmenjujočih se sporočil na izhoda stdout in stderr. Cena za to je izklop poudarjanja izhoda stderr. - Merge stderr and stdout Združi stderr in stdout - Word-wrap application output Prelomi vrstice izhoda programa - Limit application output to Izhod programa omeji na - lines vrstic - Ask before terminating the running application in response to clicking the stop button in Application Output. Vprašaj pred končanjem tekočega programa s klikom na gumb »Ustavi« v izhodu programa. - Always ask before stopping applications Pred končanjem programov vedno vprašaj @@ -10754,117 +10144,94 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Obrazec - The header file Datoteka z glavo - &Sources &Izvorna koda - Widget librar&y: &Knjižnica gradnika: - Widget project &file: &Projektna datoteka gradnika: - Widget h&eader file: Datoteka z &glavo gradnika: - The header file has to be specified in source code. Datoteka z glavo mora biti določena v izvorni kodi. - Widge&t source file: Datoteka z i&zvorno kodo gradnika: - Widget &base class: &Osnovni razred gradnika: - QWidget QWidget - Plugin class &name: I&me razreda vstavka: - Plugin &header file: D&atoteka z glavo vstavka: - Plugin sou&rce file: Datoteka z iz&vorno kodo vstavka: - Icon file: Datoteka z ikono: - &Link library Pov&eži knjižnico - Create s&keleton &Ustvari ogrodje - Include pro&ject Vstavi pro&jekt - &Description &Opis - G&roup: &Skupina: - &Tooltip: &Namig: - W&hat's this: &Kaj je to: - The widget is a &container &Gradnik je vsebnik - Property defa&ults Privzeto &za lastnosti - dom&XML: dom&XML: @@ -10881,42 +10248,34 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan StranČarovnika - Plugin and Collection Class Information Podatki o vstavku in razredu zbirke - Specify the properties of the plugin library and the collection class. Določite lastnosti knjižnice vstavka in razreda zbirke. - Collection class: Razred zbirke: - Collection header file: Datoteka z glavo zbirke: - Collection source file: Datoteka z izvirno kodo zbirke: - Plugin name: Ime vstavka: - Resource file: Datoteka z viri: - icons.qrc icons.qrc @@ -10925,22 +10284,18 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Čarovnik za gradnike Qt po meri - Custom Widget List Seznam gradnikov po meri - Widget &Classes: &Razredi gradnikov: - Specify the list of custom widgets and their properties. Določite seznam gradnikov po meri in njihovih lastnosti. - ... … @@ -10952,32 +10307,26 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Polkrepko - Italic Ležeče - Background: Ozadje: - Foreground: Ospredje: - Erase background Počisti ozadje - x x - Erase foreground Izbriši ospredje @@ -10989,57 +10338,46 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan StranČarovnika - Repository Skladišče - The remote repository to check out. Oddaljeno skladišče za prevzem. - Branch: Veja: - The development branch in the remote repository to check out. Razvojna veja za prevzem iz oddaljenega skladišča. - Retrieve list of branches in repository. Pridobi seznam vej v skladišču. - ... ... - Working Copy Delovna kopija - The path in which the directory containing the checkout will be created. Mapa, v kateri bo ustvarjena mapa s prevzeto izvorno kodo. - Checkout path: Pot za prevzem: - The local directory that will contain the code after the checkout. Krajevna mapa, ki bo po prevzemu vsebovala izvorno kodo. - Checkout directory: Mapa za prevzem: @@ -11518,7 +10856,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - Cvs + ::CVS Checks out a CVS repository and tries to load the contained project. Prevzame skladišče CVS in poskusi naložiti vsebovani projekt. @@ -12347,9 +11685,6 @@ Razlog: %2 The .pro file could not be parsed. Datoteke *.pro ni bilo moč razčleniti. - - - ::RemoteLinux Executable: Izvršljiva datoteka: @@ -12376,9 +11711,6 @@ Razlog: %2 %1 exited with code %2 %1 je končal s kodo %2 - - - ::RemoteLinux Run in Emulator Zaženi v posnemovalniku @@ -12603,63 +11935,40 @@ Razlog: %2 - CommandMappings + ::Core Command Mappings Preslikava ukazov - - Command - Ukaz - - - - Label - Oznaka - - - Target Cilj - Import... Uvozi … - Export... Izvozi … - Target Identifier Identifikator cilja - Target: Cilj: - - Reset - Ponastavi - - - Reset all to default Vse ponastavi na privzeto - Reset All Ponastavi vse - Reset to default Ponastavi na privzeto @@ -12671,26 +11980,18 @@ Razlog: %2 ::CodePaster - Form - Obrazec - - - &Path: &Pot: - &Display: P&rikaz: - entries vnosov - The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted. Protokol za prilepljanje, ki temelji na Fileshare, omogoča souporabo izrezkov kode z uporabo preprostih datotek na deljenem omrežnem pogonu. Datoteke niso nikoli izbrisane. @@ -12824,37 +12125,30 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Splošni podatki - Repository: Skladišče: - repository skladišče - Branch: Veja: - branch veja - Commit Information Podatki o zapisu - Author: Avtor: - Email: E-pošta: @@ -12863,67 +12157,54 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Obrazec - Configuration Nastavitve - Command: Ukaz - User Uporabnik - Username to use by default on commit. Privzeto uporabljeno uporabniško ime za zapis. - Default username: Privzeto uporabniško ime: - Email to use by default on commit. Privzeto uporabljena e-pošta za zapis. - Default email: Privzeta e-pošta: - Miscellaneous Razno - Log count: Dolžina dnevnika: - The number of recent commit logs to show, choose 0 to see all enteries Število prikazanih najnovejših zapisov, za vse zapise vnesite 0. - Timeout: Razpoložljivi čas: - s s - Prompt on submit Vprašaj ob pošiljanju @@ -12936,12 +12217,10 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Povrni - Specify a revision other than the default? Določitev revizije, različne od privzete? - Revision: Revizija: @@ -12950,22 +12229,18 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Pogovorno okno - Default Location Privzeto mesto - Local filesystem: Krajevni datotečni sistem: - e.g. https://[user[:pass]@]host[:port]/[path] npr. https://[uporabnik[:geslo]@]gostitelj[:vrata]/[pot] - Specify Url: URL: @@ -12988,67 +12263,54 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Pogovorno okno - Type: Vrsta: - Animation Animacija - SpringFollow Vzmet - Settings Nastavitve - Duration: Trajanje: - Curve: Krivulja: - easeNone Brez - Source: Vir: - Velocity: Hitrost: - Spring: Vzmet: - Damping: Dušenje: - ID: ID: - Property name: Ime lastnosti: @@ -13068,12 +12330,10 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Besedilo - Style Slog - ... … @@ -13101,7 +12361,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Obrazec - Snapping Pripenjanje @@ -13114,22 +12373,18 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Odmik za pripenjanje: - Item spacing: Razmik predmetov: - Canvas Platno - Width Širina - Height Višina @@ -13156,57 +12411,46 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Velika: - Minor: Mala: - Patch: Popravek: - Package name: Ime paketa: - Package version: Različica paketa: - Short package description: Kratek opis paketa: - Name to be displayed in Package Manager: Ime za prikaz v upravljalniku paketov: - Icon to be displayed in Package Manager: Ikona za prikaz v upravljalniku paketov: - Size is 48x48 pixels Velikost je 48 ⨯ 48 pik - Adapt Debian file: Prilagodi datoteko za Debian-a: - Edit Uredi ... - Edit spec file Uredi datoteko z določili @@ -13242,52 +12486,42 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Nastavitev ključa SSH - Options Možnosti - Key algorithm: Algoritem za ključ: - Key Ključ - Key &size: &Velikost ključa: - &RSA &RSA - &DSA &DSA - &Generate SSH Key &Ustvari ključ SSH - Save P&ublic Key... Shrani &javni ključ ... - Save Pr&ivate Key... Shrani z&asebni ključ ... - &Close &Zapri @@ -13320,42 +12554,34 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Samo-podpisano potrdilo - Custom certificate: Potrdilo po meri: - Key file: Datoteka s ključem: - Not signed Ni podpisano - Choose certificate file Izberite datoteko s potrdilom - Create Smart Installer package Ustvari namestitveni paket Smart Installer - Resets saved passphrases for all used keys Ponastavi shranjene šifrirne fraze vseh uporabljenih ključev - Reset Passphrases Ponastavi šifrirne fraze - Certificate's details Podrobnosti potrdila @@ -13375,12 +12601,10 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Nastavite cilje za svoj projekt - Qt Creator can set up the following targets: Qt Creator lahko nastavi naslednje cilje: - <html><head/><body><p><b>No valid Qt versions found.</b></p><p>Please add a Qt version in <i>Tools/Options</i> or via the maintenance tool of the SDK.</p></body></html> <html><head/><body><p><b>Najdene ni bilo nobene veljavne različice Qt.</b></p><p>Različico Qt lahko dodate z uporabo menija <i>Orodja → Možnosti</i> ali z orodjem za vzdrževanje paketa programov za razvoj programske opreme.</p></body></html> @@ -13424,52 +12648,42 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. V mapi »%2« ni bilo najdene nobene gradnje za projektno datoteko »%1«. - Specify basic information about the test class for which you want to generate skeleton source code file. Podajte osnovne podatke o razredu, za katerega želite ustvariti datoteko z ogrodjem izvorne kode. - Class name: Ime razreda: - Type: Vrsta: - Test Preizkus - Benchmark Meritev hitrosti - File: Datoteka: - Generate initialization and cleanup code Ustvari kodo za inicializacijo in čiščenje - Test slot: Preizkusno mesto: - Requires QApplication Potrebuje QApplication - Use a test data set Uporabi nabor podatkov za preizkus @@ -13525,57 +12739,45 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Cleaning %1 Čiščenje %1 - - - CommonSettingsPage Wrap submit message at: Sporočilo pošiljanja prelomi pri: - characters znaku - An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. Program, ki naj se kliče s sporočilom pošiljanja v začasni datoteki kot njegovim prvim argumentom. Vrne naj se s z izhodno kodo različno od 0 in sporočilom na izhodu za napake. - A file listing user names and email addresses in a 4-column mailmap format: name <email> alias <email> Datoteka s seznamom imen in e-poštnih naslovov v formatu mailmap s 4 stolpci: ime <e-pošta> drugo_ime <druga_e-pošta> - A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. Preprosta datoteka, ki vsebuje vrstice z imeni polj, kot je »Pregledal«, ki bodo dodani na konec urejevalnika pošiljanja. - Submit message &check script: Skript za &preverjanje sporočila pošiljanja: - User/&alias configuration file: N&astavitvena datoteka z uporabniki/aliasi: - User &fields configuration file: Nas&tavitvena datoteka s polji po meri: - &Patch command: Ukaz &patch: - Specifies a command that is executed to graphically prompt for a password, should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS). Določa ukaz, ki se izvede za grafični prikaz poziva za geslo, če skladišče @@ -13583,7 +12785,6 @@ potrebuje overjanje s pomočjo SSH. Oglejte si dokumentacijo za SSH in okoljsko spremenljivko SSH_ASKPASS. - &SSH prompt command: Ukaz za &SSH-jev poziv: @@ -14893,7 +14094,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - Cvs + ::CVS Annotate revision "%1" Dodaj opombo za revizijo »%1« @@ -14909,9 +14110,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Cdb CDB - - - ::Debugger Unable to start pdb '%1': %2 Ni moč zagnati PDB-ja »%1«: %2 @@ -14952,9 +14150,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 An unknown error in the Pdb process occurred. Prišlo je do neznane napake v procesu PDB. - - - ::Debugger Snapshots Posnetki @@ -15011,7 +14206,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - Find::FindPlugin + ::Core &Find/Replace &Najdi in zamenjaj @@ -15693,30 +14888,14 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Clone of %1 Klon od %1 - - - TargetSettingsPanelFactory Targets Cilji: - - - RunSettingsPanelFactory Run Settings Nastavitve za zagon - - - RunSettingsPanel - - Run Settings - Nastavitve za zagon - - - - ::ProjectExplorer Enter the name of the session: Vnesite ime seje: @@ -15951,7 +15130,7 @@ cilj »%1«? - FileWidget + ::QmlEditorWidgets Open File Odpri datoteko @@ -16386,16 +15565,10 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.Debugging Port: Vrata za razhroščevanje: - - - QmlManager <Current File> <trenutna datoteka> - - - ::QmlProjectManager Run QML Script Zaženi skript QML @@ -16976,77 +16149,62 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.Obrazec - Stretch vertically. Scales the image to fit to the available area. Raztegni navpično. Sliko prilagodi razpoložljivemu področju. - Repeat vertically. Tiles the image until there is no more space. May crop the last image. Ponavljaj navpično. Sliko tlakuje dokler ne zmanjka prostora. Zadnjo sliko po potrebi obreže. - Round. Like Repeat, but scales the images down to ensure that the last image is not cropped. Zaokroži. Podobno ponavljanju, le da slike zmanjša in tako zagotovi, da zadnja slika ni obrezana. - Repeat horizontally. Tiles the image until there is no more space. May crop the last image. Ponavljaj vodoravno. Sliko tlakuje dokler ne zmanjka prostora. Zadnjo sliko po potrebi obreže. - Stretch horizontally. Scales the image to fit to the available area. Raztegni vodoravno. Sliko prilagodi razpoložljivemu področju. - 10 x 10 10 ⨯ 10 - The image is scaled to fit Sliko je povsem prilagojena - The image is stretched horizontally and tiled vertically Slika je raztegnjena vodoravno in tlakovana navpično - The image is stretched vertically and tiled horizontally Slika je raztegnjena navpično in tlakovana vodoravno - The image is duplicated horizontally and vertically Slika je podvojena vodoravno in navpično - The image is scaled uniformly to fit without cropping Slika je enakomerno prilagojena brez obreza - The image is scaled uniformly to fill, cropping if necessary Slika je enakomerno prilagojena z obrezom po potrebi - Gradient Preliv - Color Barva - Border Rob @@ -17055,77 +16213,62 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.Pogovorno okno - Play simulation Predvajaj simulacijo - Easing Prehod - Type of easing curve Vrsta prehodne krivulje - Subtype Podvrsta - Acceleration or deceleration of easing curve Pospešek ali pojemek prehodne krivulje - Duration Trajanje - Duration of animation Trajanje animacije - INVALID NEVELJAVNO - ms ms - Amplitude Amplituda - Amplitude of elastic and bounce easing curves Amplituda elastičnih in odbojnih prehodnih krivulj - Period Perioda - Easing period of an elastic curve Prehodna perioda elastične krivulje - Overshoot Prekoračitev - Easing overshoot for a back curve Prekoračitev prehoda za povratno krivuljo @@ -17137,57 +16280,46 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.Zaženi razhroščevalnik - Remote Oddaljen - Host: Gostitelj: - User: Uporabnik: - You need to pass either a password or an SSH key. Podati morate geslo ali ključ SSH. - Password: Geslo: - Port: Vrata: - Private key: Zasebni ključ: - Target Cilj - Executable: Izvršljiva datoteka: - Arguments: Argumenti: - Working directory: Delovna mapa: @@ -17199,39 +16331,32 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.Splošni podatki - Branch: Veja: - Perform a local commit in a bound branch. Local commits are not pushed to the master branch until a normal commit is performed. Izvedi krajevni zapis v povezano vejo. Krajevnih zapisov se v vejo »master« ne potisne dokler ni izvršen običajen zapis. - Local commit Krajevni zapis - Commit Information Podatki o zapisu - Author: Avtor: - Email: E-pošta: - Fixed bugs: Odpravljene napake: @@ -17239,66 +16364,54 @@ Krajevnih zapisov se v vejo »master« ne potisne dokler ni izvršen običajen z ::Bazaar - By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed. Če ciljna mapa obstaja in ne vsebuje nadzorne mape, ustvarjanje veje privzeto ne bo uspelo. Ta možnost omogoči, da se ustvarjanje veje nadaljuje. - Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations. Ustvari naloženo vajo, ki se nanaša na izvorno vejo. Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje. - Stacked Naložena - Do not use a shared repository, even if available. Ne uporabljaj deljenega skladišča, četudi je na voljo. - Standalone Samostojno - Bind new branch to source location Novo vejo poveži z izvornim mestom - Switch the checkout in the current directory to the new branch. Prevzeto v trenutni mapi preklopi na novo vejo. - Switch checkout Preklopi prevzeto - Hard-link working tree files where possible. Če je možno, datoteke v delovnem drevesu poveži trdo. - Hardlink Poveži trdo - Create a branch without a working-tree. Ustvari vejo brez delovnega drevesa. - No working-tree Brez delovnega drevesa @@ -17307,67 +16420,54 @@ Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje.Obrazec - Configuration Nastavitve - Command: Ukaz: - User Uporabnik - Username to use by default on commit. Privzeto uporabljeno uporabniško ime za zapis. - Default username: Privzeto uporabniško ime: - Email to use by default on commit. Privzeto uporabljena e-pošta za zapis. - Default email: Privzeta e-pošta: - Miscellaneous Razno - Log count: Dolžina dnevnika: - The number of recent commit logs to show. Choose 0 to see all entries. Število prikazanih najnovejših zapisov. Za prikaz vseh zapisov vnesite 0. - Timeout: Razpoložljivi čas: - s s - Prompt on submit Vprašaj ob pošiljanju @@ -17376,87 +16476,71 @@ Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje.Pogovorno okno - Branch Location Mesto veje - Default location Privzeto mesto - Local filesystem: Krajevni datotečni sistem: - For example: https://[user[:pass]@]host[:port]/[path] Na primer: https://[uporabnik[:geslo]@]gostitelj[:vrata]/[pot] - Specify URL: URL: - Options Možnosti - Remember specified location as default Navedeno mesto si zapomni kot privzeto - Ignore differences between branches and overwrite unconditionally. Prezri razlike med vejami in brezpogojno nadomesti. - Overwrite Nadomesti - By default, push will fail if the target directory exists, but does not already have a control directory. This flag will allow push to proceed. Če ciljna mapa obstaja in ne vsebuje nadzorne mape, potiskanje privzeto ne bo uspelo. Ta možnost omogoči, da se potiskanje nadaljuje. - Use existing directory Uporabi obstoječo mapo - Create the path leading up to the branch if it does not already exist. Ustvari pot, ki vodi do veje, če pot ne obstaja. - Create prefix Ustvari predpono - Revision: Različica: - Perform a local pull in a bound branch. Local pulls are not applied to the master branch. Izvedi krajevni poteg v povezano vejo. Krajevnih potegov se v vejo »master« ne uveljavi. - Local Krajevno @@ -17476,7 +16560,6 @@ Krajevnih potegov se v vejo »master« ne uveljavi. Povrnitev - Specify a revision other than the default? Ali ste poskusili navesti različico, ki je različna od privzete? @@ -17499,42 +16582,34 @@ Krajevnih potegov se v vejo »master« ne uveljavi. Obrazec - Add tool Dodaj orodje - Remove tool Odstrani orodje - Revert tool to default Povrni orodje na privzeto - Description: Opis: - Executable: Izvršljiva datoteka: - Arguments: Argumenti: - Working directory: Delovna mapa: - <html><head/><body> <p>What to do with the executable's standard output. <ul><li>Ignore: Do nothing with it</li><li>Show in pane: Show it in the general output pane</li><li>Replace selection: Replace the current selection in the current document with it</li></ul></p></body></html> @@ -17548,27 +16623,22 @@ Krajevnih potegov se v vejo »master« ne uveljavi. - Output: Izhod: - Ignore Prezri - Show in Pane Prikaži v podoknu - Replace Selection Zamenjaj izbor - <html><head><body> <p >What to do with the executable's standard error output.</p> <ul><li>Ignore: Do nothing with it</li> @@ -17584,27 +16654,22 @@ Krajevnih potegov se v vejo »master« ne uveljavi. - Error output: Izhod za napake: - Text to pass to the executable via standard input. Leave empty if the executable should not receive any input. Besedilo, ki bo izvršljivi datoteki podano prek standardnega vhoda. Če izvršljiva datoteka ne potrebuje nobenega vhoda, pustite prazno. - Input: Vhod: - If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished. Če orodje spremeni trenutni dokument, izberite to možnost in tako zagotovite, da se dokument pred zagonom orodja shrani in po koncu znova naloži. - Modifies current document Spremeni trenutni dokument @@ -17616,130 +16681,67 @@ Krajevnih potegov se v vejo »master« ne uveljavi. Add Category Dodaj kategorijo - - - MimeTypeMagicDialog Dialog Pogovorno okno - Value: Vrednost: - Type Vrsta - String Niz - Byte Bajt - Use Recommended Uporabi priporočeno - Start range: Začetek obsega: - End range: Konec obsega: - Priority: Prednost: - <i>Note: Wide range values might impact Qt Creator's performance when opening files.</i> <i>Opomba: dolgi obsegi lahko pri odpiranju datotek vplivajo na hitrost delovanja Qt Creator-ja.</i> - - - MimeTypeSettingsPage - Form - Obrazec - - - Registered MIME Types Registrirane vrste MIME - Reset all to default. Vse ponastavi na privzeto. - - Reset All - Ponastavi vse - - - - Details - Podrobnosti - - - Patterns: Vzorci: - - Magic Header - Rokovalnik z značilkami - - - - Type - Vrsta - - - Range Obseg - Priority Prednost - - Add - Dodaj ... - - - - Edit - Uredi ... - - - - Remove - Odstrani - - - - ::Core - - Select a variable to insert. Izberite spremenljivko za vstaviti. @@ -17755,134 +16757,110 @@ Krajevnih potegov se v vejo »master« ne uveljavi. Obrazec - General Splošno - Content Vsebina - Indent Zamakni - "public", "protected" and "private" within class body »public«, »protected» in »private« v telesu razreda - Declarations relative to "public", "protected" and "private" Deklaracije glede na »public«, »protected« in »private« - Statements within method body Stavke v telesu metode - Statements within blocks Stavke v blokih - Declarations within "namespace" definition Deklaracije v definicijah »namespace« - Braces Oklepaji - Indent Braces Zamakni oklepaje - Class declarations Deklaracij razredov - Namespace declarations Deklaracij imenskih prostorov - Enum declarations Deklaracij oštevilčenj - Method declarations Deklaracij metod - Blocks Blokov - "switch" »switch« - Indent within "switch" v »switch« zamakni - "case" or "default" »case« in »default« - Statements relative to "case" or "default" Stavke glede na »case« in »default« - Blocks relative to "case" or "default" Bloke glede na »case« in »default« - "break" statement relative to "case" or "default" Stavek »break« glede na »case« in »default« - Alignment Poravnava - Align Poravnaj - <html><head/><body> Enables alignment to tokens after =, += etc. When the option is disabled, regular continuation line indentation will be used.<br> <br> @@ -17913,12 +16891,10 @@ a = a + </body></html> - Align after assignments Poravnaj po prireditvah - <html><head/><body> The extra padding usually only affects if statement conditions. Without extra padding: <pre> @@ -17949,7 +16925,6 @@ if (a && </body></html> - Add extra padding to conditions if they would align to the next line Pogojem dodaj praznino, če bi @@ -17967,102 +16942,82 @@ se poravnali z naslednjo vrstico Urejanje lastnosti prekinitvene točke - Basic Osnovno - Breakpoint &type: &Vrsta prekinitvene točke: - &File name: Ime &datoteke: - &Line number: &Številka vrstice - &Enabled: &Omogočena - &Address: &Naslov - &Expression: &Izraz: - Fun&ction: &Funkcija: - Advanced Napredno - T&racepoint only: &Samo sledilna točka: - Pat&h: &Pot: - &Module: &Modul: - &Command: &Ukaz: - Use Engine Default Uporabi privzeto za pogon - Use Full Path Uporabi celotno pot - Use File Name Uporabi ime datoteke - &Message: Spo&ročilo: - C&ondition: P&ogoj: - &Ignore count: &Število prezrtij: - &Thread specification: &Določitev niti: @@ -18136,39 +17091,33 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Omogoči LLDB - Use GDB Python dumpers Uporabi GDB-jeve Python odlagalnike - StartRemoteEngineDialog + ::Debugger Start Remote Engine Zaženi oddaljen pogon - &Host: &Gostitelj: - &Username: &Uporabniško ime: - &Password: G&eslo: - &Engine path: &Pot do pogona: - &Inferior path: P&ot do podprocesa: @@ -18180,12 +17129,10 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Pogovorno okno - Branch Name: Ime veje: - CheckBox PotrditvenoPolje @@ -18202,12 +17149,10 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Dodajanje oddaljene - Name: Ime: - URL: URL: @@ -18216,7 +17161,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Oddaljene - F&etch &Pridobi @@ -18236,25 +17180,13 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Nastavitev filtra - Prefix: Predpona: - Limit to prefix Omeji na predpono - - - Add - Dodaj - - - - Remove - Odstrani - Double-click to edit item. Dvokliknite za urejanje postavke. @@ -18271,27 +17203,22 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Prikaži ozadje - Show outline Prikaži obris - Fit image in the screen Prilagodi sliko zaslonu - Original size Izvirna velikost - Zoom In Približaj - Zoom Out Oddalji @@ -18303,37 +17230,30 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Obrazec - Preferences Lastnosti - Name Ime - Description Opis - Shortcut Bližnjica - Remove Odstrani - Macro Makro - Description: Opis: @@ -18342,7 +17262,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Shrani makro - Name: Ime: @@ -18350,7 +17269,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. ::ProjectExplorer - Language: Jezik: @@ -18359,7 +17277,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Izbor čarovnika za objavo - Available Wizards: Razpoložljivi čarovniki: @@ -18371,23 +17288,14 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Publishing is currently not possible for project '%1'. Objavljanje za projekt »%1« trenutno ni možno. - - - ToolChainOptionsPage Add Dodaj - Clone Podvoji - - - Remove - Odstrani - text @@ -18411,50 +17319,40 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. - ComponentNameDialog + ::QmlJSEditor Dialog Pogovorno okno - Component name: Ime komponente: - Path: Pot: - Choose... Izbor ... - - - ::QmlJSEditor Form Obrazec - Qt Quick Toolbars Orodjarne Qt Quick - If enabled, the toolbar will remain pinned to an absolute position. Če je omogočeno, bo orodjarna ostala pripeta na absolutni položaj. - Pin Qt Quick Toolbar Pripni orodjarno Qt Quick - Always show Qt Quick Toolbar Vedno prikaži orodjarno Qt Quick @@ -18464,7 +17362,7 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. - StatusDisplay + ::QmlProfiler No QML events recorded Zabeleženega ni nobenega dogodka QML @@ -18492,17 +17390,14 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Pogovorno okno - Address: Naslov - 127.0.0.1 127.0.0.1 - Port: Vrata: @@ -18514,112 +17409,90 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Knjižnica: - Library file: Datoteka knjižnice: - Include path: Pot do vključitev: - Package: Paket: - Platform Platforma - Linux GNU/Linux - Mac Mac - Windows Windows - Symbian Symbian - Linkage: Povezovanje: - Dynamic Dinamično - Static Statično - Library Knjižnica - Framework Ogrodje - Windows: Windows: - Library inside "debug" or "release" subfolder Knjižnica znotraj podmape »debug« ali »release« - Add "d" suffix for debug version Razhroščevalni inačici dodaj pripono »d« - Remove "d" suffix for release version Različici za izdajo odstrani pripono »d« - ARM &version: &Različica ARM: - Version 5 Različica 5 - Version 6 Različica 6 - &Compiler path: &Pot do prevajalnika: - Environment Variables Okoljske spremenljivke @@ -18630,81 +17503,61 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Details of Certificate Podrobnosti potrdila - - - ::RemoteLinux - Choose a build configuration: Izberite nastavitev gradnje: - Choose a tool chain: Izberite zaporedje orodij: - Only Qt versions above 4.6.3 are made available in this wizard. Previous Qt versions have limitations in building suitable SIS files. V tem čarovniku so na voljo samo različice Qt, ki so novejše kot 4.6.3. Starejše različice so pri gradnji ustreznih datotek SIS omejene. - - - ::RemoteLinux - Localised Vendor Names Lokalizirana imena proizvajalca - Current Global Vendor Name Trenutno globalno ime proizvajalca - Display name: Ime za prikaz: - Localised vendor names: Lokalizirana imena proizvajalca: - Capabilities: Zmožnosti: - Current UID3 Trenutni UID3 - Application UID: UID programa: - Current Qt Version Trenutna različica Qt - Qt version used in builds: Različica Qt uporabljena pri gradnji: - Current set of capabilities Trenutni nabor zmožnosti - Global vendor name: Globalno ime proizvajalca: @@ -18716,17 +17569,14 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. Pogovorno okno - Compiler path: Pot do prevajalnika: - System include path: Pot do sistemskih vključitev: - System library path: Pot do sistemskih knjižnic: @@ -18738,47 +17588,38 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. StranČarovnika - Main HTML File Glavna datoteka HTML - Generate an index.html file Ustvari datoteko index.html - Import an existing .html file Uvozi obstoječo datoteko *.html - Load a URL Naloži URL - http:// http:// - Note: Unless you chose to load a URL, all files and directories that reside in the same directory as the main HTML file are deployed. You can modify the contents of the directory any time before deploying. Opomba: Če ne izberete nalaganja URL-ja, bodo razmeščene vse datoteke in mape, ki se nahajajo v isti mapi kot glavna datoteka HTML. Vsebino mape lahko spremenite kadarkoli pred razmeščanjem - Touch optimized navigation Krmarjenje prilagojeno za dotik - Enable touch optimized navigation Omogoči krmarjenje prilagojeno za dotik - Touch optimized navigation will make the HTML page flickable and enlarge the area of touch sensitive elements. If you use a JavaScript framework which optimizes the touch interaction, leave the checkbox unchecked. Če je krmarjenje prilagojeno za dotik, potem bo stran HTML možno krcniti, na dotik občutljivi elementi pa bodo imeli večjo površino. V primeru uporabe ogrodja JavaScript, ki je prilagojeno interakciji z dotikom, pustite možnost onemogočeno. @@ -18790,7 +17631,6 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. StranČarovnika - Orientation behavior: Obnašanje usmerjenosti: @@ -18802,7 +17642,6 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. StranČarovnika - Application icon (%%w%%x%%h%%): Ikona programa (%%w%%⨯%%h%%): @@ -18814,17 +17653,14 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. StranČarovnika - Application icon (.svg): Ikona programa (*.svg) - Target UID3: Ciljni UID3: - Enable network access Omogoči omrežni dostop @@ -18836,17 +17672,14 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. StranČarovnika - Target UID3: Ciljni UID3: - Plugin's directory name: Ime mape vstavka: - Enable network access Omogoči omrežni dostop @@ -18858,27 +17691,22 @@ Starejše različice so pri gradnji ustreznih datotek SIS omejene. Vrsta programa Qt Quick - Built-in elements only (for all platforms) Samo vgrajeni elementi (za vse platforme) - Qt Quick Components for Symbian Komponente Qt Quick za Symbian - Qt Quick Components for Meego/Harmattan Komponente Qt Quick za MeeGo/Harmattan - Use an existing .qml file Uporabi obstoječo datoteko *.qml - The built-in elements in the QtQuick namespace allow you to write cross-platform applications with a custom look and feel. Requires Qt 4.7.1 or newer. @@ -18887,7 +17715,6 @@ Requires Qt 4.7.1 or newer. Potreben je Qt 4.7.1 ali novejši. - 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. @@ -18896,7 +17723,6 @@ Requires Qt 4.7.3 or newer, and the component set installed for your Qt version. Potreben je Qt 4.7.3 ali novejši in nabor komponent za vašo različico Qt. - The Qt Quick Components for Meego/Harmattan are a set of ready-made components that are designed with specific native appearance for the Meego/Harmattan platform. Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. @@ -18905,7 +17731,6 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt. - 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. Razmeščene bodo vse datoteke in mape, ki se nahajajo v isti mapi kot glavna datoteka QML. Vsebino mape lahko spremenite kadarkoli pred razmeščanjem. @@ -18917,148 +17742,113 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Uporabljeno za ugotovitev podatkov o vrsti QML iz vstavkov na osnovi knjižnic. - QML Dump: QML Dump: - A modified version of qmlviewer with support for QML/JS debugging. Prilagojena različica programa qmlviewer s podporo za razhroščevanje QML/JS. - QML Observer: QML Observer: - Build Zgradi - QML Debugging Library: Razhroščevalna knjižnica QML: - Helps showing content of Qt types. Only used in older versions of GDB. Pomaga pri prikazu vsebine tipov Qt. Uporabljeno le za starejše različice GDB. - GDB Helper: Pomočnik GDB: - Show compiler output of last build. Prikaži izhod prevajalnika za zadnjo gradnjo. - Show Log Prikaži dnevnik - Compile debugging helpers that are checked. Zgradi izbrane razhroščevalne pomočnike. - Build All Zgradi vse - - - ::QtSupport Version name: Ime različice: - qmake location: Mesto qmake: - Edit Uredi - - - ::QtSupport Name Ime - qmake Location Mesto qmake - Add Dodaj ... - Remove Odstrani - Clean up Počisti - GenericLinuxDeviceConfigurationWizardSetupPage + ::RemoteLinux WizardPage StranČarovnika - The name to identify this configuration: Ime za identifikacijo te nastavitve: - The device's host name or IP address: Gostiteljsko ime ali naslov IP naprave: - The user name to log into the device: Uporabniško ime za prijavo v napravo: - The authentication type: Vrsta overjanja: - Password Geslo - - Key - Ključ - - - The user's password: Geslo uporabnika: - The file containing the user's private key: Datoteka z uporabnikovim zasebnim ključem: @@ -19070,7 +17860,6 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Izbor čarovnika za nastavitev naprave - Available device types: Razpoložljive vrste naprav: @@ -19082,37 +17871,30 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Obrazec - Device configuration: Nastavitev naprave: - <a href="irrelevant">Manage device configurations</a> <a href="irrelevant">Upravljanje nastavitev naprave</a> - These show the INSTALLS settings from the project file(s). Te prikazujejo nastavitve INSTALLS iz projektnih datotek. - Files to install for subproject: Datoteke za namestiti za podprojekt: - Edit the project file to add or remove entries. Za dodajanje in odstranjevanje postavk uredite projektno datoteko. - Add Desktop File Dodaj datoteko za namizje - Add Launcher Icon... Dodaj ikono za zaganjalnik ... @@ -19124,127 +17906,102 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Nastavitve naprave Maemo - &Configuration: &Nastavitev: - &Name: &Ime: - Device type: Vrsta naprave: - Authentication type: Vrsta overjanja: - Password Geslo - &Key &Ključ - &Host name: Ime &gostitelja: - IP or host name of the device IP ali ime gostitelja naprave - &SSH port: Vrata &SSH: - Free ports: Prosta vrata: - You can enter lists and ranges like this: 1024,1026-1028,1030 Vnesete lahko sezname in obsege, npr tako: 1024,1026-1028,1030 - TextLabel BesedilnaOznaka - Connection time&out: Razpoložljivi &čas za povezavo: - s s - &Username: &Uporabniško ime: - &Password: &Geslo: - Show password Prikaži geslo - Private key file: Datoteka z zasebnim ključem: - Set as Default Nastavi kot privzeto - OS type: Vrsta OS-a: - &Add &Dodaj - &Remove &Odstrani - Set As Default Nastavi kot privzeto - Click here if you do not have an SSH key yet. Kliknite, če še nimate ključa SSH. - &Generate SSH Key... &Ustvari ključ SSH … @@ -19256,17 +18013,14 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - 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". Qt Creator bo sedaj ustvaril nov par ključev. Vnesite mapo, v katero bosta shranjena ključa, in kliknite »Ustvari ključa«. - Directory: Mapa: - Create Keys Ustvari ključa @@ -19278,7 +18032,6 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - To deploy the public key to your device, please execute the following steps: <ul> <li>Connect the device to your computer (unless you plan to connect via WLAN).</li> @@ -19297,17 +18050,14 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt. - Device address: Naslov naprave: - Password: Geslo: - Deploy Key Razmesti ključ @@ -19319,17 +18069,14 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - Has a passwordless (key-based) login already been set up for this device? Ali je prijava brez gesla (s pomočjo ključa) na tej napravi že bila nastavljena? - Yes, and the private key is located at Da, zasebni ključ se nahaja v - No Ne @@ -19341,27 +18088,22 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - Do wou want to re-use an existing pair of keys or should a new one be created? Ali želite uporabiti obstoječ par ključev ali naj bo ustvarjen nov par? - Re-use existing keys Uporabi obstoječa ključa - File containing the public key: Datoteka, ki vsebuje javni ključ: - File containing the private key: Datoteka, ki vsebuje zasebni ključ: - Create new keys Ustvari nova ključa @@ -19373,37 +18115,30 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - The name to identify this configuration: Ime za identifikacijo te nastavitve: - The system running on the device: Sistem, ki teče na tej napravi: - The kind of device: Vrsta naprave: - Emulator Posnemovalnik - Hardware Device Strojna naprava - The device's host name or IP address: Gostiteljsko ime ali naslov IP naprave: - The SSH server port: Vrata strežnika SSH: @@ -19415,17 +18150,14 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Težava razmeščanja na Maemo - The project files listed below do not contain Maemo deployment information, which means the respective targets cannot be deployed to and/or run on a device. Qt Creator will add the missing information to these files if you check the respective rows below. Spodaj naštete projektne datoteke ne vsebujejo podatkov za razmestitev na Maemo. To pomeni, da ustreznih ciljev na napravo ni moč razmestit ali jih na napravi ni moč poganjati.Če spodaj izberete ustrezne postavke, bo Qt Creator v te datoteke dodal manjkajoče podatke. - &Check all Izberi &vse - &Uncheck All &Odizberi vse @@ -19437,12 +18169,10 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - Choose build configuration: Izberite nastavitev za gradnjo: - Only create source package, do not upload Samo ustvari izvorni paket, ne pošiljaj @@ -19454,7 +18184,6 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Izberite vsebino paketa - <b>Please select the files you want to be included in the source tarball.</b> <b>Izberite datoteke, ki jih želite vključiti v izvorni arhiv.</b> @@ -19468,7 +18197,6 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - Progress Napredek @@ -19480,37 +18208,30 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.StranČarovnika - Upload Settings Nastavitve pošiljanja - Garage account name: Ime računa Garage: - <a href="https://garage.maemo.org/account/register.php">Get an account</a> <a href="https://garage.maemo.org/account/register.php">Dobi račun</a> - <a href="https://garage.maemo.org/extras-assistant/index.php">Request upload rights</a> <a href="https://garage.maemo.org/extras-assistant/index.php">Zaprosi za pravico pošiljanja</a> - Private key file: Datoteka z zasebnim ključem: - Server address: Naslov strežnika: - Target directory on server: Ciljna mapa na strežniku: @@ -19522,22 +18243,18 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Obrazec - OpenGL Mode Način OpenGL - &Hardware acceleration &Strojno pospeševanje - &Software rendering &Programsko izrisovanje - &Auto-detect Samodejno &zaznaj @@ -19549,17 +18266,14 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Seznam oddaljenih procesov - &Filter by process name: &Filtriraj po imenu procesa: - &Update List &Posodobi seznam - &Kill Selected Process &Ubij izbrani proces @@ -19578,62 +18292,50 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Dejanja čiščenja, ki se samodejno izvedejo tik pred shranjevanjem datoteke na disk. - Cleanups Upon Saving Čiščenje pred shranjevanjem - Removes trailing whitespace upon saving. Pred shranjevanjem odstrani presledke na koncu vrstic. - &Clean whitespace &Počisti presledke - Clean whitespace in entire document instead of only for changed parts. Počisti presledke v celotnem dokumentu in ne samo v spremenjenih vrsticah. - In entire &document V celotnem &dokumentu - Correct leading whitespace according to tab settings. Popravi presledke na začetku vrstic v skladu z nastavitvami tabulatorja. - Clean indentation Počisti zamikanje - &Ensure newline at end of file &Zagotovi novo vrstico na koncu datoteke - File Encodings Kodiranja datotek - Default encoding: Privzeto kodiranje: - UTF-8 BOM: UTF-8 BOM: - <html><head/><body> <p>How text editors should deal with UTF-8 Byte Order Marks. The options are:</p> <ul ><li><i>Add If Encoding Is UTF-8:</i> always add a BOM when saving a file in UTF-8 encoding. Note that this will not work if the encoding is <i>System</i>, as Qt Creator does not know what it actually is.</li> @@ -19650,32 +18352,26 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt. - Add If Encoding Is UTF-8 Dodaj, če je kodiranje UTF-8 - Keep If Already Present Obdrži, če je že prisoten - Always Delete Vedno odstrani - Mouse Miška - Enable &mouse navigation Omogoči krmarjenje z &miško - Enable scroll &wheel zooming Omogoči po&večevanje/zmanjševanje s koleščkom @@ -19687,39 +18383,32 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Obrazec - <html><head/><body> <p>Highlight definitions are provided by the <a href="http://kate-editor.org/">Kate Text Editor</a>.</p></body></html> <html><head/><body> <p>Določila za poudarjanje so na voljo zahvaljujoč KDE-jevemu <a href="http://kate-editor.org/">urejevalniku besedil Kate</a>.</p></body></html> - Syntax Highlight Definition Files Datoteke z določili za poudarjanje skladnje - Location: Mesto: - Use fallback location Uporabi dodatno mesto: - Behavior Obnašanje - Alert when a highlight definition is not found Opozori, ko določila za poudarjanje ni moč najti - Ignored file patterns: Prezri vzorce datotek: @@ -19731,27 +18420,22 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Pogovorno okno - Definitions Določila - Select All Izberi vse - Clear Selection Počisti izbor - Invert Selection Obrni izbor - Download Selected Definitions Prenesi izbrana določila @@ -19763,32 +18447,26 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Obrazec - Group: Skupina: - Add Dodaj - Remove Odstrani - Revert Built-in Povrni vgrajene - Restore Removed Built-ins Obnovi odstranjene vgrajene - Reset All Ponastavi vse @@ -19797,57 +18475,46 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt.Nastavitve tabulatorja: - Tabs And Indentation Tabulator in zamikanje - Insert &spaces instead of tabs Vstavi &presledke in ne tabulatorjev - Automatically determine based on the nearest indented line (previous line preferred over next line) Ugotovi samodejno glede na najbližjo zamaknjeno vrstico (predhodna vrstica ima prednost pred naslednjo) - Based on the surrounding lines Temelječe na okoliških vrsticah - Ta&b size: Velikost &tabulatorja: - &Indent size: Velikost &zamika: - Enable automatic &indentation Omogoči &samodejno zamikanje - Backspace will go back one indentation level instead of one space. Vračalka gre nazaj za en zamik in ne za en presledek. - &Backspace follows indentation &Vračalka sledi zamikom - Align continuation lines: Poravnava nadaljevalnih vrstic: - <html><head/><body> Influences the indentation of continuation lines. @@ -19901,37 +18568,26 @@ Vpliva na zamik nadaljevalnih vrstic. </ul></body></html> - Not At All Brez - With Spaces S presledki - With Regular Indent Z običajnim zamikanjem - Tab key performs auto-indent: Tabulator izvede samodejni zamik: - Never Nikoli - - Always - Vedno - - - In Leading White Space V praznini na začetku @@ -19943,12 +18599,10 @@ Vpliva na zamik nadaljevalnih vrstic. Pogovorno okno - Suppression File: Datoteka za onemogočanje: - Suppression: Onemogočanje: @@ -19960,75 +18614,59 @@ Vpliva na zamik nadaljevalnih vrstic. Save Suppression Shrani onemogočanje - - - ::Valgrind Generic Settings Splošne nastavitve - Valgrind executable: Izvršljiva datoteka Valgrind: - Memory Analysis Options Možnosti za preučevanje pomnilnika - Backtrace frame count: Število okvirjev v povratni sledi: - Suppression files: Datoteke za onemogočanje: - Add... Dodaj ... - Remove Odstrani - Track origins of uninitialized memory Spremljaj izvore neinicializiranega pomnilnika - Profiling Options Možnosti profiliranja - Limits the amount of results the profiler gives you. A lower limit will likely increase performance. Omeji količino rezultatov, ki jih vrne profilirnik. Nižja omejitev bo verjetno prinesla pohitritev. - Result view: Minimum event cost: Prikaz rezultatov: najmanjša cena dogodka: - % % - Show additional information for events in tooltips Dodatne podatke o dogodkih prikaži v namigih - <html><head/><body> <p>Does full cache simulation.</p> <p>By default, only instruction read accesses will be counted ("Ir").</p> @@ -20053,12 +18691,10 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: </body></html> - Enable cache simulation Omogoči simulacijo predpomnilnika - <html><head/><body> <p>Do branch prediction simulation.</p> <p>Further event counters are enabled: </p> @@ -20075,32 +18711,26 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: (»Bi«/»Bim«)</li></ul></body></html> - Enable branch prediction simulation Omogoči simulacijo napovedovanja skokov - Collect information for system call times. Zbiraj podatke o časih sistemskih klicev - Collect system call time Zbiraj čase sistemskih klicev - Collect the number of global bus events that are executed. The event type "Ge" is used for these events. Zbiraj število globalnih izvršenih dogodkov na vodilu. Za te dogodke se uporablja tip dogodkov »Ge«. - Collect global bus events Zbiraj globalne dogodke na vodilu - Visualisation: Minimum event cost: Upodobitev: najmanjša cena dogodka: @@ -20605,7 +19235,7 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: - develop + ::ProjectExplorer Manage Sessions... Upravljanje s sejami ... @@ -20635,7 +19265,7 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: - ExampleDelegate + ::Core Tags: Oznake: @@ -20675,14 +19305,11 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: - RecentProjects + ::ProjectExplorer Recently Edited Projects Nazadnje urejeni projekti - - - RecentSessions Recently Used Sessions Nazadnje uporabljene seje @@ -20733,10 +19360,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: double click for preview Dvokliknite za ogled - - Open File - Odpri datoteko - ::QmlJS @@ -21535,9 +20158,6 @@ Would you like to overwrite them? %1. Ali jih želite nadomestiti? - - - EditorManager Go Back Vrni se @@ -21546,21 +20166,6 @@ Ali jih želite nadomestiti? Go Forward Nadaljuj - - Close - Zapri - - - Next Open Document in History - Naslednji odprti dokument v zgodovini - - - Previous Open Document in History - Predhodni odprti dokument v zgodovini - - - - ::Core Could not find executable for '%1' (expanded '%2') @@ -21699,14 +20304,11 @@ Vedite: to lahko odstrani krajevno datoteko. - CheckUndefinedSymbols + ::CppEditor Expected a namespace-name Pričakovano ime imenskega prostora - - - ::CppEditor Sort Alphabetically Razvrsti po abecedi @@ -21786,7 +20388,7 @@ Vedite: to lahko odstrani krajevno datoteko. - Cvs + ::CVS Ignore whitespace Prezri presledke @@ -21874,9 +20476,6 @@ Vedite: to lahko odstrani krajevno datoteko. "Select Widget to Watch": Not supported in state '%1'. »Izberite gradnik za opazovanje«: v stanju »%1« ni podprto. - - - ::Debugger C++ exception Izjema C++ @@ -21905,9 +20504,6 @@ Vedite: to lahko odstrani krajevno datoteko. Console Konzola - - - ::Debugger <html><body><p>The remote CDB needs to load the matching Qt Creator CDB extension (<code>%1</code> or <code>%2</code>, respectively).</p><p>Copy it onto the remote machine and set the environment variable <code>%3</code> to point to its folder.</p><p>Launch the remote CDB as <code>%4 &lt;executable&gt;</code> to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p><pre>%5</pre></body></html> <html><body><p>Oddaljeni CDB mora naložiti ustrezno razširitev CDB za Qt Creator (<code>%1</code> ali <code>%2</code>).</p><p>Skopirajte jo na oddaljeni računalnik in okoljsko spremenljivko <code>%3</code> nastavite tako, da kaže na njeno mapo.</p><p>Oddaljeni CDB zaženite kot <code>%4 &lt;program&gt;</code>, da bo za komunikacijo uporabljal protokol TCP/IP.</p><p>Za komunikacijske parametre vnesite:</p><pre>%5</pre></body></html> @@ -21920,9 +20516,6 @@ Vedite: to lahko odstrani krajevno datoteko. &Connection: &Povezava: - - - ::Debugger Launching Zaganjanje @@ -22037,9 +20630,6 @@ Vedite: to lahko odstrani krajevno datoteko. Jump to Line %1 Skoči v vrstico %1 - - - ::Debugger Memory... Pomnilnik ... @@ -22092,9 +20682,6 @@ Details: %3 Zasilno bo uporabljen razhroščevalni pogon »%2«. Podrobnosti: %3 - - - ::Debugger 0x%1 hit Message tracepoint: Address hit. @@ -22423,9 +21010,6 @@ Podrobnosti: %3 Close Debugging Session Zapri razhroščevalno sejo - - - ::Debugger Debug Razhrošči @@ -22438,9 +21022,6 @@ Podrobnosti: %3 Unable to create a debugger engine of the type '%1' Ni moč ustvariti razhroščevalnega pogona vrste »%1« - - - ::Debugger <new source> <nov izvor> @@ -22501,9 +21082,6 @@ Podrobnosti: %3 Qt Sources Izvorna koda Qt - - - ::Debugger %1 (%2) %1 (%2) @@ -22512,39 +21090,24 @@ Podrobnosti: %3 <html><head/><body><table><tr><td>ABI:</td><td><i>%1</i></td></tr><tr><td>Debugger:</td><td>%2</td></tr> <html><head/><body><table><tr><td>ABI:</td><td><i>%1</i></td></tr><tr><td>Razhroščevalnik:</td><td>%2</td></tr> - - - ::Debugger Previous Predhodno - - - ::Debugger Debugging complex command lines is currently not supported on Windows. Razhroščevanje kompleksnih ukaznih vrstic trenutno v Windows ni podprto. - - - ::Debugger Starting executable failed: Zaganjanje izvršljive datoteke ni uspelo: - - - ::Debugger Attached to process %1. Priklopljen na proces %1. - - - ::Debugger The name of the binary file cannot be extracted from this core file. Imena izvršljive datoteke iz tega posnetka ni moč izvleči. @@ -22587,9 +21150,6 @@ Podrobnosti: %3 Priklop na posnetek »%1« ni uspel: - - - ::Debugger Cannot set up communication with child process: %1 Ni moč vzpostaviti komunikacije s podprocesom: %1 @@ -22600,9 +21160,6 @@ Setting breakpoints by file name and line number may fail. To najverjetneje ni gradnja za razhroščevanje. Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne bo uspelo. - - - ::Debugger Connection failure: %1. Napaka glede povezave: %1. @@ -22623,9 +21180,6 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne Remote GDB crashed. Oddaljeni GDB se je sesul. - - - ::Debugger The upload process failed to start. Shell missing? Proces pošiljanja se ni uspel zagnati. Morda manjka lupina? @@ -22664,16 +21218,10 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne Branje razhroščevalnih podatkov ni uspelo: - - - ::Debugger Fatal engine shutdown. Incompatible binary or IPC error. Usodna zaustavitev pogona. Nezdružljiv program ali napaka pri medprocesni komunikaciji. - - - ::Debugger qtcreator-lldb failed to start: %1 Zagon qtcreator-lldb ni uspel: %1 @@ -22686,16 +21234,10 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne SSH connection error: %1 Napaka glede povezave SSH: %1 - - - ::Debugger LLDB LLDB - - - ::Debugger Clear Contents Počisti vsebino @@ -22704,16 +21246,10 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne Save Contents Shrani vsebino - - - ::Debugger Type Ctrl-<Return> to execute a line. Da izvršite vrstico, pritisnite Ctrl+Vnašalka - - - ::Debugger Debugger Log Dnevnik razhroščevalnika @@ -22722,9 +21258,6 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne Log File Dnevniška datoteka - - - ::Debugger Memory at 0x%1 Pomnilnik na 0x%1 @@ -22737,9 +21270,6 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne The memory contents cannot be shown as no viewer plugin for binary data has been loaded. Vsebine pomnilnika ni moč prikazati, saj ni bil naložen noben vstavek za dvojiške podatke. - - - ::Debugger Memory at Register '%1' (0x%2) Pomnilnik na naslovu registra »%1« (0x%2) @@ -22748,9 +21278,6 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne Register '%1' Register »%1« - - - ::Debugger Connecting to debug server on %1 Povezovanje z razhroščevalnim strežnikom na %1 @@ -22802,9 +21329,6 @@ Nastavljanje prekinitvenih točk z imenom datoteke in številko vrstice morda ne Not connected to debug service '%1'. Brez povezave z razhroščevalno storitvijo »%1«. - - - ::Debugger The slave debugging engine required for combined QML/C++-Debugging could not be created: %1 Podrejenega razhroščevalnega pogona, ki je potreben za razhroščevanje kombinacije QML in C++, ni bilo moč ustvariti: %1 @@ -22823,9 +21347,6 @@ Suggestions: Move the breakpoint after QmlViewer initialization or switch to C++ Izvajanja pred zagonom pogona QML ni moč ustaviti. Preskakujem prekinitveno točko. Predlogi: prestavite prelomno točko za inicializacijo QmlViewerja ali pa preklopite na razhroščevanje samo za C++. - - - ::Debugger QML Debugger connected. Razhroščevalnik QML je povezan. @@ -22892,9 +21413,6 @@ Ali želite poskusiti znova? QML Debugger disconnected. Razhroščevalnik QML je prekinil povezavo. - - - ::Debugger <Type expression to evaluate> <vnesite izraz za ovrednotiti> @@ -22909,9 +21427,6 @@ Ali želite poskusiti znova? Skriptna konzola - - - ::Debugger Select Local Cache Folder Izberite mapo krajevnega predpomnilnika @@ -23083,14 +21598,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. - ::GLSLEditor - - GLSL - GLSL - - - - GLSLEditor::Internal::GLSLEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -23129,9 +21637,6 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. Vertex Shader (Desktop OpenGL) Senčilnik za oglišča (Desktop OpenGL) - - - GLSLEditor::GLSLFileWizard New %1 Nov %1 @@ -23814,16 +22319,6 @@ neposredno dostopati do objektov izvodov komponent QML in lastnosti.Rename id '%1'... Preimenuj ID »%1« ... - - - QmlJsEditor - - QML - QML - - - - ::QmlJSEditor Searching Iskanje @@ -24665,9 +23160,6 @@ Veljavno od: %2. Podpira %n naprav: - - - ::RemoteLinux The binary package '%1' was patched to be installable after being self-signed. %2 @@ -24682,9 +23174,6 @@ Da preprečite to popravljanje, uporabite potrdilo razvijalca ali pa kak drug na Cannot create Smart Installer package as the Smart Installer's base file is missing. Please ensure that it is located in the SDK. Paketa Smart Installer ni moč ustvariti, ker manjka osnovna datoteka namestilnika Smart Installer. Prepričajte se, da se nahaja v SDK-ju. - - - ::RemoteLinux Deploy %1 to Symbian device Razmesti %1 na napravo Symbian @@ -24693,9 +23182,6 @@ Da preprečite to popravljanje, uporabite potrdilo razvijalca ali pa kak drug na Deploy to Symbian device Razmesti na napravo Symbian - - - ::RemoteLinux Device: Naprava: @@ -24816,9 +23302,6 @@ Da preprečite to popravljanje, uporabite potrdilo razvijalca ali pa kak drug na Screen size: Velikost zaslona: - - - ::RemoteLinux Unable to remove existing file '%1': %2 Obstoječe datoteke »%1« ni moč odstraniti: %2 @@ -24941,9 +23424,6 @@ Da preprečite to popravljanje, uporabite potrdilo razvijalca ali pa kak drug na A timeout while deploying has occurred. CODA might not be responding. Try reconnecting the device. Med razmeščanjem je potekel čas. CODA se morda ne odziva. Poskusite znova povezati napravo. - - - ::RemoteLinux Clean Čiščenje @@ -24994,18 +23474,12 @@ Da preprečite to popravljanje, uporabite potrdilo razvijalca ali pa kak drug na Ustvaril %1. - - - ::RemoteLinux Running %1 %1 is a name of the Publish Step i.e. Clean Step Zaganjanje %1 - - - ::RemoteLinux No valid Qt version has been detected.<br>Define a correct Qt version in "Options > Qt4" Zaznane ni bilo nobene veljavne različice Qt.<br> Različico Qt lahko določite v Orodja → Možnosti → Qt 4. @@ -25014,9 +23488,6 @@ Da preprečite to popravljanje, uporabite potrdilo razvijalca ali pa kak drug na No valid tool chain has been detected.<br>Define a correct tool chain in "Options > Tool Chains" Zaznanega ni bilo nobenega veljavnega zaporedja orodij.<br>Zaporedje orodij lahko določite v Orodja → Možnosti → Zaporedja orodij. - - - ::RemoteLinux Open Containing Folder Odpri vsebujočo mapo @@ -25372,7 +23843,7 @@ Program lahko zgradite in ga razmestite na namizju ali na mobilnih platformah. N - BaseQtVersion + ::QtSupport Name: Ime: @@ -25405,9 +23876,6 @@ Program lahko zgradite in ga razmestite na namizju ali na mobilnih platformah. N Version: Različica: - - - ::QtSupport Copy Project to writable Location? Ali želite skopirati projekt na zapisljivo mesto? @@ -25610,9 +24078,6 @@ Razlog: %2 SBS v2 directory: Mapa za SBS 2: - - - ::QtSupport MinGW from %1 MinGW iz %1 @@ -25659,9 +24124,6 @@ Razlog: %2 Deployment finished. Razmestitev je zaključena. - - - ::RemoteLinux <no target path set> <ciljna pot ni nastavljena> @@ -25674,9 +24136,6 @@ Razlog: %2 Remote Directory Oddaljena mapa - - - ::RemoteLinux Generic Linux Device Naprava z običajnim Linux-om @@ -25697,23 +24156,14 @@ Razlog: %2 Deploy Public Key Razmesti javni ključ ... - - - ::RemoteLinux New Generic Linux Device Configuration Setup Nastavitev nove naprave z običajnim Linux-om - - - ::RemoteLinux Connection Data Podatki o povezavi - - - ::RemoteLinux Setup Finished Nastavitev zaključena @@ -25724,23 +24174,14 @@ In addition, device connectivity will be tested. Sedaj bo ustvarjena nova nastavitev naprave. Poleg tega bo preizkušena povezljivost z napravo. - - - ::RemoteLinux (default for %1) (privzeto za %1) - - - ::RemoteLinux Start Wizard Zaženi čarovnika - - - ::RemoteLinux Device with MADDE support (Fremantle, Harmattan, MeeGo) Naprava s podporo za MADDE (Fremantle, Harmattan, MeeGo) @@ -25757,9 +24198,6 @@ Poleg tega bo preizkušena povezljivost z napravo. Other MeeGo OS Drug MeeGo - - - ::RemoteLinux Testing configuration. This may take a while. Preizkušanje nastavitve. To lahko traja dalj časa. @@ -25834,16 +24272,10 @@ Poleg tega bo preizkušena povezljivost z napravo. List of installed Qt packages: Seznam nameščenih paketov Qt: - - - ::RemoteLinux Installing package to device... Nameščanje paketa na napravo ... - - - ::RemoteLinux No matching packaging step found. Najdenega ni bilo nobenega ustreznega koraka za pakiranje. @@ -25856,9 +24288,6 @@ Poleg tega bo preizkušena povezljivost z napravo. Deploy package via UTFS mount Razmesti paket prek priklopa UTFS - - - ::RemoteLinux All files copied. Vse datoteke so bile skopirane. @@ -25867,9 +24296,6 @@ Poleg tega bo preizkušena povezljivost z napravo. Deploy files via UTFS mount Razmesti datoteke prek priklopa UTFS - - - ::RemoteLinux Choose Icon (will be scaled to %1x%1 pixels, if necessary) Izberite ikono (po potrebi bo velikost prilagojena na %1 ⨯ %1 pik) @@ -25890,9 +24316,6 @@ Poleg tega bo preizkušena povezljivost z napravo. Could not save icon to '%1'. Ikone ni bilo moč shraniti v »%1«. - - - ::RemoteLinux Cannot deploy: %1 Ni moč razmestiti: %1 @@ -25901,9 +24324,6 @@ Poleg tega bo preizkušena povezljivost z napravo. <b>%1 using device</b>: %2 <b>%1 uporablja napravo</b>: %2 - - - ::RemoteLinux Physical Device Fizična naprava @@ -25916,30 +24336,18 @@ Poleg tega bo preizkušena povezljivost z napravo. You will need at least one port. Potrebovali boste vsaj ena vrata. - - - ::RemoteLinux General Information Splošni podatki - - - ::RemoteLinux Device Status Check Preverjanje stanja naprave - - - ::RemoteLinux Existing Keys Check Preverjanje obstoječih ključev - - - ::RemoteLinux Key Creation Ustvarjanje ključev @@ -25992,16 +24400,10 @@ Poleg tega bo preizkušena povezljivost z napravo. Done. Opravljeno. - - - ::RemoteLinux The new device configuration will now be created. Sedaj bo ustvarjena nova nastavitev naprave. - - - ::RemoteLinux New Device Configuration Setup Nova nastavitev naprave @@ -26038,9 +24440,6 @@ Poleg tega bo preizkušena povezljivost z napravo. Upload files via SFTP Pošlji datoteke prek SFTP - - - ::RemoteLinux Could not connect to host: %1 Ni se bilo moč povezati z gostiteljem: %1 @@ -26073,16 +24472,10 @@ Ali je naprava priklopljena in nastavljena za omrežni dostop? Unknown OS Neznan OS - - - ::RemoteLinux Cannot deploy to sysroot: No packaging step found. Ni moč razmestiti v vrhnjo mapo sistema: najdenega ni nobenega koraka pakiranja. - - - ::RemoteLinux Cannot install to sysroot without build configuration. Brez nastavitve gradnje ni moč nameščati v vrhnjo mapo sistema. @@ -26103,23 +24496,14 @@ Ali je naprava priklopljena in nastavljena za omrežni dostop? Installation to sysroot failed, continuing anyway. Namestitev v vrhnjo mapo sistema ni uspela, kljub temu nadaljujem. - - - ::RemoteLinux Install Debian package to sysroot Paket Debian namesti v vrhnjo mapo sistema - - - ::RemoteLinux Install RPM package to sysroot Paket RPM namesti v vrhnjo mapo sistema - - - ::RemoteLinux Cannot copy to sysroot without build configuration. Brez nastavitve gradnje ni moč kopirati v vrhnjo mapo sistema. @@ -26234,9 +24618,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Error: Could not create file '%1'. Napaka: datoteke »%1« ni bilo moč ustvariti. - - - ::RemoteLinux Could not move package file from %1 to %2. Datoteke paketa ni bilo moč premakniti iz %1 v %2. @@ -26245,9 +24626,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Create tarball: Ustvari arhiv tar: - - - ::RemoteLinux Create tarball Ustvari arhiv tar @@ -26272,9 +24650,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Error writing tar file '%1': %2 Napaka pri zapisovanju datoteke tar »%1«: %2 - - - ::RemoteLinux No Version Available. Na voljo ni nobene različice. @@ -26319,23 +24694,14 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Could Not Set Version Number Številke različice ni bilo moč nastaviti - - - ::RemoteLinux Installing package failed. Nameščanje paketa ni uspelo. - - - ::RemoteLinux Installation failed: You tried to downgrade a package, which is not allowed. Nameščanje ni uspelo: paket ste poskušali nadomestiti s starejšo različico, kar ni dovoljeno. - - - ::RemoteLinux Preparing SFTP connection... Pripravljanje povezave SFTP ... @@ -26352,23 +24718,14 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Failed to upload package: %2 Paketa ni bilo moč poslati: %2 - - - ::RemoteLinux (default) (privzeto) - - - ::RemoteLinux Updateable Project Files Posodobljive datoteke projekta - - - ::RemoteLinux Include in package Vključi v paket @@ -26381,9 +24738,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Do not include Ne vključi - - - ::RemoteLinux Canceled. Preklicano. @@ -26522,9 +24876,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.You have not set an icon for the package manager. The icon must be set in Projects -> Run -> Create Package -> Details. Ikone za upravljalnika paketov še niste izbrali. Ikono lahko nastavite v Projekti → Zagon → Ustvarjanje paketa → Podrobnosti. - - - ::RemoteLinux Publishing to Fremantle's "Extras-devel/free" Repository Objavljanje v Fremantlovo skladišče »Extras-devel/free« @@ -26537,9 +24888,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Choose a private key file Izberite datoteko z zasebnim ključem - - - ::RemoteLinux Publish for "Fremantle Extras-devel free" repository Objavi v skladišče »Fremantle Extras-devel free« @@ -26548,9 +24896,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.This wizard will create a source archive and optionally upload it to a build server, where the project will be compiled and packaged and then moved to the "Extras-devel free" repository, from where users can install it onto their N900 devices. For the upload functionality, an account at garage.maemo.org is required. Ta čarovnik bo ustvaril izvorni arhiv in ga po želji poslal na strežnik za gradnjo, kjer bo projekt preveden in zapakiran ter nato premaknjen v skladišče »Extras-devel free«. Iz tega skladišča ga uporabniki lahko namestijo na svoje naprave Nokia N900. Za pošiljanje je potreben račun pri garage.maemo.org. - - - ::RemoteLinux Publishing to Fremantle's "Extras-devel free" Repository Objavljanje v Fremantlovo skladišče »Extras-devel free« @@ -26567,9 +24912,6 @@ Omejitev se bo poskušalo zaobiti, a še vedno lahko pride do težav.Result Rezultat - - - ::RemoteLinux Start MeeGo Emulator Zaženi posnemovalnika za MeeGo @@ -26658,9 +25000,6 @@ Standardni izhod za napake je bil: %1 Timeout waiting for UTFS servers to connect. Med čakanjem na povezavo s strežniki UTFS je potekel čas. - - - ::RemoteLinux Local directory Krajevna mapa @@ -26669,16 +25008,10 @@ Standardni izhod za napake je bil: %1 Remote mount point Oddaljena priklopna točka - - - ::RemoteLinux Remote Error Oddaljena napaka - - - ::RemoteLinux Connection failure: %1 Napaka povezave: %1 @@ -26705,16 +25038,10 @@ Oddaljeni standardni izhod za napake je bil: %1 Command Line Ukazna vrstica - - - ::RemoteLinux Not enough free ports on the device. Na napravi ni dovolj prostih vrat. - - - ::RemoteLinux Choose directory to mount Izberite mapo za priklop. @@ -26756,16 +25083,10 @@ Oddaljeni standardni izhod za napake je bil: %1 OPOZORILO: Priklopiti želite %1 map, a v razhroščevalnem načinu bo na napravi na voljo le %n vrat.<br>S to nastavitvijo ne boste mogli razhroščevati programa. - - - ::RemoteLinux Run on device Zaženi na napravi - - - ::RemoteLinux Qemu error Napaka Qemu @@ -26786,23 +25107,14 @@ Oddaljeni standardni izhod za napake je bil: %1 Qemu is currently configured to auto-detect the OpenGL mode, which is known to not work in some cases. You might want to use software rendering instead. Qemu je nastavljen na samodejno zaznavo načina OpenGL, ki v določenih primerih ne deluje. Poskusite lahko uporabiti programsko izrisovanje. - - - ::RemoteLinux Device Configurations Nastavitve naprav - - - ::RemoteLinux MeeGo Qemu Settings Nastavitve Qemu za MeeGo - - - ::RemoteLinux Save Public Key File Shrani datoteko z javnim ključem @@ -26811,9 +25123,6 @@ Oddaljeni standardni izhod za napake je bil: %1 Save Private Key File Shrani datoteko z zasebnim ključem - - - ::RemoteLinux Qemu was not running. It has now been started up for you, but it will take a bit of time until it is ready. Please try again then. Qemu ni tekel. Bil je zagnan, a bo potrebno nekaj časa, da bo pripravljen. Poskusite znova malce kasneje. @@ -26834,9 +25143,6 @@ Oddaljeni standardni izhod za napake je bil: %1 Unmounting host directories... Odklapljanje map gostitelja ... - - - ::RemoteLinux Maemo GCC Maemo GCC @@ -26849,16 +25155,10 @@ Oddaljeni standardni izhod za napake je bil: %1 %1 GCC (%2) %1 GCC (%2) - - - ::RemoteLinux <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> <html><head/><body><table><tr><td>Pot do MADDE:</td><td>%1</td></tr><tr><td>Pot do cilja MADDE:</td><td>%2</td></tr><tr><td>Razhroščevalnik:</td/><td>%3</td></tr></body></html> - - - ::RemoteLinux Successfully uploaded package file. Datoteka paketa je bila uspešno poslana. @@ -26913,9 +25213,6 @@ Oddaljeni izhod za napake je bil: %1 Deployment finished successfully. Razmestitev se je uspešno zaključila. - - - ::RemoteLinux Copy Files to Maemo5 Device Skopiraj datoteke na napravo z Maemo-m 5 @@ -26936,9 +25233,6 @@ Oddaljeni izhod za napake je bil: %1 Build Tarball and Install to Linux Host Zgradi arhiv in ga namesti na gostitelja z Linux-om - - - ::RemoteLinux Cannot open file '%1': %2 Ni moč odpreti datoteke »%1«: %2 @@ -26971,9 +25265,6 @@ Ali jih želite dodati v projekt? Error creating MeeGo templates Napaka pri ustvarjanju predlog za MeeGo - - - ::RemoteLinux Debian changelog file '%1' has unexpected format. Datoteka »%1« z dnevnikom sprememb za Debian ima nepričakovan format. @@ -27030,9 +25321,6 @@ Ali jih želite dodati v projekt? Error running remote process: %1 Napaka pri zagonu oddaljenega procesa: %1 - - - ::RemoteLinux Preparing remote side ... @@ -27055,9 +25343,6 @@ Ali jih želite dodati v projekt? Not enough free ports on device for debugging. Na napravi ni dovolj prostih vrat za razhroščevanje. - - - ::RemoteLinux The .pro file is being parsed. Datoteko *.pro se razčlenjuje. @@ -27148,9 +25433,6 @@ Ali jih želite dodati v projekt? Fetching environment failed: %1 Pridobivanje okolja ni uspelo: %1 - - - ::RemoteLinux Starting remote process ... @@ -27167,9 +25449,6 @@ Ali jih želite dodati v projekt? Remote Execution Failure Napaka pri oddaljeni izvedbi - - - ::RemoteLinux Run on remote Linux device Zaženi na oddaljeni napravi z Linux-om @@ -27405,9 +25684,6 @@ Preverite pravice za dostop do mape. Profiliranje %1 - - - ::Valgrind Valgrind Function Profiler Valgrindov profilirnik funkcij @@ -27420,9 +25696,6 @@ Preverite pravice za dostop do mape. Profile Costs of this Function and its Callees Profiliraj stroške te funkcije in njenih klicanih - - - ::Valgrind Callers Klicatelji @@ -27535,16 +25808,10 @@ Preverite pravice za dostop do mape. Populating... Napolnjevanje ... - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) Vse funkcije, ki imajo razmerje skupnega stroška višje kot %1 (%2 je skritih) - - - ::Valgrind Analyzing Memory Analiziranje pomnilnika @@ -27555,16 +25822,10 @@ Preverite pravice za dostop do mape. Analiziranje pomnilnika od %1 - - - ::Valgrind in %1 v %1 - - - ::Valgrind Copy Selection Skopiraj izbor @@ -27573,9 +25834,6 @@ Preverite pravice za dostop do mape. Suppress Error Onemogoči napako - - - ::Valgrind External Errors Zunanje napake @@ -27640,9 +25898,6 @@ Preverite pravice za dostop do mape. Error occurred parsing valgrind output: %1 Med razčlenjevanjem izhoda Valgrinda je prišlo do napake: %1 - - - ::Valgrind Callee Klicani @@ -27659,9 +25914,6 @@ Preverite pravice za dostop do mape. Calls Klici - - - ::Valgrind Previous command has not yet finished. Predhodni ukaz še ni zaključil. @@ -27694,9 +25946,6 @@ Preverite pravice za dostop do mape. Downloading remote profile data... Prejemanje oddaljenih podatkov profiliranja ... - - - ::Valgrind File: Datoteka: @@ -27766,9 +26015,6 @@ Preverite pravice za dostop do mape. Incl. Cost: %1 Skupni strošek: %1 - - - ::Valgrind %1 in %2 %1 v %2 @@ -27777,9 +26023,6 @@ Preverite pravice za dostop do mape. %1:%2 in %3 %1:%2 v %3 - - - ::Valgrind Last-level Zadnja-stopnja @@ -27836,16 +26079,10 @@ Preverite pravice za dostop do mape. Position: Položaj: - - - ::Valgrind Parsing Profile Data... Razčlenjevanje podatkov profiliranja ... - - - ::Valgrind No network interface found for remote analysis. Za oddaljeno analiziranje ni bil najden noben omrežni vmesnik. @@ -27858,16 +26095,10 @@ Preverite pravice za dostop do mape. More than one network interface was found on your machine. Please select which one you want to use for remote analysis. Na vašem računalniku je bilo najdenih več omrežnih vmesnikov. Izberite, katerega bi radi uporabljali za oddaljeno analiziranje. - - - ::Valgrind Could not determine remote PID. Oddaljenega PID-a ni bilo moč ugotoviti. - - - ::Valgrind What Kaj @@ -27896,9 +26127,6 @@ Preverite pravice za dostop do mape. Helgrind Thread ID Helgrindova identifikacija niti - - - ::Valgrind Function: Funkcija: @@ -27915,9 +26143,6 @@ Preverite pravice za dostop do mape. Object: Objekt: - - - ::Valgrind Could not parse hex number from "%1" (%2) Šestnajstiškega števila iz »%1« (%2) ni bilo moč razčleniti @@ -27970,9 +26195,6 @@ Preverite pravice za dostop do mape. Unexpected exception caught during parsing. Med razčlenjevanjem je bila ujeta nepričakovana izjema. - - - ::Valgrind Description Opis @@ -27997,9 +26219,6 @@ Preverite pravice za dostop do mape. Line Vrstica - - - ::Valgrind Valgrind options: %1 Možnosti za Valgrind: %1 @@ -28040,16 +26259,10 @@ Preverite pravice za dostop do mape. Application Output Izhod programa - - - ::Valgrind Analyzer Analizator - - - ::Valgrind Valgrind Valgrind @@ -28342,9 +26555,6 @@ Preverite pravice za dostop do mape. Breakpoint: %1 Prekinitvena točka: %1 - - - ::Debugger injection vstavek @@ -28458,13 +26668,6 @@ Preverite pravice za dostop do mape. Pozdravljen, Svet! - - InputPane - - Type Ctrl-<Return> to execute a line. - Da izvršite vrstico, vtipkajte Ctrl+Vnašalka - - MainWindow @@ -29004,18 +27207,6 @@ Vedite: to lahko odstrani krajevno datoteko. Form Obrazec - - Manage Sessions... - Upravljanje s sejami … - - - %1 (last session) - %1 (zadnja seja) - - - %1 (current session) - %1 (trenutna seja) - New Project Nov projekt @@ -29491,9 +27682,6 @@ Preverite, ali je telefon priključen in ali App TRK teče. Could not install from package %1 on device: %2 Ni bilo moč namestiti iz paketa %1 na napravi: %2 - - - ::RemoteLinux Finished. Zaključeno. @@ -29510,9 +27698,6 @@ Preverite, ali je telefon priključen in ali App TRK teče. Could not start application: %1 Ni bilo moč zagnati programa: %1 - - - ::RemoteLinux Id: ID: @@ -31291,16 +29476,10 @@ Preverite nastavitve projekta. Choose Qt folder Izberite mapo s Qt - - - ::RemoteLinux No Qt installed Nameščen ni noben Qt - - - ::RemoteLinux Step 1 of 2: Choose GnuPoc folder Korak 1 od 2: izberite mapo z GnuPoc diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index c824d44aefa..7493f4a7fbc 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -238,7 +238,7 @@ - BaseQtVersion + ::QtSupport The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4). Компілятор '%1' (%2) не може генерувати код для Qt версії '%3' (%4). @@ -1486,7 +1486,7 @@ Local pulls are not applied to the master branch. - ContentWindow + ::Help Open Link Відкрити посилання @@ -3834,9 +3834,6 @@ Flags: %3 Close Debugging Session Закрити сеанс зневадження - - - ::Debugger Select Start Address Виберіть початкову адресу @@ -3849,9 +3846,6 @@ Flags: %3 Enter an address: Введіть адресу: - - - ::Debugger Load Core File Завантажити файл Core @@ -3896,9 +3890,6 @@ Flags: %3 Override &start script: Інший скрипт &запуску: - - - ::Debugger Marker File: Позначений файл: @@ -4152,9 +4143,6 @@ Flags: %3 Breakpoint will only be hit in the specified thread(s). Точка перепину спрацює лише у вказаних нитках. - - - ::Debugger File name and line number Файл та номер рядка @@ -4325,9 +4313,6 @@ This feature is only available for GDB. &Message: &Повідомлення: - - - ::Debugger Select Local Cache Folder Вибір теки для локального кешу @@ -4360,9 +4345,6 @@ This feature is only available for GDB. The folder '%1' could not be created. Не вдалось створити теку '%1'. - - - ::Debugger C++ exception Виключна ситуація C++ @@ -4387,9 +4369,6 @@ This feature is only available for GDB. Output: Виведення: - - - ::Debugger The console process '%1' could not be started. Не вдалось запустити консольний процес '%1'. @@ -4482,16 +4461,10 @@ This feature is only available for GDB. "Select Widget to Watch": Not supported in state '%1'. "Оберіть віджет для нагляду": Стан '%1' не підтримується. - - - ::Debugger CDB CDB - - - ::Debugger Startup Placeholder @@ -4541,9 +4514,6 @@ This feature is only available for GDB. <html><head/><body><p>Attempts to correct the location of a breakpoint based on file and line number should it be in a comment or in a line for which no code is generated. The correction is based on the code model.</p></body></html> <html><head/><body><p>Намагатись підправляти розташування точки перепину, що основана на файлі та номері рядка, який є коментарем або для якого код не генерується. Виправлення основане на моделі коду.</p></body></html> - - - ::Debugger Symbol Server... Сервер символів... @@ -4584,9 +4554,6 @@ This feature is only available for GDB. Configure Symbol paths that are used to locate debug symbol files. Налаштування шляхів символів, які використовуються для знаходження файлів із символами зневадження. - - - ::Debugger Clear Contents Очистити зміст @@ -4599,9 +4566,6 @@ This feature is only available for GDB. Reload Debugging Helpers Перезавантажити помічники зневадження - - - ::Debugger No function selected. Функцію не обрано. @@ -5046,9 +5010,6 @@ Qt Creator не може під'єднатись до нього.Symbols in "%1" Символи в "%1" - - - ::Debugger Debugger Properties... Властивості зневаджувача... @@ -5349,9 +5310,6 @@ Qt Creator не може під'єднатись до нього.Create Full Backtrace Створити повний стек викликів - - - ::Debugger <new source> <новий шлях джерела> @@ -5424,16 +5382,10 @@ Qt Creator не може під'єднатись до нього.Qt Sources Код Qt - - - ::Debugger Previous Назад - - - ::Debugger Retrieving data for watch view (%n requests pending)... @@ -5868,9 +5820,6 @@ You can choose between waiting longer or aborting debugging. Збій підключення до віддаленого сервера: %1 - - - ::Debugger General Загальне @@ -6084,23 +6033,14 @@ markers in the source code editor. GDB GDB - - - ::Debugger Fatal engine shutdown. Incompatible binary or IPC error. Фатальне завершення рушія. Несумісний виконуваний модуль або помилка IPC. - - - ::Debugger Type Ctrl-<Return> to execute a line. Натисніть Ctrl-<Return>, щоб виконати рядок. - - - ::Debugger qtcreator-lldb failed to start: %1 збій запуску qtcreator-lldb: %1 @@ -6133,9 +6073,6 @@ markers in the source code editor. Log File Файл журналу - - - ::Debugger The memory contents cannot be shown as no viewer plugin for binary data has been loaded. Неможливо відобразити зміст пам'яті, оскільки не встановлено додатку для перегляду двійкових даних. @@ -6148,9 +6085,6 @@ markers in the source code editor. No Memory Viewer Available Переглядач пам'яті не доступний - - - ::Debugger &Condition: &Умова: @@ -6167,9 +6101,6 @@ markers in the source code editor. Cannot open FiFo %1: %2 Неможливо відкрити FiFo %1: %2 - - - ::Debugger Unable to start pdb '%1': %2 Неможливо запустити pdb '%1': %2 @@ -6234,9 +6165,6 @@ markers in the source code editor. An unknown error in the Pdb process occurred. З процесом Pdb сталась невідома помилка. - - - ::Debugger <p>An uncaught exception occurred:</p><p>%1</p> <p>Сталася не оброблена виключна ситуація:</p><p>%1</p> @@ -6257,9 +6185,6 @@ markers in the source code editor. Uncaught Exception Необроблена виключна ситуація - - - ::Debugger The slave debugging engine required for combined QML/C++-Debugging could not be created: %1 Не вдалось створити підлеглий рушій зневадження, що необхідний для комбінованого зневадження QML/C++: %1 @@ -6272,9 +6197,6 @@ markers in the source code editor. QML debugger activated Зневаджувач QML активовано - - - ::Debugger No application output received in time Не отримано вчасно жодного виведення з програми @@ -6343,9 +6265,6 @@ Do you want to retry? QML Debugger disconnected. Зневаджувач QML відключено. - - - ::Debugger Content as ASCII Characters Зміст як символи ASCII @@ -6390,9 +6309,6 @@ Do you want to retry? Value (Base %1) Значення (основа %1) - - - ::Debugger Memory at Register '%1' (0x%2) Пам'ять з регістру '%1' (0x%2) @@ -6481,9 +6397,6 @@ Do you want to retry? Note that most distributions ship debug information in separate packages. Майте на увазі, що більшість дистрибутивів постачають зневаджувальну інформацію в окремих пакунках. - - - ::Debugger <html><body><p>The remote CDB needs to load the matching Qt Creator CDB extension (<code>%1</code> or <code>%2</code>, respectively).</p><p>Copy it onto the remote machine and set the environment variable <code>%3</code> to point to its folder.</p><p>Launch the remote CDB as <code>%4 &lt;executable&gt;</code> to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p><pre>%5</pre></body></html> <html><body><p>Віддалений CDB має завантажити відповідне розширення Qt Creator для CDB (<code>%1</code> або <code>%2</code>, відповідно).</p><p>Скопіюйте його на віддалену машину та встановіть в змінній середовища <code>%3</code> шлях до теки з ним.</p><p>Запустіть віддалений CDB так: <code>%4 &lt;виконуваний модуль&gt;</code>, щоб використати TCP/IP в якості комунікаційного протоколу.</p><p>Введіть параметри підключення так:</p><pre>%5</pre></body></html> @@ -6496,9 +6409,6 @@ Do you want to retry? &Connection: &Підключення: - - - ::Debugger Thread&nbsp;id: Id&nbsp;нитки: @@ -6547,9 +6457,6 @@ Do you want to retry? Details Деталі - - - ::Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -6847,9 +6754,6 @@ Do you want to retry? %1 Object at Unknown Address Об'єкт %1 за невідомою адресою - - - ::Debugger Debugging complex command lines is currently not supported on Windows. Зневадження складних командних рядків під Windows наразі не підтримується. @@ -7118,41 +7022,6 @@ Rebuilding the project might help. - - EditorManager - - Next Open Document in History - Наступний відкритий документ в історії - - - Previous Open Document in History - Попередній відкритий документ в історії - - - Go Back - Йти назад - - - Go Forward - Йти вперед - - - Split - Розбити - - - Split Side by Side - Розбити вертикально - - - Open in New Window - Відкрити в новому вікні - - - Close Document - Закрити документ - - EditorSettingsPanel @@ -7700,13 +7569,6 @@ will also disable the following plugins: Інформація про FakeVim - - FileWidget - - Open File - Відкрити файл - - FilterNameDialogClass @@ -7756,26 +7618,11 @@ will also disable the following plugins: - ::GLSLEditor - - GLSL - GLSL - - - - GLSLEditor::GLSLFileWizard + ::GlslEditor New %1 Новий %1 - - - GLSLEditor::Internal::GLSLEditorPlugin - - GLSL - GLSL sub-menu in the Tools menu - GLSL - Creates a fragment shader in the OpenGL/ES 2.0 Shading Language (GLSL/ES). Fragment shaders generate the final pixel colors for triangles, points and lines rendered with OpenGL. Створює фрагментний шейдер мовою шейдерів OpenGL/ES 2.0 (GLSL/ES). Фрагментний шейдер генерує остаточні кольори пікселів для трикутників, точок та ліній, що відмальовуються за допомогою OpenGL. @@ -10071,14 +9918,6 @@ Add, modify, and remove document filters, which determine the documentation set Indexing Documentation Індексування документації - - Open Link - Відкрити посилання - - - Open Link as New Page - Відкрити посилання в новій сторінці - Copy Link Копіювати посилання @@ -10161,9 +10000,6 @@ Add, modify, and remove document filters, which determine the documentation set Pause Animation Призупинити анімацію - - - ::ImageViewer Show Background Показувати тло @@ -10177,21 +10013,6 @@ Add, modify, and remove document filters, which determine the documentation set Експортувати як зображення - - IndexWindow - - &Look for: - &Шукати: - - - Open Link - Відкрити посилання - - - Open Link as New Page - Відкрити посилання в новій сторінці - - InvalidIdException @@ -11963,27 +11784,7 @@ Ids must begin with a lowercase letter. - PluginDialog - - Details - Деталі - - - Error Details - Деталі помилки - - - Installed Plugins - Встановлені додатки - - - Plugin Details of %1 - Деталі додатку %1 - - - Plugin Errors of %1 - Помилки додатку %1 - + ::Core ::ExtensionSystem @@ -13691,10 +13492,6 @@ to project "%2". Recent P&rojects Нещодавні п&роекти - - Sessions - Сесії - Close Project Закрити проект @@ -14256,10 +14053,6 @@ Do you want to ignore them? Delete %1 from file system? Видалити %1 з файлової системи? - - New Project - Новий проект - New Subproject Новий підпроект @@ -15338,7 +15131,7 @@ For qmlproject projects, use the importPaths property to add import paths. - QmlManager + ::QmlProjectManager <Current File> <Поточний файл> @@ -15587,7 +15380,7 @@ Do you want to save the data first? - QrcEditor + ::ResourceEditor Add Додати @@ -16773,7 +16566,7 @@ Reason: %2 - QtSuppport + ::QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -17019,16 +16812,10 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Compiler: Компілятор: - - - ::QtSupport Getting Started Починаючи роботу - - - ::QtSupport <specify a name> <вкажіть назву> @@ -17053,10 +16840,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf The following ABIs are currently not supported:<ul><li>%1</li></ul> Наступні ABI наразі не підтримуються:<ul><li>%1</li></ul> - - Building helpers - Збірка помічників - Debugging Helper Build Log for '%1' Журнал збирання помічника зневадження для '%1' @@ -17142,9 +16925,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf <i>Cannot be compiled.</i> <i>Неможливо скомпілювати.</i> - - - ::QtSupport Version name: Назва версії: @@ -17157,9 +16937,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Edit Редагувати - - - ::QtSupport Name Назва @@ -17184,9 +16961,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Clean Up Підчистити - - - ::QtSupport <unknown> <невідома> @@ -17374,9 +17148,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Deploy to Remote Linux Host Розгорнути на віддалений вузол Linux - - - ::RemoteLinux No deployment action necessary. Skipping. Жодної дії для розгортання не потрібно. Пропускаємо. @@ -17417,9 +17188,6 @@ Is the device connected and set up for network access? Connection error: %1 Помилка з'єднання: %1 - - - ::RemoteLinux Cannot deploy: %1 Неможливо розгорнути: %1 @@ -17436,9 +17204,6 @@ Is the device connected and set up for network access? Deploy step finished. Крок розгортання завершено. - - - ::RemoteLinux Connection failure: %1 Збій з'єднання: %1 @@ -17447,9 +17212,6 @@ Is the device connected and set up for network access? Installing package failed. Збій встановлення пакунка. - - - ::RemoteLinux Successfully uploaded package file. Успішно завантажено файл пакунка. @@ -17462,9 +17224,6 @@ Is the device connected and set up for network access? Package installed. Пакунок встановлено. - - - ::RemoteLinux Ignore missing files Ігнорувати відсутні файли @@ -17477,9 +17236,6 @@ Is the device connected and set up for network access? Create tarball: Створити архів tar: - - - ::RemoteLinux SFTP initialization failed: %1 Збій ініціалізації SFTP: %1 @@ -17540,23 +17296,14 @@ Is the device connected and set up for network access? Uploading file '%1'... Завантаження файлу '%1'... - - - ::RemoteLinux Upload files via SFTP Завантажити файли через SFTP - - - ::RemoteLinux New Generic Linux Device Configuration Setup Налаштування нової конфігурації звичайного Linux-пристрою - - - ::RemoteLinux Setup Finished Налаштування завершено @@ -17571,9 +17318,6 @@ In addition, device connectivity will be tested. Зараз буде створено нова конфігурація пристрою. Окрім того буде перевірено зв'язок з пристроєм. - - - ::RemoteLinux Connection Data Дані підключення @@ -17590,9 +17334,6 @@ In addition, device connectivity will be tested. Generic Linux Device Звичайний Linux-пристрій - - - ::RemoteLinux Connecting to host... Підключення до вузла... @@ -17663,16 +17404,10 @@ In addition, device connectivity will be tested. Наступні вказані порти вже використовуються: %1 - - - ::RemoteLinux Run custom remote command Виконати віддалену користувацьку команду - - - ::RemoteLinux Incremental deployment Інкрементальне розгортання @@ -17681,9 +17416,6 @@ In addition, device connectivity will be tested. Command line: Рядок команди: - - - ::RemoteLinux Preparing SFTP connection... Підготовка підключення SFTP... @@ -17708,9 +17440,6 @@ In addition, device connectivity will be tested. Failed to upload package: %2 Збій завантаження пакунка %2 - - - ::RemoteLinux Error running remote process: %1 Помилка запуску віддаленого процесу: %1 @@ -17741,9 +17470,6 @@ Remote stderr was: '%1' Віддалений stderr: %1 - - - ::RemoteLinux (on Remote Generic Linux Host) (на віддаленому звичайному вузлі Linux) @@ -17764,9 +17490,6 @@ Remote stderr was: '%1' No analyzer tool selected. Інструмент для аналізу не обрано. - - - ::RemoteLinux Device test finished successfully. Тест пристрою завершено вдало. @@ -17795,9 +17518,6 @@ Remote stderr was: '%1' Close Закрити - - - ::RemoteLinux No command line given. Командний рядок не задано. @@ -17826,9 +17546,6 @@ Remote stderr was: '%1' Remote command finished successfully. Віддалена команда завершилась успішно. - - - ::RemoteLinux Don't know what to run. Не знаю, що запускати. @@ -17842,9 +17559,6 @@ Remote stderr was: '%1' Remote Linux run configuration default display name Запустити на віддаленому пристрої - - - ::RemoteLinux Executable on host: Виконуваний модуль на вузлі: @@ -17881,9 +17595,6 @@ Remote stderr was: '%1' Remote path not set Віддалений шлях не задано - - - ::RemoteLinux Public key error: %1 Помилка публічного ключа: %1 @@ -17892,9 +17603,6 @@ Remote stderr was: '%1' Key deployment failed: %1. Збій розгортання ключа: %1. - - - ::RemoteLinux Packaging finished successfully. Створення пакунка завершено вдало. @@ -17967,9 +17675,6 @@ Remote stderr was: '%1' Create tarball Створити архів tar - - - ::RemoteLinux No tarball creation step found. Відсутній крок для створення архіву tar. @@ -18013,10 +17718,6 @@ Remote stderr was: '%1' Remove Prefix... Видалити префікс... - - Remove Missing Files - Видалити відсутні файли - Rename... Перейменувати... @@ -18069,9 +17770,6 @@ Remote stderr was: '%1' Recheck existence of referenced files Повторно перевірити існування файлів, на які посилаємось - - - ::ResourceEditor Rename File... Перейменувати файл... @@ -18480,13 +18178,6 @@ with a password, which you can enter below. Додатково - - TargetSettingsPanelFactory - - Build & Run - Збірка та запуск - - ::ProjectExplorer @@ -19602,7 +19293,7 @@ Will not be applied to whitespace in comments and strings. - TopicChooser + ::Help Choose Topic Оберіть тему @@ -20492,9 +20183,6 @@ Will not be applied to whitespace in comments and strings. Calls - - - ::Valgrind Previous command has not yet finished. Попередня команда ще не завершилась. @@ -20531,16 +20219,10 @@ Will not be applied to whitespace in comments and strings. Downloading remote profile data... - - - ::Valgrind Parsing Profile Data... Розбір даних профілювання... - - - ::Valgrind File: Файл: @@ -20605,9 +20287,6 @@ Will not be applied to whitespace in comments and strings. Incl. Cost: %1 - - - ::Valgrind %1 in %2 %1 в %2 @@ -20616,9 +20295,6 @@ Will not be applied to whitespace in comments and strings. %1:%2 in %3 %1:%2 в %3 - - - ::Valgrind Last-level @@ -20631,23 +20307,14 @@ Will not be applied to whitespace in comments and strings. Cache Кеш - - - ::Valgrind in %1 в %1 - - - ::Valgrind Filter... Фільтр... - - - ::Valgrind Copy Selection Копіювати обране @@ -20656,9 +20323,6 @@ Will not be applied to whitespace in comments and strings. Suppress Error - - - ::Valgrind External Errors @@ -20780,9 +20444,6 @@ When a problem is detected, the application is interrupted and can be debugged.< XML Files (*.xml);;All Files (*) - - - ::Valgrind Suppression File: @@ -20951,16 +20612,10 @@ With cache simulation, further event counters are enabled: Collects information for system call times. - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) - - - ::Valgrind Instruction pointer: @@ -20969,9 +20624,6 @@ With cache simulation, further event counters are enabled: Object: Об'єкт: - - - ::Valgrind Issue @@ -20984,9 +20636,6 @@ With cache simulation, further event counters are enabled: Thread ID ID нитки - - - ::Valgrind Could not parse hex number from "%1" (%2) @@ -21039,9 +20688,6 @@ With cache simulation, further event counters are enabled: Unexpected exception caught during parsing. - - - ::Valgrind Description Опис @@ -21406,7 +21052,7 @@ These prefixes are used in addition to current file name on Switch Header/Source - Cvs + ::CVS Configuration Конфігурація @@ -21470,9 +21116,6 @@ These prefixes are used in addition to current file name on Switch Header/Source Always add a breakpoint on the <i>%1()</i> function. Завжди додавати точку перепину на функції <i>%1()</i>. - - - ::Debugger Start Remote Engine Запустити віддалений рушій @@ -21739,9 +21382,6 @@ These prefixes are used in addition to current file name on Switch Header/Source &Check host key П&еревірити ключ вузла - - - ::RemoteLinux The name to identify this configuration: Назва для цієї конфігурації: @@ -21778,16 +21418,10 @@ These prefixes are used in addition to current file name on Switch Header/Source The username to log into the device: Ім'я користувача для входу на пристрій: - - - ::RemoteLinux Device Test Тест пристрою - - - ::RemoteLinux Form Форма @@ -22418,7 +22052,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - develop + ::ProjectExplorer Develop Розробка @@ -22445,11 +22079,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - examples - - Examples - Приклади - + ::QtSupport Search in Examples... Шукати в прикладах... @@ -22507,11 +22137,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - tutorials - - Tutorials - Посібники - + ::QtSupport Search in Tutorials... Шукати в посібниках... @@ -22540,11 +22166,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - SessionItem - - Clone - Клонувати - + ::ProjectExplorer Rename Перейменувати @@ -22553,9 +22175,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Delete Видалити - - - Sessions %1 (last session) %1 (остання сесія) @@ -22908,7 +22527,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - Cvs + ::CVS Location Розташування @@ -23261,13 +22880,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Інші типи - - ::Debugger - - Anonymous Function - Анонімна функція - - ::Git @@ -23499,9 +23111,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Failed to Open Project Збій відкриття проекту - - - ::QtSupport MeeGo/Harmattan MeeGo/Harmattan @@ -26044,9 +25653,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.Add Breakpoint Додати точку перепину - - - ::Debugger Start Debugger Запустити зневаджувач @@ -26115,9 +25721,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.&Recent: &Нещодавні: - - - ::Debugger Manage... Управління... @@ -26142,9 +25745,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.Debugger for "%1" Зневаджувач для "%1" - - - ::Debugger &Engine: &Рушій: @@ -26153,9 +25753,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.&Binary: &Виконуваний модуль: - - - ::Debugger No debugger set up. Зневаджувач не задано. @@ -26244,18 +25841,12 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.No kit found. Комплект не знайдено. - - - ::Debugger Starting executable failed: Збій запуску виконуваного модуля: - - - ::Debugger Attached to process %1. Під'єднано до процесу %1. @@ -26268,9 +25859,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.Failed to attach to application: %1 Збій підключення до програми: %1 - - - ::Debugger Open Qt Options Відкрити опції Qt @@ -26295,9 +25883,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. In the Qt Creator Build and Run preferences page, select a Qt version, expand the Details section and click Build All. Помічник зневадження застосовується для зручного форматування деяких типів даних Qt та стандартної бібліотеки. Він має бути скомпільований окремо для кожної версії Qt. На сторінці налаштувань "Збірка та запуск", оберіть версію Qt, розгорніть розділ "Детально" та клацніть "Зібрати все". - - - ::Debugger Error Loading Core File Помилка завантаження файлу Core @@ -26394,9 +25979,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.Interrupting not possible Переривання не можливе - - - ::Debugger Remote Error Віддалена помилка @@ -26539,9 +26121,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. <unknown> <невідомий> - - - ::Debugger Update Module List Оновити список модулів @@ -26598,9 +26177,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Show Dependencies of "%1" Показати залежності "%1" - - - ::Debugger Connecting to debug server %1:%2 Підключення до сервера зневадження на %1: %2 @@ -26648,9 +26224,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Error: (%1) %2 Помилка: (%1) %2 - - - ::Debugger Success: Успішно: @@ -26663,9 +26236,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Properties Властивості - - - ::Debugger The %1 attribute at line %2, column %3 cannot be changed without reloading the QML application. Неможливо змінити атрибут %1 в рядку %2, стовпець %3 без перезавантаження програми QML. @@ -26690,9 +26260,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Reload QML Перезавантажити QML - - - ::Debugger Reload Register Listing Перезавантажити список регістрів @@ -26713,9 +26280,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Open Disassembler Відкрити дизасемблер - - - ::Debugger Create Snapshot Створити знімок @@ -26724,9 +26288,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Remove Snapshot Видалити знімок - - - ::Debugger Reload Data Перезавантажити дані @@ -26739,9 +26300,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Open File "%1"' Відкрити файл "%1"' - - - ::Debugger Function: Функція: @@ -26794,9 +26352,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Frame #%1 (%2) Кадр #%1 (%2) - - - ::Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -27388,9 +26943,6 @@ were not verified among remotes in %3. Select different folder? Unable to move new debian directory to '%1'. Неможливо пересунути нову теку debian до '%1'. - - - ::RemoteLinux Checking whether to start Qemu... Перевірка чи потрібно запустити Qemu... @@ -27411,16 +26963,10 @@ were not verified among remotes in %3. Select different folder? Cannot deploy: You want to deploy to Qemu, but it is not enabled for this Qt version. Неможливо розгорнути: Ви бажаєте розгорнути до Qemu, але він не увімкнений для цієї версії Qt. - - - ::RemoteLinux Start Qemu, if necessary Запуск Qemu, якщо необхідно - - - ::RemoteLinux Add Packaging Files to Project Додати файли пакування до проекту @@ -28165,16 +27711,10 @@ cannot be found in the path. Run %1 Запустити %1 - - - ::QtSupport Custom Executable Користувацький виконуваний модуль - - - ::QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. Бібліотека Qt, що буде вживатись усіма проектами, що використовують цей комплект.<br>Версія Qt необхідна для проектів на базі qmake та опціональна для інших систем збірки. @@ -28191,9 +27731,6 @@ cannot be found in the path. %1 (invalid) %1 (неправильний) - - - ::QtSupport The version string of the current Qt version. Рядок версії поточної Qt. @@ -28293,9 +27830,6 @@ cannot be found in the path. Deploy Public Key... Розгорнути файл публічного ключа... - - - ::RemoteLinux Remote process crashed. Віддалений процес завершився аварійно. @@ -28332,16 +27866,10 @@ cannot be found in the path. Cannot check for free disk space: '%1' is not an absolute path. Неможливо перевірити вільний дисковий простір: '%1' не є абсолютним шляхом. - - - ::RemoteLinux MB Мб - - - ::RemoteLinux Check for free disk space Перевірити вільний простір на диску @@ -28356,9 +27884,6 @@ cannot be found in the path. Initial setup failed: %1 Збій початкового налаштування: %1 - - - ::RemoteLinux %1 (default) %1 (типово) @@ -28414,9 +27939,6 @@ cannot be found in the path. Could not copy the file to %1. Не вдалось скопіювати файл до %1. - - - ::ResourceEditor The file name is empty. Порожнє ім'я файлу. @@ -28433,9 +27955,6 @@ cannot be found in the path. Cannot write file. Disk full? Неможливо записати файл. Диск заповнено? - - - ::ResourceEditor Open File Відкрити файл @@ -30711,9 +30230,6 @@ Remote: %4 Full path to the target bin directory of the current project's Qt version. You probably want %1 instead. Повний шлях до target-теки bin версії Qt поточного проекту. Мабуть вам потрібен %1. - - - ::QtSupport No factory found for qmake: '%1' Не знайдено фабрику для qmake: '%1' @@ -31029,7 +30545,7 @@ Partial names can be used if they are unambiguous. - CppQmlTypesLoader + ::QmlJS %1 seems not to be encoded in UTF8 or has a BOM. Схоже, що %1 не в кодуванні UTF8 або має BOM. @@ -31473,7 +30989,7 @@ Partial names can be used if they are unambiguous. - Cvs + ::CVS &Edit &Редагувати @@ -31493,30 +31009,18 @@ Partial names can be used if they are unambiguous. Source Paths Шляхи джерела - - - ::Debugger CDB Paths Шляхи CDB - - - ::Debugger Debugger settings Налаштування зневаджувача - - - ::Debugger GDB Extended Розширені опції GDB - - - ::Debugger Unable to start lldb '%1': %2 Неможливо запустити lldb '%1': %2 @@ -31819,9 +31323,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d Not enough free ports on device for debugging. Недостатньо вільних портів для зневадження в пристрої. - - - ::RemoteLinux Checking available ports... @@ -31835,13 +31336,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d Failure running remote process. Збій запуску віддаленого процесу. - - Initial setup failed: %1 - Збій початкового налаштування: %1 - - - - ::RemoteLinux Clean Environment Чисте середовище @@ -31850,9 +31344,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d System Environment Системне середовище - - - ::RemoteLinux Fetch Device Environment Отримати середовище пристрою @@ -33999,13 +33490,6 @@ Please close all running instances of your application before starting a build.< Неможливо показати виведення slog2info: Помилка: %1 - - Qt4ProjectManager - - Qt Versions - Версії Qt - - ::RemoteLinux @@ -34030,9 +33514,6 @@ Please close all running instances of your application before starting a build.< Profiling %1 - - - ::Valgrind XmlServer on %1: XmlServer на %1: @@ -34041,9 +33522,6 @@ Please close all running instances of your application before starting a build.< LogServer on %1: LogServer на %1: - - - ::Valgrind Analyzing Memory Аналіз пам'яті @@ -34054,7 +33532,7 @@ Please close all running instances of your application before starting a build.< - AnalyzerManager + ::Debugger Memory Analyzer Tool finished, %n issues were found. @@ -34079,22 +33557,10 @@ Please close all running instances of your application before starting a build.< Log file processed, no issues were found. Файл журналу оброблено, проблем не знайдено. - - Debug - Debug - - - Release - Release - Tool Інструмент - - Run %1 in %2 Mode? - Запусти %1 в режимі %2? - <html><head/><body><p>You are trying to run the tool "%1" on an application in %2 mode. The tool is designed to be used in %3 mode.</p><p>Debug and Release mode run-time characteristics differ significantly, analytical findings for one mode may or may not be relevant for the other.</p><p>Do you want to continue and run the tool in %2 mode?</p></body></html> <html><head/><body><p>Ви намагаєтесь запустити інструмент "%1" для програми в режимі %2. Цей інструмент призначено для використання в режимі %3.</p><p>Характеристики часу виконання режимів Debug та Release суттєво відрізняються, аналітичні дані для одного режиму можуть бути не відповідними для іншого.</p><p>Бажаєте продовжити і запустити інструмент в режимі %2?</p></body></html> @@ -34106,16 +33572,10 @@ Please close all running instances of your application before starting a build.< Valgrind Valgrind - - - ::Valgrind Could not determine remote PID. Не вдалось визначити віддалений PID. - - - ::Valgrind Valgrind Settings Налаштування Valgrind @@ -35538,24 +34998,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d Під'єднатись до віддаленої програми QNX... - - PrefixLangDialog - - Prefix: - Префікс: - - - Language: - Мова: - - - - ::ResourceEditor - - %1 Prefix: %2 - %1 Префікс: %2 - - ::TextEditor @@ -36304,9 +35746,6 @@ Install an SDK of at least API version %1. Display string length: Довжина рядка, що показується: - - - ::Debugger %1 (Previous) %1 (попереднє) @@ -36340,7 +35779,7 @@ Install an SDK of at least API version %1. ::DiffEditor - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character Видалити символ @@ -37878,7 +37317,7 @@ The statements may not contain '{' nor '}' characters. - Cvs + ::CVS Annotate revision "%1" @@ -39123,7 +38562,7 @@ Preselects a desktop Qt for building the application if available. - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -39687,14 +39126,6 @@ The files in the Android package source directory are copied to the build direct ::ResourceEditor - - Prefix: - Префікс: - - - Language: - Мова: - ::Subversion @@ -39860,9 +39291,6 @@ Affected are breakpoints %1 Tries to install missing debug information. Спробувати встановити відсутню зневаджувальну інформацію. - - - ::Debugger Restored Відновлено @@ -40294,7 +39722,7 @@ Affected are breakpoints %1 - QuickFixFactory + ::CppEditor Create Getter and Setter Member Functions Створити функції-члени для отримання та встановлення значення @@ -40319,9 +39747,6 @@ Affected are breakpoints %1 Generate Missing Q_PROPERTY Members... Згенерувати відсутні члени Q_PROPERTY... - - - ::CppEditor Sort Alphabetically Сортувати за абеткою @@ -40341,9 +39766,6 @@ Affected are breakpoints %1 Attempting to interrupt. Намагаємось перервати. - - - ::Debugger Launching Debugger Запуск зневаджувача @@ -40488,9 +39910,6 @@ Setting breakpoints by file name and line number may fail. Jump to Line %1 Перейти до рядка %1 - - - ::Debugger Not recognized Не розпізнано @@ -40569,13 +39988,6 @@ Setting breakpoints by file name and line number may fail. Зневаджувачі - - DeviceProcessesDialog - - &Attach to Process - &Під'єднатись до процесу - - ::Debugger @@ -40602,9 +40014,6 @@ Setting breakpoints by file name and line number may fail. Enable Debugging of Subprocesses Увімкнути зневадження підпроцесів - - - ::Debugger Terminal: Cannot open /dev/ptmx: %1 Термінал: неможливо відкрити /dev/ptmx: %1 @@ -40845,7 +40254,7 @@ Setting breakpoints by file name and line number may fail. - ResourceTopLevelNode + ::ResourceEditor %1 Prefix: %2 %1 Префікс: %2 @@ -41560,11 +40969,7 @@ Setting breakpoints by file name and line number may fail. - QmlEngine - - JS Source for %1 - Код JS для %1 - + ::Debugger Anonymous Function Анонімна функція @@ -43521,11 +42926,7 @@ the program. - SessionActionLabel - - Clone - Клонувати - + ::ProjectExplorer qmt::ClassItem @@ -43648,9 +43049,6 @@ the program. <unnamed> <без назви> - - - ::Autotest &Tests &Тести @@ -43679,16 +43077,10 @@ the program. Alt+Shift+T,Alt+S Alt+Shift+T,Alt+S - - - ::Autotest Scanning for Tests Пошук тестів - - - ::Autotest Tests Тести @@ -43733,9 +43125,6 @@ the program. Show Data Functions Показувати функції Data - - - ::Autotest Entering test function %1::%2 Входження до тестової функції %1::%2 @@ -43764,9 +43153,6 @@ the program. Test execution took %1 ms. Виконання тесту тривало %1 мс. - - - ::Autotest You have %n disabled test(s). @@ -43795,9 +43181,6 @@ the program. Execution took %1. Виконання тривало %1. - - - ::Autotest Run All Tests Виконати усі тести @@ -43914,9 +43297,6 @@ the program. %2 - - - ::Autotest Project's run configuration was guessed for "%1". This might cause trouble during execution. @@ -43945,9 +43325,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Build failed. Canceling test run. Збірка не вдалась. Запуск тестів скасовано. - - - ::Autotest Auto Tests Автотести @@ -44354,16 +43731,10 @@ Please set a real Clang executable. Use Global Settings Вживати глобальні налаштування - - - ::Debugger Copy Копіювати - - - ::Debugger Start Remote Analysis Почати віддалений аналіз @@ -44380,9 +43751,6 @@ Please set a real Clang executable. Working directory: Робоча тека: - - - ::Debugger Show debug, log, and info messages. Показувати зневаджувальні, журналу та інформаційні повідомлення. @@ -44403,9 +43771,6 @@ Please set a real Clang executable. Debugger Console Консоль зневаджувача - - - ::Debugger &Copy &Копіювати @@ -44484,9 +43849,6 @@ Please set a real Clang executable. <html><head/><body><p>You are trying to run the tool "%1" on an application in %2 mode. The tool is designed to be used %3.</p><p>Run-time characteristics differ significantly between optimized and non-optimized binaries. Analytical findings for one mode may or may not be relevant for the other.</p><p>Running tools that need debug symbols on binaries that don't provide any may lead to missing function names or otherwise insufficient output.</p><p>Do you want to continue and run the tool in %2 mode?</p></body></html> <html><head/><body><p>Ви намагаєтесь запустити інструмент "%1" для програми в режимі %2. Цей інструмент призначено для використання %3.</p><p>Характеристики часу виконання між оптимізованими та неоптимізованими двійковими модулями суттєво відрізняються. Аналітичні дані для одного режиму можуть бути не відповідними для іншого.</p><p>Запуск інструментів, що потребують символів зневадження на двійковий модулях, що їх не мають, може призвести до відсутніх назв функцій або іншого неповного результату.</p><p>Бажаєте продовжити і запустити інструмент в режимі %2?</p></body></html> - - - ::Debugger %1 <shadowed %2> Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. @@ -44547,9 +43909,6 @@ Would you like to overwrite it? %1 вже існує Бажаєте перезаписати його? - - - ::ImageViewer Export %1 Експортувати %1 @@ -44566,9 +43925,6 @@ Would you like to overwrite it? Could not write file "%1". Не вдалось записати файл "%1". - - - ::ImageViewer Zoom In Збільшити diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 8473ba848af..925e9667a67 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -6920,9 +6920,6 @@ However, using the relaxed and extended rules means also that no highlighting/co %1 - - - ClangDiagnosticConfig Project: %1 (based on %2) @@ -6963,14 +6960,11 @@ However, using the relaxed and extended rules means also that no highlighting/co - ClangFormat::ClangFormatConfigWidget + ::ClangFormat Clang-Format Style - - - ClangFormat::ClangFormatGlobalConfigWidget ClangFormat global setting: @@ -7011,9 +7005,6 @@ However, using the relaxed and extended rules means also that no highlighting/co Override Clang Format configuration file with the chosen configuration. - - - ClangFormat::ClangFormatPlugin Open Used .clang-format Configuration File @@ -7022,9 +7013,6 @@ However, using the relaxed and extended rules means also that no highlighting/co The ClangFormat plugin has been built against an unmodified Clang. You might experience formatting glitches in certain circumstances. See https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/README.md for more information. - - - ClangFormatStyleFactory ClangFormat @@ -7607,7 +7595,7 @@ Set a valid executable first. - ClangUtils + ::ClangCodeModel Could not retrieve build directory. @@ -7616,9 +7604,6 @@ Set a valid executable first. Could not create "%1": %2 - - - ::ClangCodeModel Code Model Error @@ -8119,7 +8104,7 @@ Set a valid executable first. - Coco::CocoPlugin + ::Coco Select a Squish Coco CoverageBrowser Executable @@ -8402,7 +8387,7 @@ Set a valid executable first. - ContentWindow + ::Help Open Link 打开链接 @@ -17851,7 +17836,7 @@ Rebuilding the project might help. - DevelopmentTeam + ::Ios %1 - Free Provisioning Team : %2 @@ -18351,7 +18336,7 @@ Rebuilding the project might help. - EmacsKeys::Internal::EmacsKeysPlugin + ::EmacsKeys Delete Character @@ -19190,13 +19175,6 @@ will also disable the following plugins: 未使用的变量 - - ::GLSLEditor - - GLSL - GLSL - - ::CppEditor @@ -21457,7 +21435,7 @@ Remote: %4 - GitLab::GitLabCloneDialog + ::GitLab Clone Repository @@ -21518,9 +21496,6 @@ Remote: %4 Cloning failed. - - - GitLab::GitLabDialog GitLab @@ -21587,9 +21562,6 @@ Do you want to disable SSL verification for this server? Note: This can expose you to man-in-the-middle attack. - - - GitLab::GitLabOptionsPage Host: 主机: @@ -21610,13 +21582,6 @@ Note: This can expose you to man-in-the-middle attack. HTTPS: - - GitLab - - - - - GitLab::GitLabOptionsWidget Default: 默认: @@ -21665,13 +21630,6 @@ Note: This can expose you to man-in-the-middle attack. Add 添加 - - - GitLab::GitLabPlugin - - GitLab - - GitLab... @@ -21684,13 +21642,6 @@ Note: This can expose you to man-in-the-middle attack. Invalid GitLab configuration. For a fully functional configuration, you need to set up host name or address and an access token. Providing the path to curl is mandatory. - - - GitLab::GitLabProjectSettingsWidget - - Host: - 主机: - Linked GitLab Configuration: @@ -21715,10 +21666,6 @@ Note: This can expose you to man-in-the-middle attack. Remote host does not match chosen GitLab configuration. - - Check settings for misconfiguration. - - Accessible (%1). @@ -21737,7 +21684,7 @@ Note: This can expose you to man-in-the-middle attack. - GlslEditor::Internal::GlslEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -21943,14 +21890,6 @@ Note: This can expose you to man-in-the-middle attack. No documentation available. 没有可用文档。 - - Open Link - 打开链接 - - - Open Link as New Page - 在新页面打开连接 - Copy Link 复制链接 @@ -22290,7 +22229,7 @@ Note: This can expose you to man-in-the-middle attack. - HeobData + ::Valgrind Process %1 进程%1 @@ -22351,9 +22290,6 @@ Note: This can expose you to man-in-the-middle attack. Heob: Failure in process attach handshake (%1). - - - HeobDialog New 新建 @@ -24115,7 +24051,7 @@ Error: %5 - Marketplace::Internal::QtMarketplaceWelcomePage + ::Marketplace Marketplace @@ -26654,7 +26590,7 @@ You might find further explanations in the Application Output view. - ProMessageHandler + ::QtSupport [Inexact] Prefix used for output from the cumulative evaluation of project files. @@ -35822,11 +35758,7 @@ Locked components cannot be modified or selected. - QmlEngine - - JS Source for %1 - %1的JS源码 - + ::Debugger Anonymous Function 匿名函数 @@ -36750,7 +36682,7 @@ the QML editor know about a likely URI. - QmlManager + ::QmlProjectManager <Current File> <当前文件> @@ -39757,9 +39689,6 @@ Control process failed to start. Sort Alphabetically 按字母排序 - - - ResourceTopLevelNode %1 Prefix: %2 @@ -39772,13 +39701,6 @@ Control process failed to start. - - RunConfigSelector - - Run Without Deployment - 忽略部署直接运行 - - ScaleToolAction @@ -44915,7 +44837,7 @@ Will not be applied to whitespace in comments and strings. - TopicChooser + ::Help Choose a topic for <b>%1</b>: 为<b>%1</b>选择一个标题: @@ -46818,10 +46740,6 @@ To disable a variable, prefix the line with "#". When a problem is detected, the application is interrupted and can be debugged. - - Heob - - Ctrl+Alt+H diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 33a5f2b999a..c31fe46819f 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -389,7 +389,7 @@ - ContentWindow + ::Help Open Link 開啟連結 @@ -559,14 +559,6 @@ <b>Warning:</b> You are changing a read-only file. <b>警告：</b> 您正在變更一個唯讀檔。 - - Next Open Document in History - 歷史紀錄中下一個開啟文件 - - - Previous Open Document in History - 歷史紀錄中前一個開啟文件 - Go Back 返回 @@ -579,10 +571,6 @@ Meta+E Meta+E - - Ctrl+E - Ctrl+E - %1,2 %1,2 @@ -1108,14 +1096,6 @@ Installed Plugins 已安裝的外掛程式 - - Plugin Details of %1 - %1 的外掛程式詳情 - - - Plugin Errors of %1 - %1 的外掛程式錯誤 - Processes 行程 @@ -1930,9 +1910,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf Override &start script: 覆寫啟動腳本(&S)： - - - ::Debugger Process ID 行程代碼 @@ -1941,9 +1918,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf Refresh 刷新 - - - ::Debugger Select Start Address 選擇開始位址 @@ -1952,9 +1926,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf Enter an address: 輸入位址： - - - ::Debugger Marker File: 標記檔案： @@ -2233,9 +2204,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf This is useful to catch runtime error messages, for example caused by assert(). - - - ::Debugger Symbol Server... 符號伺服器... @@ -2260,9 +2228,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf Do not ask again 不要再問我 - - - ::Debugger This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions. 將除錯工具切換至 「聰明指令操作」（instruction wise operation）模式。它會在單步執行時在源碼檢視中同時顯示反組譯指令。 @@ -2459,9 +2424,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf Checking this will show a column with address information in the stack view during debugging. 勾選此選項會在除錯時於堆疊檢視中顯示一個位址資訊的欄位。 - - - ::Debugger <html><head/><body> <p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html> @@ -2504,9 +2466,6 @@ For more details, see/etc/sysctl.d/10-ptrace.conf Show Qt's namespace for types - - - ::Debugger An exception was triggered. 觸發了一個例外情形。 @@ -2948,9 +2907,6 @@ This might yield incorrect results. About variable's value <沒有資訊> - - - ::Debugger General 一般 @@ -3128,9 +3084,6 @@ at debugger startup. GDB GDB - - - ::Debugger yes 是 @@ -3175,9 +3128,6 @@ at debugger startup. fast 快速 - - - ::Debugger Modules 模組 @@ -3194,9 +3144,6 @@ at debugger startup. Cannot open FiFo %1: %2 無法開啟 Fifo %1：%2 - - - ::Debugger Name 名稱 @@ -3205,16 +3152,10 @@ at debugger startup. Value (Base %1) 值 (%1進位) - - - ::Debugger Registers 暫存器 - - - ::Debugger Error: 錯誤： @@ -3243,9 +3184,6 @@ at debugger startup. Stopped. 已停止。 - - - ::Debugger Source Files 源碼檔 @@ -3310,9 +3248,6 @@ at debugger startup. Binary debug information is accessible for this frame. However, matching sources have not been found. Note that some distributions ship debug sources in separate packages. - - - ::Debugger Thread&nbsp;id: 執行緒&nbsp;代碼： @@ -3369,9 +3304,6 @@ at debugger startup. Break at '&main': 在 main 函式處中斷(&M)： - - - ::Debugger Select GDB Start Script 選擇 GDB 啟動腳本 @@ -4388,7 +4320,7 @@ Reason: %3 - Find::Internal::FindDialog + ::Core &Search 搜尋(&S) @@ -4417,9 +4349,6 @@ Reason: %3 Search && &Replace 搜尋並取代(&R) - - - Find::Internal::FindToolBar Find/Replace 搜尋/取代 @@ -4496,9 +4425,6 @@ Reason: %3 Use Regular Expressions 使用正規表示式 - - - Find::Internal::FindWidget Find 尋找 @@ -4515,25 +4441,10 @@ Reason: %3 ... ... - - Replace - 取代 - - - Replace && Find - 取代並搜尋 - - - Replace All - 全部取代 - Advanced... 進階... - - - Find::SearchResultWindow Search Results 搜尋結果 @@ -5685,14 +5596,6 @@ Add, modify, and remove document filters, which determine the documentation set Indexing Documentation... 正在建立文件索引中... - - Open Link - 開啟連結 - - - Open Link as New Page - 在新頁面開啟連結 - Copy Link 複製連結 @@ -5737,21 +5640,10 @@ Add, modify, and remove document filters, which determine the documentation set <li>If your computer or network is protected by a firewall or proxy, make sure the application is permitted to access the network.</li> - - - IndexWindow &Look for: 尋找(&L)： - - Open Link - 開啟連結 - - - Open Link as New Page - 在新頁面開啟連結 - ::Core @@ -6223,19 +6115,7 @@ Add, modify, and remove document filters, which determine the documentation set - PluginDialog - - Details - 詳情 - - - Error Details - 錯誤詳情 - - - Installed Plugins - 已安裝的外掛程式 - + ::Core Plugin Details of %1 外掛程式 %1 的詳情 @@ -7353,7 +7233,7 @@ to version control (%2)? - QrcEditor + ::ResourceEditor Add 新增 @@ -8090,9 +7970,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Recheck existence of referenced files - - - ::ResourceEditor Open File 開啟檔案 @@ -8114,68 +7991,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t 未命名 - - SharedTools::QrcEditor - - Add Files - 新增檔案 - - - Add Prefix - 新增前置字串 - - - Choose Copy Location - 選擇複製位置 - - - Overwriting Failed - 覆寫失敗 - - - Copying Failed - 複製失敗 - - - Copy - 複製 - - - Skip - 跳過 - - - Abort - 終止 - - - Invalid file location - 無效的檔案位置 - - - The file %1 is not in a subdirectory of the resource file. You now have the option to copy this file to a valid location. - 檔案 %1 沒有在資源檔所在的子目錄中。您可以選擇複製此檔案到一個有效的位置。 - - - Could not overwrite file %1. - 無法覆寫檔案 %1。 - - - Could not copy the file to %1. - 無法複製檔案到 %1。 - - - - SharedTools::ResourceView - - Open File - 開啟檔案 - - - All files (*) - 所有檔案 (*) - - ::Subversion @@ -9443,7 +9258,7 @@ Will not be applied to whitespace in comments and strings. - TopicChooser + ::Help Filter 過濾器 @@ -9560,7 +9375,7 @@ Will not be applied to whitespace in comments and strings. - Cvs + ::CVS CVS CVS @@ -10147,7 +9962,7 @@ Will not be applied to whitespace in comments and strings. - Cvs + ::CVS Checks out a CVS repository and tries to load the contained project. 從 CVS 主目錄中取出，並試著載入裡面包含的專案。 @@ -12415,7 +12230,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Cvs + ::CVS Annotate revision "%1" 註記版本 "%1" @@ -12456,7 +12271,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Find::FindPlugin + ::Core &Find/Replace 搜尋/取代(&F) @@ -12469,10 +12284,6 @@ For qmlproject projects, use the importPaths property to add import paths.Open Advanced Find... 開啟進階搜尋... - - Advanced... - 進階... - Ctrl+Shift+F Ctrl+Shift+F @@ -12850,20 +12661,10 @@ For qmlproject projects, use the importPaths property to add import paths.<style type=text/css>a:link {color: rgb(128, 128, 255, 240);}</style>The project <b>%1</b> is not yet configured<br/><br/>You can configure it in the <a href="projectmode">Projects mode</a><br/> <style type=text/css>a:link {color: rgb(128, 128, 255, 240);}</style>專案 <b>%1</b> 尚未設置。<br/><br/>您可以在<a href="projectmode">專案模式</a>中設置。<br/> - - - TargetSettingsPanelFactory Targets 目標 - - Build & Run - 建置並執行 - - - - ::ProjectExplorer No target defined. 沒有定義目標。 @@ -13091,7 +12892,7 @@ For qmlproject projects, use the importPaths property to add import paths. - FileWidget + ::QmlEditorWidgets Open File 開啟檔案 @@ -13419,16 +13220,10 @@ Requires <b>Qt 4.7.4</b> or newer. QMLRunConfiguration display name. QML 檢視器 - - - QmlManager <Current File> <目前檔案> - - - ::QmlProjectManager Run QML Script 執行 QML 腳本 @@ -13513,16 +13308,10 @@ Requires <b>Qt 4.7.4</b> or newer. 正在啟動："%1" %2 於 %3 - - - ::RemoteLinux Create SIS Package 建立 SIS 套件 - - - ::RemoteLinux self-signed 自行簽署 @@ -15006,10 +14795,6 @@ Ids must begin with a lowercase letter. double click for preview 雙擊以預覽 - - Open File - 開啟檔案 - ::QmlJS @@ -15169,14 +14954,11 @@ Server list was %2. - CheckUndefinedSymbols + ::CppEditor Expected a namespace-name 預期應為命名空間名稱 - - - ::CppEditor Add %1 Declaration 新增 %1 宣告 @@ -15430,9 +15212,6 @@ This feature is only available for GDB. &Message: 訊息(&M)： - - - ::Debugger There is no CDB binary available for binaries in format '%1' 執行檔格式 '%1' 沒有可用的 CDB 執行檔 @@ -15513,9 +15292,6 @@ This feature is only available for GDB. "Select Widget to Watch": Not supported in state '%1'. 「選擇要監看的元件」：在狀態 '%1' 時不支援。 - - - ::Debugger Select Local Cache Folder 選擇本地快取資料夾 @@ -15540,9 +15316,6 @@ This feature is only available for GDB. The folder '%1' could not be created. 資料夾 '%1' 無法被建立。 - - - ::Debugger Attempting to interrupt. 嘗試中斷中。 @@ -15555,9 +15328,6 @@ This feature is only available for GDB. Debugger Test 除錯工具測試 - - - ::Debugger Launching 正在啟動 @@ -15688,9 +15458,6 @@ This feature is only available for GDB. Jump to Line %1 跳到行 %1 - - - ::Debugger Debug 除錯 @@ -15747,9 +15514,6 @@ Details: %3 Tries to install missing debug information. - - - ::Debugger Debugger 除錯工具 @@ -15786,18 +15550,12 @@ Details: %3 Close Debugging Session 關閉除錯工作階段 - - - ::Debugger This does not seem to be a "Debug" build. Setting breakpoints by file name and line number may fail. 這似乎不是個 "Debug" 的建置。 依檔名與行號來設定中斷點可能會失敗。 - - - ::Debugger Connection failure: %1. 連線失敗：%1。 @@ -15818,9 +15576,6 @@ Setting breakpoints by file name and line number may fail. Remote GDB crashed. 遠端 gdb 已崩潰。 - - - ::Debugger Clear Contents 清除內容 @@ -15829,16 +15584,10 @@ Setting breakpoints by file name and line number may fail. Save Contents 儲存內容 - - - ::Debugger Type Ctrl-<Return> to execute a line. 按下 Ctrl-<Return> 執行一行。 - - - ::Debugger Debugger Log 除錯工具紀錄 @@ -15885,9 +15634,6 @@ Setting breakpoints by file name and line number may fail. Status of '%1' changed to 'not connected'. '%1' 的狀態變更為「未連線」。 - - - ::Debugger Internal name 內部名稱 @@ -15942,7 +15688,7 @@ instead of its installation directory when run outside git bash. - EditorManager + ::Core Next Open Document in History 歷史紀錄中下一個開啟的檔案 @@ -15951,22 +15697,6 @@ instead of its installation directory when run outside git bash. Previous Open Document in History 歷史紀錄中前一個開啟的檔案 - - Go Back - 返回 - - - Go Forward - 前進 - - - Split - 分割 - - - Split Side by Side - 左右分割 - Close Document 關閉文件 @@ -16618,9 +16348,6 @@ Reason: %2 Queries the device for information 查詢裝置資訊 - - - ::RemoteLinux Unable to remove existing file '%1': %2 現有檔案 '%1' 無法被移除：%2 @@ -17701,9 +17428,6 @@ Local pulls are not applied to the master branch. Helgrind Thread ID Helgrind 執行緒代碼 - - - ::Valgrind Location: 位置： @@ -17712,9 +17436,6 @@ Local pulls are not applied to the master branch. Instruction pointer: 指令指標： - - - ::Valgrind Could not parse hex number from "%1" (%2) 無法剖析從"%1" (%2) 來的十六進位數 @@ -17767,9 +17488,6 @@ Local pulls are not applied to the master branch. Unexpected exception caught during parsing. 剖析時抓取到未預期的例外狀況。 - - - ::Valgrind Description 描述 @@ -18404,9 +18122,6 @@ to version control (%2) &Connection: 連線(&C)： - - - ::Debugger Memory... 記憶體... @@ -18415,9 +18130,6 @@ to version control (%2) Debugger Toolbar 除錯器工具列 - - - ::Debugger No function selected. 沒有選擇函式。 @@ -18869,9 +18581,6 @@ Qt Creator cannot attach to it. Qt Sources Qt 源碼 - - - ::Debugger %1 (%2) %1 (%2) @@ -18880,16 +18589,10 @@ Qt Creator cannot attach to it. <html><head/><body><table><tr><td>ABI:</td><td><i>%1</i></td></tr><tr><td>Debugger:</td><td>%2</td></tr> <html><head/><body><table><tr><td>ABI：</td><td><i>%1</i></td></tr><tr><td>除錯工具：</td><td>%2</td></tr> - - - ::Debugger Debugging complex command lines is currently not supported on Windows. 目前不支援在 Windows 中對複雜的命令列除錯。 - - - ::Debugger Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4. 行程已啟動，行程代碼：0x%1，執行緒代碼：0x%2，代碼段：0x%3，資料段：0x%4。 @@ -18904,16 +18607,10 @@ Qt Creator cannot attach to it. Could not obtain device. 無法獲得裝置。 - - - ::Debugger Fatal engine shutdown. Incompatible binary or IPC error. 嚴重的引擎錯誤關閉。不相容的二進位檔或 IPC 錯誤。 - - - ::Debugger qtcreator-lldb failed to start: %1 qtcreator-lldb 無法啟動：%1 @@ -18926,16 +18623,10 @@ Qt Creator cannot attach to it. SSH connection error: %1 SSH 連線錯誤：%1 - - - ::Debugger LLDB LLDB - - - ::Debugger Memory at 0x%1 記憶體在 0x%1 @@ -18948,9 +18639,6 @@ Qt Creator cannot attach to it. The memory contents cannot be shown as no viewer plugin for binary data has been loaded. 因為沒有載入二進制資料檢視器外掛程式，因此無法顯示記憶體內容。 - - - ::Debugger The slave debugging engine required for combined QML/C++-Debugging could not be created: %1 從屬除錯引擎需要整合QML/C++-除錯無法被建立: %1 @@ -18963,9 +18651,6 @@ Qt Creator cannot attach to it. QML debugger activated 已啟用 QML 除錯工具 - - - ::Debugger Qt Creator Qt Creator @@ -19106,14 +18791,7 @@ Do you want to retry? - ::GLSLEditor - - GLSL - GLSL - - - - GLSLEditor::Internal::GLSLEditorPlugin + ::GlslEditor GLSL GLSL sub-menu in the Tools menu @@ -19151,9 +18829,6 @@ Do you want to retry? Vertex Shader (Desktop OpenGL) 頂點著色器 (Desktop OpenGL) - - - GLSLEditor::GLSLFileWizard New %1 新增 %1 @@ -19674,9 +19349,6 @@ Valid from: %2. 支援 %n 個裝置： - - - ::RemoteLinux The binary package '%1' was patched to be installable after being self-signed. %2 @@ -19690,9 +19362,6 @@ Use a developer certificate or any other signing option to prevent this patching Cannot create Smart Installer package as the Smart Installer's base file is missing. Please ensure that it is located in the SDK. 無法建立自動安裝包因為自動安裝器檔案丟失。請檢查檔案存在於SDK下。 - - - ::RemoteLinux Clean 清除 @@ -19743,9 +19412,6 @@ Use a developer certificate or any other signing option to prevent this patching 已建立 %1。 - - - ::RemoteLinux Open Containing Folder 開啟包含的資料夾 @@ -19830,9 +19496,6 @@ Use a developer certificate or any other signing option to prevent this patching Global vendor name: 全域供應商名稱： - - - ::RemoteLinux Publish Qt Symbian Applications to Nokia Store 發佈 Qt Symbian 應用程式到 Nokia Store @@ -19859,9 +19522,6 @@ Your application will also be rejected by Nokia Store QA if you choose an unrele 你的應用程式同樣會因為你採用了未發佈的 Qt 版本而被 Nokia Store 駁回。 - - - ::RemoteLinux Publishing to Nokia Store 發佈到 Nokia Store @@ -20683,9 +20343,6 @@ if (a && Compiler: - - - ::QtSupport Version name: 版本名稱： @@ -20698,9 +20355,6 @@ if (a && Edit 編輯 - - - ::QtSupport Name 名稱 @@ -20740,9 +20394,6 @@ if (a && Save Suppression 儲存Suppression - - - ::Valgrind Generic Settings 一般設定 @@ -21061,7 +20712,7 @@ Would you like to overwrite them? - Cvs + ::CVS Ignore whitespace 忽略空白 @@ -21077,9 +20728,6 @@ Would you like to overwrite them? Previous 前一個 - - - ::Debugger Memory at Register '%1' (0x%2) 在暫存器 '%1' 的記憶體 (0x%2) @@ -21771,9 +21419,6 @@ Do you want to retry? %1 is a name of the Publish Step i.e. Clean Step 正在執行 %1 - - - ::RemoteLinux No valid Qt version has been detected.<br>Define a correct Qt version in "Options > Qt4" 沒有偵測到有效的 Qt 版本。<br>請在「選項」─「Qt4」中定義一個有效的 Qt 版本 @@ -21859,7 +21504,7 @@ Do you want to retry? - BaseQtVersion + ::QtSupport The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4). @@ -21896,16 +21541,10 @@ Do you want to retry? Version: 版本： - - - ::QtSupport Getting Started 入門 - - - ::QtSupport <specify a name> <指定一個名稱> @@ -22019,9 +21658,6 @@ Do you want to retry? SBS v2 directory: SBS v2 目錄： - - - ::QtSupport MinGW from %1 MinGW 從 %1 @@ -22041,16 +21677,10 @@ Do you want to retry? Remote Directory 遠端目錄 - - - ::RemoteLinux New Generic Linux Device Configuration Setup 新的通用型 Linux 裝置設定 - - - ::RemoteLinux Connection Data 連線資料 @@ -22059,9 +21689,6 @@ Do you want to retry? Generic Linux Device 通用 Linux 裝置 - - - ::RemoteLinux Setup Finished 設定完成 @@ -22072,9 +21699,6 @@ In addition, device connectivity will be tested. 將建立新的裝置設置。 此外，也會測試裝置的連線。 - - - ::RemoteLinux Start Wizard 啟動精靈 @@ -22087,9 +21711,6 @@ In addition, device connectivity will be tested. Available device types: 可用的裝置型態： - - - ::RemoteLinux SDK Connectivity SDK 連接性 @@ -22098,9 +21719,6 @@ In addition, device connectivity will be tested. Mad Developer Mad 開發者 - - - ::RemoteLinux Create Debian Package 建立 Debian 套件 @@ -22109,9 +21727,6 @@ In addition, device connectivity will be tested. Create RPM Package 建立 RPM 套件 - - - ::RemoteLinux Choose Public Key File 選擇公開金鑰檔 @@ -22128,9 +21743,6 @@ In addition, device connectivity will be tested. Deployment finished successfully. 佈署成功完成。 - - - ::RemoteLinux Preparing remote side... @@ -22153,9 +21765,6 @@ In addition, device connectivity will be tested. Not enough free ports on device for debugging. 裝置上可用於除錯的連接埠不夠。 - - - ::RemoteLinux The .pro file is being parsed. 正在剖析 .pro 檔案。 @@ -22199,16 +21808,10 @@ In addition, device connectivity will be tested. System Environment 系統環境變數 - - - ::RemoteLinux (on Remote Generic Linux Host) (在遠端通用Linux主機) - - - ::RemoteLinux Fetch Device Environment 抓取裝置環境 @@ -22265,9 +21868,6 @@ In addition, device connectivity will be tested. Fetching environment failed: %1 抓取環境失敗：%1 - - - ::RemoteLinux Starting remote process... @@ -22280,9 +21880,6 @@ In addition, device connectivity will be tested. 遠端行程執行結束。返回值為 %1。 - - - ::RemoteLinux Run on remote Linux device 在遠端 Linux 裝置上執行 @@ -22318,9 +21915,6 @@ In addition, device connectivity will be tested. 分析 %1 的效能中 - - - ::Valgrind Valgrind Function Profiler Valgrind 函式效能分析器 @@ -22333,9 +21927,6 @@ In addition, device connectivity will be tested. Profile Costs of this Function and its Callees 分析此項功能和被調用者的花銷 - - - ::Valgrind Callers 呼叫者 @@ -22452,16 +22043,10 @@ In addition, device connectivity will be tested. Populating... 填充... - - - ::Valgrind All functions with an inclusive cost ratio higher than %1 (%2 are hidden) 所有功能包含一個成本比%1高的 (%2 被隱藏) - - - ::Valgrind Analyzing Memory 記憶體分析中 @@ -22472,16 +22057,10 @@ In addition, device connectivity will be tested. %1 的記憶體分析中 - - - ::Valgrind in %1 於 %1 - - - ::Valgrind Copy Selection 複製選擇 @@ -22490,9 +22069,6 @@ In addition, device connectivity will be tested. Suppress Error 防止錯誤 - - - ::Valgrind External Errors 外部錯誤 @@ -22557,9 +22133,6 @@ In addition, device connectivity will be tested. Error occurred parsing valgrind output: %1 剖析 valgrind 輸出時發生錯誤：%1 - - - ::Valgrind Callee 被呼叫者 @@ -22576,9 +22149,6 @@ In addition, device connectivity will be tested. Calls 呼叫 - - - ::Valgrind Previous command has not yet finished. 之前的命令還沒有完成. @@ -22611,9 +22181,6 @@ In addition, device connectivity will be tested. Downloading remote profile data... 下載遠端設置數據... - - - ::Valgrind Function: 函式： @@ -22688,9 +22255,6 @@ In addition, device connectivity will be tested. Incl. Cost: %1 其中花費: %1 - - - ::Valgrind %1 in %2 於 %2 中的 %1 @@ -22699,9 +22263,6 @@ In addition, device connectivity will be tested. %1:%2 in %3 於 %3 中的 %1:%2 - - - ::Valgrind Last-level 最後等級 @@ -22758,16 +22319,10 @@ In addition, device connectivity will be tested. Position: 位置： - - - ::Valgrind Parsing Profile Data... 正在剖析效能分析資料... - - - ::Valgrind No network interface found for remote analysis. 找不到用於遠端分析的網路介面。 @@ -22784,16 +22339,10 @@ In addition, device connectivity will be tested. No Network Interface was chosen for remote analysis 尚未選擇遠端分析使用的網路介面 - - - ::Valgrind Could not determine remote PID. 無法決定遠端的行程代碼。 - - - ::Valgrind Valgrind options: %1 Valgrind 選項：%1 @@ -22941,25 +22490,6 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi 文字 - - StatusDisplay - - No QML events recorded - 沒有錄製 QML 事件 - - - Profiling application - 效能分析應用程式 - - - Loading data - 載入資料中 - - - Application stopped before loading all data - 載入所有資料前應用程式已停止 - - FlickableGroupBox @@ -23681,9 +23211,6 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi Output: 輸出： - - - ::Debugger <p>An uncaught exception occurred:</p><p>%1</p> <p>發生了一個未被捕捉到的例外狀況：</p><p>%1</p> @@ -23702,7 +23229,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - Find::IFindFilter + ::Core Case sensitive 區分大小寫 @@ -23727,17 +23254,10 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi , , - - - Find::Internal::SearchResultWidget Search was canceled. - - Cancel - 取消 - Repeat the search with same parameters 用相同的參數重複搜尋 @@ -23746,18 +23266,10 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi Search again 再次搜尋 - - Replace with: - 取代為： - Replace all occurrences 取代所有出現位置 - - Replace - 取代 - This change cannot be undone. 這項變將無法復原。 @@ -24056,9 +23568,6 @@ Is the device connected and set up for network access? Connection error: %1 連線錯誤：%1 - - - ::RemoteLinux Cannot deploy: %1 無法佈署：%1 @@ -24075,9 +23584,6 @@ Is the device connected and set up for network access? Deploy step finished. 佈署步驟完成。 - - - ::RemoteLinux Successfully uploaded package file. 上傳套件檔成功。 @@ -24090,9 +23596,6 @@ Is the device connected and set up for network access? Package installed. 套件已安裝。 - - - ::RemoteLinux SFTP initialization failed: %1 SFTP 初始化失敗：%1 @@ -24129,9 +23632,6 @@ Is the device connected and set up for network access? Uploading file '%1'... 上傳檔案 '%1' 中... - - - ::RemoteLinux Incremental deployment 遞增佈署 @@ -24140,16 +23640,10 @@ Is the device connected and set up for network access? Command line: 命令列： - - - ::RemoteLinux Upload files via SFTP 通過 SFTP 上傳檔案 - - - ::RemoteLinux Generic Linux 通用 Linux @@ -24166,16 +23660,10 @@ Is the device connected and set up for network access? Deploy Public Key... 佈署公開金鑰... - - - ::RemoteLinux (default for %1) (%1 的預設) - - - ::RemoteLinux Linux Device Configurations Linux 裝置設置 @@ -24224,9 +23712,6 @@ Is the device connected and set up for network access? &Generate SSH Key... 產生 SSH 金鑰(&G)... - - - ::RemoteLinux Close 關閉 @@ -24239,9 +23724,6 @@ Is the device connected and set up for network access? Device test failed. 裝置測試失敗。 - - - ::RemoteLinux Connecting to host... 連線到主機... @@ -24278,9 +23760,6 @@ Is the device connected and set up for network access? 以下指定連接埠現正使用中：%1 - - - ::RemoteLinux Preparing SFTP connection... 準備建立 SFTP 連線... @@ -24297,9 +23776,6 @@ Is the device connected and set up for network access? Failed to upload package: %2 上傳套件失敗：%2 - - - ::RemoteLinux Updateable Project Files 可更新的專案檔 @@ -24320,16 +23796,10 @@ Is the device connected and set up for network access? &Uncheck All 全部取消勾選(&U) - - - ::RemoteLinux Run custom remote command 執行自訂的遠端指令 - - - ::RemoteLinux No command line given. 沒有指定命令列。 @@ -24354,9 +23824,6 @@ Is the device connected and set up for network access? Remote command finished successfully. 遠端指令成功完成。 - - - ::RemoteLinux Deploy to Remote Linux Host 佈署到遠端 Linux 主機 @@ -24373,9 +23840,6 @@ Is the device connected and set up for network access? (No device) (沒有裝置) - - - ::RemoteLinux Error running remote process: %1 執行遠端行程時發生錯誤：%1 @@ -24386,9 +23850,6 @@ Remote stderr was: '%1' 遠端的標準錯誤輸出為：'%1' - - - ::RemoteLinux Connection failure: %1 連線失敗：%1 @@ -24397,9 +23858,6 @@ Remote stderr was: '%1' Installing package failed. 安裝套件失敗。 - - - ::RemoteLinux PID 行程代碼 @@ -24426,16 +23884,10 @@ Remote stderr was: %1 遠端的標準錯誤輸出為：'%1' - - - ::RemoteLinux Device Configurations 裝置設置 - - - ::RemoteLinux Could not start remote process: %1 無法啟動遠端行程：%1 @@ -24454,9 +23906,6 @@ Remote error output was: %1 遠端的標準錯誤輸出為：'%1' - - - ::RemoteLinux SSH Key Configuration SSH 金鑰設置 @@ -24505,9 +23954,6 @@ Remote error output was: %1 Failed to create directory: '%1'. 建立目錄失敗：'%1'。 - - - ::RemoteLinux Public key error: %1 公開金鑰錯誤：%1 @@ -24520,9 +23966,6 @@ Remote error output was: %1 Key deployment failed: %1. 佈署金鑰失敗：%1。 - - - ::RemoteLinux Select Sysroot 選擇 Sysroot @@ -24567,9 +24010,6 @@ Remote error output was: %1 Running command: %1 執行指令：%1 - - - ::RemoteLinux Packaging finished successfully. 打包已順利完成。 @@ -24618,9 +24058,6 @@ Remote error output was: %1 Create tarball 建立 tarball 歸檔 - - - ::RemoteLinux (default) (預設) @@ -24629,9 +24066,6 @@ Remote error output was: %1 %1 (default) - - - ::RemoteLinux No tarball creation step found. 找不到 tarball 建立步驟。 @@ -25129,9 +24563,6 @@ p, li { white-space: pre-wrap; } Always add a breakpoint on the <i>%1()</i> function. - - - ::Debugger Enable LLDB 開啟 LLDB @@ -25140,9 +24571,6 @@ p, li { white-space: pre-wrap; } Use GDB Python dumpers 使用 GDB python dumpers - - - ::Debugger Start Remote Engine 啟動遠端引擎 @@ -25458,9 +24886,6 @@ p, li { white-space: pre-wrap; } Machine type: - - - ::RemoteLinux WizardPage 精靈頁面 @@ -25493,16 +24918,10 @@ p, li { white-space: pre-wrap; } The file containing the user's private key: 包含使用者私密金鑰的檔案： - - - ::RemoteLinux Device Test 裝置測試 - - - ::RemoteLinux Form 表單 @@ -25523,9 +24942,6 @@ p, li { white-space: pre-wrap; } Files to install for subproject: 為子專案安裝的檔案： - - - ::RemoteLinux List of Remote Processes 遠端行程列表 @@ -26097,15 +25513,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - develop - - Develop - 開發 - - - Sessions - 工作階段 - + ::ProjectExplorer Recent Projects 最近使用的專案 @@ -26120,7 +25528,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - examples + ::QtSupport Examples 範例 @@ -26194,7 +25602,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - tutorials + ::QtSupport Tutorials 教學 @@ -26227,7 +25635,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - SessionItem + ::ProjectExplorer Clone 複製 @@ -26240,9 +25648,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Delete 刪除 - - - Sessions %1 (last session) %1 (上次的工作階段) @@ -26253,7 +25658,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - StaticAnalysisMessages + ::QmlJS do not use '%1' as a constructor 不要用 '%1' 做為建構子 @@ -26895,9 +26300,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Misc Types 其他型態 - - - ::Debugger Debugger Settings 除錯工具設定 @@ -26922,9 +26324,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Enable Debugging of Subprocesses - - - ::Debugger Anonymous Function @@ -27273,14 +26672,6 @@ references to elements in other files, loops, etc.) ::QtSupport - - Examples - 範例 - - - Tutorials - 教學 - Copy Project to writable Location? 是否要複製專案到可寫入的位置？ @@ -27321,9 +26712,6 @@ references to elements in other files, loops, etc.) Failed to open project 開啟專案失敗 - - - ::QtSupport MeeGo/Harmattan MeeGo/Harmattan @@ -29475,9 +28863,6 @@ Please choose a valid package name for your application (e.g. "org.example. Add Breakpoint 新增中斷點 - - - ::Debugger Server port: @@ -29558,9 +28943,6 @@ Please choose a valid package name for your application (e.g. "org.example. Debugger for "%1" - - - ::Debugger &Engine: @@ -29582,9 +28964,6 @@ Please choose a valid package name for your application (e.g. "org.example. Label text for path configuration. %2 is "x-bit version". <html><body><p>請在此指定 <a href="%1">Windows 主控台除錯器執行檔</a> (%2) 的路徑。</p></body></html> - - - ::Debugger No debugger set up. @@ -29627,7 +29006,7 @@ Please choose a valid package name for your application (e.g. "org.example. - DeviceProcessesDialog + ::ProjectExplorer &Attach to Process @@ -29673,9 +29052,6 @@ Please choose a valid package name for your application (e.g. "org.example. The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. In the Qt Creator Build and Run preferences page, select a Qt version, expand the Details section and click Build All. - - - ::Debugger Error Loading Core File @@ -29717,9 +29093,6 @@ Please choose a valid package name for your application (e.g. "org.example. 附加到 core 檔 "%1" 失敗： - - - ::Debugger Cannot set up communication with child process: %1 無法與子行程建立通訊：%1 @@ -29757,9 +29130,6 @@ Please choose a valid package name for your application (e.g. "org.example. Interrupting not possible 無法中斷 - - - ::Debugger Remote Error 遠端錯誤 @@ -29808,16 +29178,10 @@ Please choose a valid package name for your application (e.g. "org.example. Process gdbserver finished. Status: %1 gdbserver 行程已完成。狀態：%1 - - - ::Debugger Download of remote file succeeded. - - - ::Debugger Module Name @@ -29899,9 +29263,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. End address of loaded module <未知> - - - ::Debugger Update Module List 更新模組列表 @@ -29950,9 +29311,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Show Dependencies of "%1" 顯示 "%1" 的相依性 - - - ::Debugger Connecting to debug server %1:%2 正在連線到除錯伺服器 %1:%2 @@ -29986,9 +29344,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Closing. - - - ::Debugger Success: @@ -29997,9 +29352,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Properties 屬性 - - - ::Debugger The %1 attribute at line %2, column %3 cannot be changed without reloading the QML application. 第 %2 行第 %3 欄的 %1 屬性必須要重新載入 QML 應用程式才能更改。 @@ -30024,9 +29376,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Reload QML - - - ::Debugger Reload Register Listing 重新載入暫存器列表 @@ -30075,9 +29424,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Binary 二進位 - - - ::Debugger Snapshots 快照 @@ -30126,9 +29472,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Frame #%1 (%2) 框架 #%1 (%2) - - - ::Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -30415,9 +29758,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Unable to move new debian directory to '%1'. 無法將新的 debian 目錄移動到'%1'。 - - - ::RemoteLinux Checking whether to start Qemu... @@ -30438,9 +29778,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Cannot deploy: You want to deploy to Qemu, but it is not enabled for this Qt version. - - - ::RemoteLinux Add Packaging Files to Project 新增打包檔到專案中 @@ -30731,10 +30068,6 @@ Remote stderr was: %1 Add 新增 - - Clone - 複製 - Remove 移除 @@ -31017,9 +30350,6 @@ Qt Creator 知道一個相似的URI. Could not copy the file to %1. 無法複製檔案到 %1。 - - - ::ResourceEditor The file name is empty. 檔名為空。 @@ -31036,9 +30366,6 @@ Qt Creator 知道一個相似的URI. Cannot write file. Disk full? 無法寫入檔案。磁碟空間是否已滿？ - - - ::ResourceEditor All files (*) 所有檔案 (*) diff --git a/src/libs/advanceddockingsystem/advanceddockingsystemtr.h b/src/libs/advanceddockingsystem/advanceddockingsystemtr.h index 15e24fc45b8..2d1eccce1eb 100644 --- a/src/libs/advanceddockingsystem/advanceddockingsystemtr.h +++ b/src/libs/advanceddockingsystem/advanceddockingsystemtr.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-2.1-or-later OR GPL-3.0-or-later #pragma once diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index f8cc7a8dee1..44bbc5ffdbf 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -952,7 +952,7 @@ namespace ADS const bool success = write(workspace, data, &errorString); if (!success) QMessageBox::critical(parent, - QCoreApplication::translate("Utils::FileSaverBase", "File Error"), + QCoreApplication::translate("::Utils", "File Error"), errorString); return success; } diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 50cd1241de8..de18711233b 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -57,6 +57,7 @@ using namespace Utils; namespace { enum { MAX_FUNCTION_LIKE_ARGUMENTS_COUNT = 100, + MAX_INCLUDE_DEPTH = 200, MAX_TOKEN_EXPANSION_COUNT = 5000, MAX_TOKEN_BUFFER_DEPTH = 16000 // for when macros are using some kind of right-folding, this is the list of "delayed" buffers waiting to be expanded after the current one. }; @@ -1677,6 +1678,15 @@ void Preprocessor::handleIncludeDirective(PPToken *tk, bool includeNext) if (m_cancelChecker && m_cancelChecker()) return; + GuardLocker depthLocker(m_includeDepthGuard); + if (m_includeDepthGuard.lockCount() > MAX_INCLUDE_DEPTH) { + // FIXME: Categorized logging! +#ifndef NO_DEBUG + std::cerr << "Maximum include depth exceeded" << m_state.m_currentFileName << std::endl; +#endif + return; + } + m_state.m_lexer->setScanAngleStringLiteralTokens(true); lex(tk); // consume "include" token m_state.m_lexer->setScanAngleStringLiteralTokens(false); diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index 49cdab2b829..c888e8775d6 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -29,6 +29,8 @@ #include #include +#include + #include #include #include @@ -241,6 +243,7 @@ private: Environment *m_env; QByteArray m_scratchBuffer; CancelChecker m_cancelChecker; + Utils::Guard m_includeDepthGuard; bool m_expandFunctionlikeMacros; bool m_keepComments; diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp index 791da781641..31a1355e469 100644 --- a/src/libs/extensionsystem/iplugin.cpp +++ b/src/libs/extensionsystem/iplugin.cpp @@ -3,9 +3,10 @@ #include "iplugin.h" #include "iplugin_p.h" -#include "pluginmanager.h" #include "pluginspec.h" +#include + /*! \class ExtensionSystem::IPlugin \inheaderfile extensionsystem/iplugin.h @@ -186,17 +187,35 @@ bool IPlugin::initialize(const QStringList &arguments, QString *errorString) return true; } +/*! + Registers a function object that creates a test object. + + The ownership of the created object is transferred to the plugin. + + \sa createTestObjects() +*/ + +void IPlugin::addTestCreator(const TestCreator &creator) +{ + d->testCreators.append(creator); +} + /*! Returns objects that are meant to be passed on to \l QTest::qExec(). This function will be called if the user starts \QC with \c {-test PluginName} or \c {-test all}. + By default, this function creates test objects using the functors + added by \c addTest(). + The ownership of returned objects is transferred to caller. + + \sa addTest() */ QVector IPlugin::createTestObjects() const { - return {}; + return Utils::transform(d->testCreators, &TestCreator::operator()); } /*! diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h index 188797a2641..a516a2a2861 100644 --- a/src/libs/extensionsystem/iplugin.h +++ b/src/libs/extensionsystem/iplugin.h @@ -7,6 +7,8 @@ #include +#include + namespace ExtensionSystem { namespace Internal { @@ -44,6 +46,11 @@ public: protected: virtual void initialize() {} + using TestCreator = std::function; + template + void addTest(Args && ...args) { addTestCreator([args...] { return new Test(args...); }); } + void addTestCreator(const TestCreator &creator); + signals: void asynchronousShutdownFinished(); diff --git a/src/libs/extensionsystem/iplugin_p.h b/src/libs/extensionsystem/iplugin_p.h index f363b80f234..036525d64e0 100644 --- a/src/libs/extensionsystem/iplugin_p.h +++ b/src/libs/extensionsystem/iplugin_p.h @@ -15,6 +15,7 @@ class IPluginPrivate { public: PluginSpec *pluginSpec; + QList> testCreators; }; } // namespace Internal diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h index 0be7ea5d4af..12b32a86155 100644 --- a/src/libs/extensionsystem/pluginspec_p.h +++ b/src/libs/extensionsystem/pluginspec_p.h @@ -79,6 +79,8 @@ public: PluginSpec::PluginArgumentDescriptions argumentDescriptions; IPlugin *plugin = nullptr; + QList> registeredPluginTests; + PluginSpec::State state = PluginSpec::Invalid; bool hasError = false; QString errorString; diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h index c53ab45d0fb..68e0e1fc192 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.h +++ b/src/libs/languageserverprotocol/jsonrpcmessages.h @@ -5,7 +5,6 @@ #include "basemessage.h" #include "jsonkeys.h" -#include "languageserverprotocoltr.h" #include "lsptypes.h" #include @@ -163,7 +162,8 @@ public: if (auto parameter = params()) return parameter->isValid(); if (errorMessage) - *errorMessage = Tr::tr("No parameters in \"%1\".").arg(method()); + *errorMessage = QCoreApplication::translate("::LanguageServerProtocol", + "No parameters in \"%1\".").arg(method()); return false; } }; @@ -375,7 +375,8 @@ public: if (id().isValid()) return true; if (errorMessage) - *errorMessage = Tr::tr("No ID set in \"%1\".").arg(this->method()); + *errorMessage = QCoreApplication::translate("::LanguageServerProtocol", + "No ID set in \"%1\".").arg(this->method()); return false; } diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp index 31bf4b9ca95..cef756f1b9f 100644 --- a/src/libs/qmljs/parser/qmldirparser.cpp +++ b/src/libs/qmljs/parser/qmldirparser.cpp @@ -268,14 +268,28 @@ bool QmlDirParser::parse(const QString &source) _classNames.append(sections[1]); } else if (sections[0] == QLatin1String("internal")) { - if (sectionCount != 3) { + if (sectionCount == 3) { + Component entry(sections[1], sections[2], -1, -1); + entry.internal = true; + _components.insert(entry.typeName, entry); + } else if (sectionCount == 4) { + int major, minor; + if (parseVersion(sections[2], &major, &minor)) { + Component entry(sections[1], sections[3], major, minor); + entry.internal = true; + _components.insert(entry.typeName, entry); + } else { + reportError(lineNumber, 0, + QStringLiteral("invalid version %1, expected .") + .arg(sections[2])); + continue; + } + } else { reportError(lineNumber, 0, - QStringLiteral("internal types require 2 arguments, but %1 were provided").arg(sectionCount - 1)); + QStringLiteral("internal types require 2 or 3 arguments, " + "but %1 were provided").arg(sectionCount - 1)); continue; } - Component entry(sections[1], sections[2], -1, -1); - entry.internal = true; - _components.insert(entry.typeName, entry); } else if (sections[0] == QLatin1String("singleton")) { if (sectionCount < 3 || sectionCount > 4) { reportError(lineNumber, 0, diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 2141efa8674..72e667d76a6 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -10,6 +10,7 @@ #include "pathchooser.h" #include "qtcassert.h" #include "qtcsettings.h" +#include "utilstr.h" #include "variablechooser.h" #include @@ -2009,14 +2010,14 @@ void DoubleAspect::setSingleStep(double step) Its visual representation is a QComboBox with three items. */ -TriStateAspect::TriStateAspect(const QString onString, const QString &offString, +TriStateAspect::TriStateAspect(const QString &onString, const QString &offString, const QString &defaultString) { setDisplayStyle(DisplayStyle::ComboBox); setDefaultValue(TriState::Default); - addOption(onString); - addOption(offString); - addOption(defaultString); + addOption(onString.isEmpty() ? Tr::tr("Enable") : onString); + addOption(offString.isEmpty() ? Tr::tr("Disable") : offString); + addOption(defaultString.isEmpty() ? Tr::tr("Leave at Default") : defaultString); } TriState TriStateAspect::value() const diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index 9b5bf45ab49..413a17e6245 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -8,7 +8,8 @@ #include "infolabel.h" #include "macroexpander.h" #include "pathchooser.h" -#include "utilstr.h" + +#include #include #include @@ -498,11 +499,11 @@ private: class QTCREATOR_UTILS_EXPORT TriStateAspect : public SelectionAspect { Q_OBJECT + public: - TriStateAspect( - const QString onString = Tr::tr("Enable"), - const QString &offString = Tr::tr("Disable"), - const QString &defaultString = Tr::tr("Leave at Default")); + TriStateAspect(const QString &onString = {}, + const QString &offString = {}, + const QString &defaultString = {}); TriState value() const; void setValue(TriState setting); diff --git a/src/libs/utils/asynctask.h b/src/libs/utils/asynctask.h index e035977401b..1a6ae7d1b6a 100644 --- a/src/libs/utils/asynctask.h +++ b/src/libs/utils/asynctask.h @@ -44,13 +44,11 @@ public: void setAsyncCallData(const Function &function, const Args &...args) { m_startHandler = [=] { - return Internal::runAsync_internal(m_threadPool, m_stackSize, m_priority, - function, args...); + return Utils::runAsync(m_threadPool, m_priority, function, args...); }; } void setFutureSynchronizer(FutureSynchronizer *synchorizer) { m_synchronizer = synchorizer; } void setThreadPool(QThreadPool *pool) { m_threadPool = pool; } - void setStackSizeInBytes(const StackSizeInBytes &size) { m_stackSize = size; } void setPriority(QThread::Priority priority) { m_priority = priority; } void start() @@ -75,7 +73,6 @@ private: FutureSynchronizer *m_synchronizer = nullptr; QThreadPool *m_threadPool = nullptr; QThread::Priority m_priority = QThread::InheritPriority; - StackSizeInBytes m_stackSize = {}; QFutureWatcher m_watcher; }; diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index b8fe7903786..3d8354d7a0f 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -19,6 +19,8 @@ #include #include #include +#include +#include #ifdef Q_OS_WIN #ifdef QTCREATOR_PCH_H @@ -30,6 +32,9 @@ #include #endif +#include +#include + namespace Utils { // DeviceFileAccess @@ -397,6 +402,15 @@ void DeviceFileAccess::asyncCopyFile(const FilePath &filePath, cont(copyFile(filePath, target)); } +expected_str DeviceFileAccess::createTempFile(const FilePath &filePath) +{ + Q_UNUSED(filePath) + QTC_CHECK(false); + return make_unexpected(Tr::tr("createTempFile is not implemented for \"%1\"") + .arg(filePath.toUserOutput())); +} + + // DesktopDeviceFileAccess DesktopDeviceFileAccess::~DesktopDeviceFileAccess() = default; @@ -690,6 +704,16 @@ expected_str DesktopDeviceFileAccess::writeFileContents(const FilePath & return res; } +expected_str DesktopDeviceFileAccess::createTempFile(const FilePath &filePath) +{ + QTemporaryFile file(filePath.path()); + file.setAutoRemove(false); + if (!file.open()) + return make_unexpected(Tr::tr("Could not create temporary file in \"%1\" (%2)").arg(filePath.toUserOutput()).arg(file.errorString())); + return FilePath::fromString(file.fileName()).onDevice(filePath); +} + + QDateTime DesktopDeviceFileAccess::lastModified(const FilePath &filePath) const { return QFileInfo(filePath.path()).lastModified(); @@ -930,21 +954,27 @@ expected_str UnixDeviceFileAccess::fileContents(const FilePath &file qint64 limit, qint64 offset) const { - QStringList args = {"if=" + filePath.path(), "status=none"}; + QStringList args = {"if=" + filePath.path()}; if (limit > 0 || offset > 0) { const qint64 gcd = std::gcd(limit, offset); args += QString("bs=%1").arg(gcd); args += QString("count=%1").arg(limit / gcd); args += QString("seek=%1").arg(offset / gcd); } +#ifndef UTILS_STATIC_LIBRARY + const FilePath dd = filePath.withNewPath("dd"); - const RunResult r = runInShell({"dd", args, OsType::OsTypeLinux}); - - if (r.exitCode != 0) + QtcProcess p; + p.setCommand({dd, args, OsType::OsTypeLinux}); + p.runBlocking(); + if (p.exitCode() != 0) { return make_unexpected(Tr::tr("Failed reading file \"%1\": %2") - .arg(filePath.toUserOutput(), QString::fromUtf8(r.stdErr))); - - return r.stdOut; + .arg(filePath.toUserOutput(), p.readAllStandardError())); + } + return p.readAllRawStandardOutput(); +#else + return make_unexpected(QString("Not implemented")); +#endif } expected_str UnixDeviceFileAccess::writeFileContents(const FilePath &filePath, @@ -965,6 +995,65 @@ expected_str UnixDeviceFileAccess::writeFileContents(const FilePath &fil return data.size(); } +expected_str UnixDeviceFileAccess::createTempFile(const FilePath &filePath) +{ + if (!m_hasMkTemp.has_value()) + m_hasMkTemp = runInShellSuccess({"which", {"mktemp"}, OsType::OsTypeLinux}); + + QString tmplate = filePath.path(); + // Some mktemp implementations require a suffix of XXXXXX. + // They will only accept the template if at least the last 6 characters are X. + if (!tmplate.endsWith("XXXXXX")) + tmplate += ".XXXXXX"; + + if (m_hasMkTemp) { + const RunResult result = runInShell({"mktemp", {tmplate}, OsType::OsTypeLinux}); + + if (result.exitCode != 0) { + return make_unexpected( + Tr::tr("Failed creating temporary file \"%1\": %2") + .arg(filePath.toUserOutput(), QString::fromUtf8(result.stdErr))); + } + + return FilePath::fromString(QString::fromUtf8(result.stdOut.trimmed())).onDevice(filePath); + } + + // Manually create a temporary/unique file. + std::reverse_iterator firstX = std::find_if_not(std::rbegin(tmplate), + std::rend(tmplate), + [](QChar ch) { return ch == 'X'; }); + + static constexpr std::array chars = {'0', '1', '2', '3', '4', '5', '6', '7', '8', + '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', + 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', + 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', + 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', + 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'}; + + std::uniform_int_distribution<> dist(0, int(chars.size() - 1)); + + int maxTries = 10; + FilePath newPath; + do { + for (QChar *it = firstX.base(); it != std::end(tmplate); ++it) { + *it = chars[dist(*QRandomGenerator::global())]; + } + newPath = FilePath::fromString(tmplate).onDevice(filePath); + if (--maxTries == 0) { + return make_unexpected(Tr::tr("Failed creating temporary file \"%1\" (too many tries)") + .arg(filePath.toUserOutput())); + } + } while (newPath.exists()); + + const expected_str createResult = newPath.writeFileContents({}); + + if (!createResult) + return make_unexpected(createResult.error()); + + return newPath; +} + OsType UnixDeviceFileAccess::osType(const FilePath &filePath) const { Q_UNUSED(filePath) diff --git a/src/libs/utils/devicefileaccess.h b/src/libs/utils/devicefileaccess.h index 4b1a917ab10..8fe8201e088 100644 --- a/src/libs/utils/devicefileaccess.h +++ b/src/libs/utils/devicefileaccess.h @@ -81,6 +81,8 @@ protected: virtual void asyncCopyFile(const FilePath &filePath, const Continuation> &cont, const FilePath &target) const; + + virtual expected_str createTempFile(const FilePath &filePath); }; class QTCREATOR_UTILS_EXPORT DesktopDeviceFileAccess : public DeviceFileAccess @@ -135,6 +137,9 @@ protected: expected_str writeFileContents(const FilePath &filePath, const QByteArray &data, qint64 offset) const override; + + expected_str createTempFile(const FilePath &filePath) override; + }; class QTCREATOR_UTILS_EXPORT UnixDeviceFileAccess : public DeviceFileAccess @@ -186,6 +191,9 @@ protected: const QByteArray &data, qint64 offset) const override; + expected_str createTempFile(const FilePath &filePath) override; + + private: bool iterateWithFind( const FilePath &filePath, @@ -197,6 +205,7 @@ private: QStringList *found) const; mutable bool m_tryUseFind = true; + mutable std::optional m_hasMkTemp; }; } // Utils diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index f537f606927..c99293329c1 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -214,9 +214,10 @@ static FilePath searchInDirectoriesHelper(const Environment &env, } FilePath Environment::searchInDirectories(const QString &executable, - const FilePaths &dirs) const + const FilePaths &dirs, + const PathFilter &func) const { - return searchInDirectoriesHelper(*this, executable, dirs, {}, false); + return searchInDirectoriesHelper(*this, executable, dirs, func, false); } FilePath Environment::searchInPath(const QString &executable, diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index 3e53c7a3c51..fe323e7ba9e 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -57,10 +57,11 @@ public: const FilePaths &additionalDirs = FilePaths(), const PathFilter &func = PathFilter()) const; FilePath searchInDirectories(const QString &executable, - const FilePaths &dirs) const; + const FilePaths &dirs, + const PathFilter &func = {}) const; FilePaths findAllInPath(const QString &executable, - const FilePaths &additionalDirs = FilePaths(), - const PathFilter &func = PathFilter()) const; + const FilePaths &additionalDirs = {}, + const PathFilter &func = {}) const; FilePaths path() const; FilePaths pathListValue(const QString &varName) const; diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 7dfa877b17f..13a1948c6b8 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #ifdef Q_OS_WIN #ifdef QTCREATOR_PCH_H @@ -490,6 +491,40 @@ std::optional FilePath::refersToExecutableFile(MatchScope matchScope) return fileAccess()->refersToExecutableFile(*this, matchScope); } +expected_str FilePath::tmpDir() const +{ + if (needsDevice()) { + const Environment env = deviceEnvironment(); + if (env.hasKey("TMPDIR")) + return FilePath::fromUserInput(env.value("TMPDIR")).onDevice(*this); + if (env.hasKey("TEMP")) + return FilePath::fromUserInput(env.value("TEMP")).onDevice(*this); + if (env.hasKey("TMP")) + return FilePath::fromUserInput(env.value("TMP")).onDevice(*this); + + if (osType() != OsTypeWindows) + return FilePath("/tmp").onDevice(*this); + return make_unexpected(QString("Could not find temporary directory on device %1") + .arg(displayName())); + } + + return FilePath::fromUserInput(QDir::tempPath()); +} + +expected_str FilePath::createTempFile() const +{ + if (!needsDevice()) { + QTemporaryFile file(toFSPathString()); + file.setAutoRemove(false); + if (file.open()) + return FilePath::fromString(file.fileName()); + + return make_unexpected(QString("Could not create temporary file: %1").arg(file.errorString())); + } + + return fileAccess()->createTempFile(*this); +} + bool FilePath::isReadableFile() const { return fileAccess()->isReadableFile(*this); @@ -1270,14 +1305,16 @@ FilePath FilePath::withNewPath(const QString &newPath) const assert(fullPath == FilePath::fromUrl("docker://123/usr/bin/make")) \endcode */ -FilePath FilePath::searchInDirectories(const FilePaths &dirs) const +FilePath FilePath::searchInDirectories(const FilePaths &dirs, const PathFilter &filter) const { if (isAbsolutePath()) return *this; - return deviceEnvironment().searchInDirectories(path(), dirs); + return deviceEnvironment().searchInDirectories(path(), dirs, filter); } -FilePath FilePath::searchInPath(const FilePaths &additionalDirs, PathAmending amending) const +FilePath FilePath::searchInPath(const FilePaths &additionalDirs, + PathAmending amending, + const PathFilter &filter) const { if (isAbsolutePath()) return *this; @@ -1293,7 +1330,7 @@ FilePath FilePath::searchInPath(const FilePaths &additionalDirs, PathAmending am else directories = additionalDirs + directories; } - return searchInDirectories(directories); + return searchInDirectories(directories, filter); } Environment FilePath::deviceEnvironment() const @@ -1406,7 +1443,7 @@ expected_str FilePath::copyRecursively(const FilePath &target) const expected_str FilePath::copyFile(const FilePath &target) const { - if (host() != target.host()) { + if (!isSameDevice(target)) { // FIXME: This does not scale. const expected_str contents = fileContents(); if (!contents) { diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index 41aaf7dcccb..4c61786eba4 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -145,6 +145,8 @@ public: void clear(); bool isEmpty() const; + using PathFilter = std::function; + [[nodiscard]] FilePath absoluteFilePath() const; [[nodiscard]] FilePath absolutePath() const; [[nodiscard]] FilePath resolvePath(const FilePath &tail) const; @@ -156,7 +158,8 @@ public: [[nodiscard]] FilePath withExecutableSuffix() const; [[nodiscard]] FilePath relativeChildPath(const FilePath &parent) const; [[nodiscard]] FilePath relativePathFrom(const FilePath &anchor) const; - [[nodiscard]] FilePath searchInDirectories(const FilePaths &dirs) const; + [[nodiscard]] FilePath searchInDirectories(const FilePaths &dirs, + const PathFilter &filter = {}) const; [[nodiscard]] Environment deviceEnvironment() const; [[nodiscard]] FilePath onDevice(const FilePath &deviceTemplate) const; [[nodiscard]] FilePath withNewPath(const QString &newPath) const; @@ -178,12 +181,16 @@ public: enum PathAmending { AppendToPath, PrependToPath }; [[nodiscard]] FilePath searchInPath(const FilePaths &additionalDirs = {}, - PathAmending = AppendToPath) const; + PathAmending = AppendToPath, + const PathFilter &filter = {}) const; enum MatchScope { ExactMatchOnly, WithExeSuffix, WithBatSuffix, WithExeOrBatSuffix, WithAnySuffix }; std::optional refersToExecutableFile(MatchScope considerScript) const; + [[nodiscard]] expected_str tmpDir() const; + [[nodiscard]] expected_str createTempFile() const; + // makes sure that capitalization of directories is canonical // on Windows and macOS. This is rarely needed. [[nodiscard]] FilePath normalizedPathName() const; diff --git a/src/libs/utils/fsengine/fileiconprovider.cpp b/src/libs/utils/fsengine/fileiconprovider.cpp index 44a17cc4664..e5ed4a1281f 100644 --- a/src/libs/utils/fsengine/fileiconprovider.cpp +++ b/src/libs/utils/fsengine/fileiconprovider.cpp @@ -27,7 +27,7 @@ using namespace Utils; Q_LOGGING_CATEGORY(fileIconProvider, "qtc.core.fileiconprovider", QtWarningMsg) /*! - \namespace Utils::FileIconProvider + \class Utils::FileIconProvider \inmodule QtCreator \brief Provides functions for registering custom overlay icons for system icons. diff --git a/src/libs/utils/fsengine/fsengine.cpp b/src/libs/utils/fsengine/fsengine.cpp index c97fee7345a..cc622b87860 100644 --- a/src/libs/utils/fsengine/fsengine.cpp +++ b/src/libs/utils/fsengine/fsengine.cpp @@ -36,8 +36,7 @@ FilePaths FSEngine::registeredDeviceRoots() void FSEngine::addDevice(const FilePath &deviceRoot) { - if (deviceRoot.hasFileAccess()) - deviceRoots().append(deviceRoot); + deviceRoots().append(deviceRoot); } void FSEngine::removeDevice(const FilePath &deviceRoot) diff --git a/src/libs/utils/guard.h b/src/libs/utils/guard.h index 7df63de0225..163bd2966f6 100644 --- a/src/libs/utils/guard.h +++ b/src/libs/utils/guard.h @@ -16,6 +16,7 @@ public: Guard(); ~Guard(); bool isLocked() const; + int lockCount() const { return m_lockCount; } // Prefer using GuardLocker when possible. These two methods are provided only for cases // when locking and unlocking are done in separate methods, so that GuardLocker can't be diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 84531ca5551..53825931b97 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -261,14 +261,14 @@ PathChooser::PathChooser(QWidget *parent) : d->m_hLayout->addWidget(d->m_lineEdit); d->m_hLayout->setSizeConstraint(QLayout::SetMinimumSize); + d->m_browseButton = new OptionPushButton; + d->m_browseButton->setText(browseButtonLabel()); + connect(d->m_browseButton, &OptionPushButton::clicked, this, [this] { slotBrowse(false); }); + d->m_contextMenu = new QMenu(d->m_browseButton); d->m_contextMenu->addAction(Tr::tr("Local"), this, [this] { slotBrowse(false); }); d->m_contextMenu->addAction(Tr::tr("Remote"), this, [this] { slotBrowse(true); }); - d->m_browseButton = new OptionPushButton(); - d->m_browseButton->setText(browseButtonLabel()); - connect(d->m_browseButton, &OptionPushButton::clicked, this, [this] { slotBrowse(false); }); - insertButton(d->m_buttons.count(), d->m_browseButton); setLayout(d->m_hLayout); diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 7972f86c432..67898ba855a 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -32,7 +32,7 @@ class QTCREATOR_UTILS_EXPORT QtcProcess final : public QObject Q_OBJECT public: - QtcProcess(QObject *parent = nullptr); + explicit QtcProcess(QObject *parent = nullptr); ~QtcProcess(); // ProcessInterface related diff --git a/src/libs/utils/runextensions.h b/src/libs/utils/runextensions.h index 7c7e6a8e87d..f81eb56699c 100644 --- a/src/libs/utils/runextensions.h +++ b/src/libs/utils/runextensions.h @@ -16,7 +16,6 @@ #include #include -#include // hasCallOperator & Co must be outside of any namespace // because of internal compiler error with MSVC2015 Update 2 @@ -38,8 +37,6 @@ struct hasCallOperator namespace Utils { -using StackSizeInBytes = std::optional; - namespace Internal { /* @@ -375,12 +372,10 @@ template::type> QFuture runAsync_internal(QThreadPool *pool, - StackSizeInBytes stackSize, QThread::Priority priority, Function &&function, Args &&... args) { - Q_ASSERT(!(pool && stackSize)); // stack size cannot be changed once a thread is started auto job = new Internal::AsyncJob (std::forward(function), std::forward(args)...); job->setThreadPriority(priority); @@ -390,8 +385,6 @@ QFuture runAsync_internal(QThreadPool *pool, pool->start(job); } else { auto thread = new Internal::RunnableThread(job); - if (stackSize) - thread->setStackSize(stackSize.value()); thread->moveToThread(qApp->thread()); // make sure thread gets deleteLater on main thread QObject::connect(thread, &QThread::finished, thread, &QObject::deleteLater); thread->start(priority); @@ -430,7 +423,6 @@ QFuture runAsync(QThreadPool *pool, QThread::Priority priority, Function &&function, Args&&... args) { return Internal::runAsync_internal(pool, - StackSizeInBytes(), priority, std::forward(function), std::forward(args)...); @@ -450,47 +442,6 @@ runAsync(QThread::Priority priority, Function &&function, Args&&... args) std::forward(function), std::forward(args)...); } -/*! - Runs \a function with \a args in a new thread with given thread \a stackSize and - thread priority QThread::InheritPriority . - \sa runAsync(QThreadPool*,QThread::Priority,Function&&,Args&&...) - \sa QThread::Priority - \sa QThread::setStackSize -*/ -template::type> -QFuture runAsync(StackSizeInBytes stackSize, Function &&function, Args &&... args) -{ - return Internal::runAsync_internal(static_cast(nullptr), - stackSize, - QThread::InheritPriority, - std::forward(function), - std::forward(args)...); -} - -/*! - Runs \a function with \a args in a new thread with given thread \a stackSize and - given thread \a priority. - \sa runAsync(QThreadPool*,QThread::Priority,Function&&,Args&&...) - \sa QThread::Priority - \sa QThread::setStackSize -*/ -template::type> -QFuture runAsync(StackSizeInBytes stackSize, - QThread::Priority priority, - Function &&function, - Args &&... args) -{ - return Internal::runAsync_internal(static_cast(nullptr), - stackSize, - priority, - std::forward(function), - std::forward(args)...); -} - /*! Runs \a function with \a args in a new thread with thread priority QThread::InheritPriority. \sa runAsync(QThreadPool*,QThread::Priority,Function&&,Args&&...) diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index 3a1318bc05b..3a1afe1fa18 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -487,7 +487,7 @@ QTCREATOR_UTILS_EXPORT QString trimFront(const QString &string, QChar ch) return string; if (i == size) return {}; - return string.sliced(i); + return string.mid(i); } /*! diff --git a/src/libs/utils/terminalcommand.cpp b/src/libs/utils/terminalcommand.cpp index 5e97e754d88..c25b379f321 100644 --- a/src/libs/utils/terminalcommand.cpp +++ b/src/libs/utils/terminalcommand.cpp @@ -4,10 +4,8 @@ #include "terminalcommand.h" #include "algorithm.h" -#include "commandline.h" #include "environment.h" #include "hostosinfo.h" -#include "qtcassert.h" #include #include @@ -17,7 +15,7 @@ namespace Utils { static QSettings *s_settings = nullptr; -TerminalCommand::TerminalCommand(const QString &command, const QString &openArgs, +TerminalCommand::TerminalCommand(const FilePath &command, const QString &openArgs, const QString &executeArgs, bool needsQuotes) : command(command) , openArgs(openArgs) @@ -67,9 +65,9 @@ TerminalCommand TerminalCommand::defaultTerminalEmulator() if (defaultTerm.command.isEmpty()) { if (HostOsInfo::isMacHost()) { - const QString termCmd = QCoreApplication::applicationDirPath() - + "/../Resources/scripts/openTerminal.py"; - if (QFileInfo::exists(termCmd)) + const FilePath termCmd = FilePath::fromString(QCoreApplication::applicationDirPath()) + / "../Resources/scripts/openTerminal.py"; + if (termCmd.exists()) defaultTerm = {termCmd, "", ""}; else defaultTerm = {"/usr/X11/bin/xterm", "", "-e"}; @@ -78,7 +76,7 @@ TerminalCommand TerminalCommand::defaultTerminalEmulator() defaultTerm = {"xterm", "", "-e"}; const Environment env = Environment::systemEnvironment(); for (const TerminalCommand &term : *knownTerminals) { - const QString result = env.searchInPath(term.command).toString(); + const FilePath result = env.searchInPath(term.command.path()); if (!result.isEmpty()) { defaultTerm = {result, term.openArgs, term.executeArgs, term.needsQuotes}; break; @@ -97,7 +95,7 @@ QVector TerminalCommand::availableTerminalEmulators() if (HostOsInfo::isAnyUnixHost()) { const Environment env = Environment::systemEnvironment(); for (const TerminalCommand &term : *knownTerminals) { - const QString command = env.searchInPath(term.command).toString(); + const FilePath command = env.searchInPath(term.command.path()); if (!command.isEmpty()) result.push_back({command, term.openArgs, term.executeArgs}); } @@ -119,27 +117,10 @@ const char kTerminalExecuteOptionsKey[] = "General/Terminal/ExecuteOptions"; TerminalCommand TerminalCommand::terminalEmulator() { - if (s_settings && HostOsInfo::isAnyUnixHost()) { - if (s_settings->value(kTerminalVersionKey).toString() == kTerminalVersion) { - if (s_settings->contains(kTerminalCommandKey)) - return {s_settings->value(kTerminalCommandKey).toString(), - s_settings->value(kTerminalOpenOptionsKey).toString(), - s_settings->value(kTerminalExecuteOptionsKey).toString()}; - } else { - // TODO remove reading of old settings some time after 4.8 - const QString value = s_settings->value("General/TerminalEmulator").toString().trimmed(); - if (!value.isEmpty()) { - // split off command and options - const QStringList splitCommand = ProcessArgs::splitArgs(value); - if (QTC_GUARD(!splitCommand.isEmpty())) { - const QString command = splitCommand.first(); - const QStringList quotedArgs = transform(splitCommand.mid(1), - &ProcessArgs::quoteArgUnix); - const QString options = quotedArgs.join(' '); - return {command, "", options}; - } - } - } + if (s_settings && HostOsInfo::isAnyUnixHost() && s_settings->contains(kTerminalCommandKey)) { + return {FilePath::fromSettings(s_settings->value(kTerminalCommandKey)), + s_settings->value(kTerminalOpenOptionsKey).toString(), + s_settings->value(kTerminalExecuteOptionsKey).toString()}; } return defaultTerminalEmulator(); @@ -154,7 +135,7 @@ void TerminalCommand::setTerminalEmulator(const TerminalCommand &term) s_settings->remove(kTerminalOpenOptionsKey); s_settings->remove(kTerminalExecuteOptionsKey); } else { - s_settings->setValue(kTerminalCommandKey, term.command); + s_settings->setValue(kTerminalCommandKey, term.command.toSettings()); s_settings->setValue(kTerminalOpenOptionsKey, term.openArgs); s_settings->setValue(kTerminalExecuteOptionsKey, term.executeArgs); } diff --git a/src/libs/utils/terminalcommand.h b/src/libs/utils/terminalcommand.h index f1311d26531..edb9ffcadde 100644 --- a/src/libs/utils/terminalcommand.h +++ b/src/libs/utils/terminalcommand.h @@ -5,6 +5,8 @@ #include "utils_global.h" +#include "filepath.h" + #include #include @@ -20,13 +22,13 @@ class QTCREATOR_UTILS_EXPORT TerminalCommand { public: TerminalCommand() = default; - TerminalCommand(const QString &command, const QString &openArgs, + TerminalCommand(const FilePath &command, const QString &openArgs, const QString &executeArgs, bool needsQuotes = false); bool operator==(const TerminalCommand &other) const; bool operator<(const TerminalCommand &other) const; - QString command; + Utils::FilePath command; QString openArgs; QString executeArgs; bool needsQuotes = false; diff --git a/src/libs/utils/terminalprocess.cpp b/src/libs/utils/terminalprocess.cpp index e6e28b493e0..bd0333c9d74 100644 --- a/src/libs/utils/terminalprocess.cpp +++ b/src/libs/utils/terminalprocess.cpp @@ -392,7 +392,7 @@ void TerminalImpl::start() allArgs = QStringList { ProcessArgs::joinArgs(allArgs) }; d->m_process.setEnvironment(m_setup.m_environment); - d->m_process.setCommand({FilePath::fromString(terminal.command), allArgs}); + d->m_process.setCommand({terminal.command, allArgs}); d->m_process.setProcessImpl(m_setup.m_processImpl); d->m_process.setReaperTimeout(m_setup.m_reaperTimeout); @@ -400,7 +400,7 @@ void TerminalImpl::start() if (!d->m_process.waitForStarted()) { const QString msg = Tr::tr("Cannot start the terminal emulator \"%1\", change the " "setting in the Environment preferences. (%2)") - .arg(terminal.command, d->m_process.errorString()); + .arg(terminal.command.toUserOutput(), d->m_process.errorString()); cleanupAfterStartFailure(msg); return; } diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp index 27e433896a1..faf4da67173 100644 --- a/src/plugins/autotest/autotestplugin.cpp +++ b/src/plugins/autotest/autotestplugin.cpp @@ -387,9 +387,44 @@ static QList testItemsToTestConfigurations(const QListtextDocument(), return); + const int line = currentEditor->currentLine(); + const FilePath filePath = currentEditor->textDocument()->filePath(); + + const CPlusPlus::Snapshot snapshot = CppEditor::CppModelManager::instance()->snapshot(); + const CPlusPlus::Document::Ptr doc = snapshot.document(filePath); + if (doc.isNull()) // not part of C++ snapshot + return; + + CPlusPlus::Scope *scope = doc->scopeAt(line, currentEditor->currentColumn()); QTextCursor cursor = currentEditor->editorWidget()->textCursor(); cursor.select(QTextCursor::WordUnderCursor); const QString text = cursor.selectedText(); + + while (scope && scope->asBlock()) + scope = scope->enclosingScope(); + if (scope && scope->asFunction()) { // class, namespace for further stuff? + const QList fullName + = CPlusPlus::LookupContext::fullyQualifiedName(scope); + const QString funcName = CPlusPlus::Overview().prettyName(fullName); + const TestFrameworks active = AutotestPlugin::activeTestFrameworks(); + for (auto framework : active) { + const QStringList testName = framework->testNameForSymbolName(funcName); + if (!testName.size()) + continue; + TestTreeItem *it = framework->rootNode()->findTestByNameAndFile(testName, filePath); + if (it) { + const QList testsToRun + = testItemsToTestConfigurations({ it }, mode); + if (!testsToRun.isEmpty()) { + m_testRunner.runTests(mode, testsToRun); + return; + } + } + } + } + + // general approach if (text.isEmpty()) return; // Do not trigger when no name under cursor @@ -398,28 +433,22 @@ void AutotestPluginPrivate::onRunUnderCursorTriggered(TestRunMode mode) return; // Wrong location triggered // check whether we have been triggered on a test function definition - const int line = currentEditor->currentLine(); - const FilePath &filePath = currentEditor->textDocument()->filePath(); QList filteredItems = Utils::filtered(testsItems, [&](ITestTreeItem *it){ return it->line() == line && it->filePath() == filePath; }); if (filteredItems.size() == 0 && testsItems.size() > 1) { - const CPlusPlus::Snapshot snapshot = CppEditor::CppModelManager::instance()->snapshot(); - const CPlusPlus::Document::Ptr doc = snapshot.document(filePath); - if (!doc.isNull()) { - CPlusPlus::Scope *scope = doc->scopeAt(line, currentEditor->currentColumn()); - if (scope->asClass()) { - const QList fullName - = CPlusPlus::LookupContext::fullyQualifiedName(scope); - const QString className = CPlusPlus::Overview().prettyName(fullName); + CPlusPlus::Scope *scope = doc->scopeAt(line, currentEditor->currentColumn()); + if (scope->asClass()) { + const QList fullName + = CPlusPlus::LookupContext::fullyQualifiedName(scope); + const QString className = CPlusPlus::Overview().prettyName(fullName); - filteredItems = Utils::filtered(testsItems, - [&text, &className](ITestTreeItem *it){ - return it->name() == text - && static_cast(it->parent())->name() == className; - }); - } + filteredItems = Utils::filtered(testsItems, + [&text, &className](ITestTreeItem *it){ + return it->name() == text + && static_cast(it->parent())->name() == className; + }); } } if ((filteredItems.size() != 1 && testsItems.size() > 1) @@ -438,6 +467,24 @@ void AutotestPluginPrivate::onRunUnderCursorTriggered(TestRunMode mode) m_testRunner.runTests(mode, testsToRun); } +TestFrameworks AutotestPlugin::activeTestFrameworks() +{ + ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject(); + TestFrameworks sorted; + if (!project || projectSettings(project)->useGlobalSettings()) { + sorted = Utils::filtered(TestFrameworkManager::registeredFrameworks(), + &ITestFramework::active); + } else { // we've got custom project settings + const TestProjectSettings *settings = projectSettings(project); + const QHash active = settings->activeFrameworks(); + sorted = Utils::filtered(TestFrameworkManager::registeredFrameworks(), + [active](ITestFramework *framework) { + return active.value(framework, false); + }); + } + return sorted; +} + void AutotestPlugin::updateMenuItemsEnabledState() { const ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject(); diff --git a/src/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h index 71d6b8e5ee3..f6b8b337af5 100644 --- a/src/plugins/autotest/autotestplugin.h +++ b/src/plugins/autotest/autotestplugin.h @@ -3,7 +3,7 @@ #pragma once -#include "autotest_global.h" +#include "itestframework.h" #include @@ -45,6 +45,7 @@ public: static TestSettings *settings(); static TestProjectSettings *projectSettings(ProjectExplorer::Project *project); + static TestFrameworks activeTestFrameworks(); static void updateMenuItemsEnabledState(); static void cacheRunConfigChoice(const QString &buildTargetKey, const ChoicePair &choice); static ChoicePair cachedChoiceFor(const QString &buildTargetKey); diff --git a/src/plugins/autotest/boost/boosttestconstants.h b/src/plugins/autotest/boost/boosttestconstants.h index 80a463f0746..e2be27d51c4 100644 --- a/src/plugins/autotest/boost/boosttestconstants.h +++ b/src/plugins/autotest/boost/boosttestconstants.h @@ -10,7 +10,7 @@ namespace BoostTest { namespace Constants { const char FRAMEWORK_NAME[] = "Boost"; -const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("Autotest", "Boost Test"); +const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("::Autotest", "Boost Test"); const unsigned FRAMEWORK_PRIORITY = 11; const char BOOST_MASTER_SUITE[] = "Master Test Suite"; diff --git a/src/plugins/autotest/gtest/gtestconstants.h b/src/plugins/autotest/gtest/gtestconstants.h index 0a560c37b20..b90d9f29636 100644 --- a/src/plugins/autotest/gtest/gtestconstants.h +++ b/src/plugins/autotest/gtest/gtestconstants.h @@ -10,7 +10,7 @@ namespace GTest { namespace Constants { const char FRAMEWORK_NAME[] = "GTest"; -const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("Autotest", "Google Test"); +const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("::Autotest", "Google Test"); const unsigned FRAMEWORK_PRIORITY = 10; const char DEFAULT_FILTER[] = "*.*"; diff --git a/src/plugins/autotest/gtest/gtestframework.cpp b/src/plugins/autotest/gtest/gtestframework.cpp index cbfd29b66df..af0a6eaa46c 100644 --- a/src/plugins/autotest/gtest/gtestframework.cpp +++ b/src/plugins/autotest/gtest/gtestframework.cpp @@ -7,6 +7,8 @@ #include "gtesttreeitem.h" #include "gtestparser.h" +#include + namespace Autotest { namespace Internal { @@ -59,5 +61,15 @@ GTest::Constants::GroupMode GTestFramework::groupMode() return GTest::Constants::GroupMode(g_settings->groupMode.itemValue().toInt()); } +QStringList GTestFramework::testNameForSymbolName(const QString &symbolName) const +{ + static const QRegularExpression r("^(.+::)?((DISABLED_)?.+?)_((DISABLED_)?.+)_Test::TestBody$"); + const QRegularExpressionMatch match = r.match(symbolName); + if (!match.hasMatch()) + return {}; + + return { match.captured(2), match.captured(4) }; +} + } // namespace Internal } // namespace Autotest diff --git a/src/plugins/autotest/gtest/gtestframework.h b/src/plugins/autotest/gtest/gtestframework.h index a67470f937f..c9e8cbddc07 100644 --- a/src/plugins/autotest/gtest/gtestframework.h +++ b/src/plugins/autotest/gtest/gtestframework.h @@ -18,6 +18,7 @@ public: static GTest::Constants::GroupMode groupMode(); static QString currentGTestFilter(); + QStringList testNameForSymbolName(const QString &symbolName) const override; private: const char *name() const override; QString displayName() const override; diff --git a/src/plugins/autotest/itestframework.cpp b/src/plugins/autotest/itestframework.cpp index 093bb42aaaf..0f1919b2af8 100644 --- a/src/plugins/autotest/itestframework.cpp +++ b/src/plugins/autotest/itestframework.cpp @@ -63,6 +63,11 @@ ITestParser *ITestFramework::testParser() return m_testParser; } +QStringList ITestFramework::testNameForSymbolName(const QString &) const +{ + return {}; +} + ITestTool::ITestTool(bool activeByDefault) : ITestBase(activeByDefault, ITestBase::Tool) {} diff --git a/src/plugins/autotest/itestframework.h b/src/plugins/autotest/itestframework.h index a2570eb6170..d7a4d7927da 100644 --- a/src/plugins/autotest/itestframework.h +++ b/src/plugins/autotest/itestframework.h @@ -75,6 +75,8 @@ public: virtual QString groupingToolTip() const { return {}; } ITestFramework *asFramework() final { return this; } + // helper for matching a function symbol's name to a test of this framework + virtual QStringList testNameForSymbolName(const QString &symbolName) const; protected: virtual ITestParser *createTestParser() = 0; diff --git a/src/plugins/autotest/qtest/qttestconstants.h b/src/plugins/autotest/qtest/qttestconstants.h index 0fb255c3276..985591a9460 100644 --- a/src/plugins/autotest/qtest/qttestconstants.h +++ b/src/plugins/autotest/qtest/qttestconstants.h @@ -10,7 +10,7 @@ namespace QtTest { namespace Constants { const char FRAMEWORK_NAME[] = "QtTest"; -const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("Autotest", "Qt Test"); +const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("::Autotest", "Qt Test"); const unsigned FRAMEWORK_PRIORITY = 1; } // namespace Constants diff --git a/src/plugins/autotest/qtest/qttestframework.cpp b/src/plugins/autotest/qtest/qttestframework.cpp index 75a913ebdfe..d13470c8569 100644 --- a/src/plugins/autotest/qtest/qttestframework.cpp +++ b/src/plugins/autotest/qtest/qttestframework.cpp @@ -36,5 +36,13 @@ unsigned QtTestFramework::priority() const return QtTest::Constants::FRAMEWORK_PRIORITY; } +QStringList QtTestFramework::testNameForSymbolName(const QString &symbolName) const +{ + int index = symbolName.lastIndexOf("::"); + if (index == -1) + return {}; + return { symbolName.left(index), symbolName.mid(index + 2) }; +} + } // namespace Internal } // namespace Autotest diff --git a/src/plugins/autotest/qtest/qttestframework.h b/src/plugins/autotest/qtest/qttestframework.h index 78ac0ad0413..4fa765ab192 100644 --- a/src/plugins/autotest/qtest/qttestframework.h +++ b/src/plugins/autotest/qtest/qttestframework.h @@ -15,6 +15,7 @@ class QtTestFramework : public ITestFramework public: QtTestFramework() : ITestFramework(true) {} + QStringList testNameForSymbolName(const QString &symbolName) const override; private: const char *name() const override; QString displayName() const override; diff --git a/src/plugins/autotest/testrunconfiguration.h b/src/plugins/autotest/testrunconfiguration.h index 3e905c01c04..5fda1542af3 100644 --- a/src/plugins/autotest/testrunconfiguration.h +++ b/src/plugins/autotest/testrunconfiguration.h @@ -5,8 +5,6 @@ #include "testconfiguration.h" -#include "autotesttr.h" - #include #include @@ -16,6 +14,8 @@ #include +#include + namespace Autotest { namespace Internal { @@ -25,7 +25,7 @@ public: TestRunConfiguration(ProjectExplorer::Target *parent, TestConfiguration *config) : ProjectExplorer::RunConfiguration(parent, "AutoTest.TestRunConfig") { - setDefaultDisplayName(Tr::tr("AutoTest Debug")); + setDefaultDisplayName(QCoreApplication::translate("::Autotest", "AutoTest Debug")); bool enableQuick = false; if (auto debuggable = dynamic_cast(config)) diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index bd6a4a14824..884544e3b24 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/src/plugins/autotest/testtreeitem.cpp @@ -271,6 +271,48 @@ TestTreeItem *TestTreeItem::findChildByNameAndFile(const QString &name, const Fi }); } +static TestTreeItem *findMatchingTestAt(TestTreeItem *parent, const QStringList &testName, + const FilePath &filePath) +{ + const QString &first = testName.first(); + const QString &last = testName.last(); + for (int i = 0, iEnd = parent->childCount(); i < iEnd; ++i) { + auto it = parent->childItem(i); + if (it->name() != first) + continue; + + for (int j = 0, jEnd = it->childCount(); j < jEnd; ++j) { + auto grandchild = it->childItem(j); + if (grandchild->name() != last) + continue; + + if (it->filePath() == filePath || grandchild->filePath() == filePath) + return grandchild; + } + } + return nullptr; +} + +TestTreeItem *TestTreeItem::findTestByNameAndFile(const QStringList &testName, + const FilePath &filePath) +{ + QTC_ASSERT(type() == Root, return nullptr); + QTC_ASSERT(testName.size() == 2, return nullptr); + + if (!childCount()) + return nullptr; + + if (childAt(0)->type() != GroupNode) // process root's children directly + return findMatchingTestAt(this, testName, filePath); + + // process children of groups instead of root + for (int i = 0, end = childCount(); i < end; ++i) { + if (TestTreeItem *found = findMatchingTestAt(childItem(i), testName, filePath)) + return found; + } + return nullptr; +} + ITestConfiguration *TestTreeItem::asConfiguration(TestRunMode mode) const { switch (mode) { diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index f5f0723ca8c..e51f48b211c 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/src/plugins/autotest/testtreeitem.h @@ -127,6 +127,15 @@ public: TestTreeItem *findChildByFileAndType(const Utils::FilePath &filePath, Type type); TestTreeItem *findChildByNameAndFile(const QString &name, const Utils::FilePath &filePath); + // search children for a test (function, ...) that matches the given testName + // e.g. testName = { "Foo", "tst_bar" } will return a (grand)child item where name() matches + // "tst_bar" and its parent matches "Foo" + // filePath is used to distinguish this even more - if any of the items (item and parent) has + // its file path set to filePath the found result is considered valid + // function is expected to be called on a root node of a test framework + TestTreeItem *findTestByNameAndFile(const QStringList &testName, + const Utils::FilePath &filePath); // make virtual for other frameworks? + virtual ITestConfiguration *debugConfiguration() const { return nullptr; } virtual bool canProvideDebugConfiguration() const { return false; } ITestConfiguration *asConfiguration(TestRunMode mode) const final; diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 5a619ffe532..8842734f0c5 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -299,21 +299,8 @@ QList TestTreeModel::testItemsByName(const QString &testName) void TestTreeModel::synchronizeTestFrameworks() { - ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject(); - TestFrameworks sorted; - if (!project || AutotestPlugin::projectSettings(project)->useGlobalSettings()) { - sorted = Utils::filtered(TestFrameworkManager::registeredFrameworks(), - &ITestFramework::active); - qCDebug(LOG) << "Active frameworks sorted by priority" << sorted; - } else { // we've got custom project settings - const TestProjectSettings *settings = AutotestPlugin::projectSettings(project); - const QHash active = settings->activeFrameworks(); - sorted = Utils::filtered(TestFrameworkManager::registeredFrameworks(), - [active](ITestFramework *framework) { - return active.value(framework, false); - }); - } - + const TestFrameworks sorted = AutotestPlugin::activeTestFrameworks(); + qCDebug(LOG) << "Active frameworks sorted by priority" << sorted; const auto sortedParsers = Utils::transform(sorted, &ITestFramework::testParser); // pre-check to avoid further processing when frameworks are unchanged TreeItem *invisibleRoot = rootItem(); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs index 52bb6ac2d76..ffe9690a35c 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs @@ -21,6 +21,7 @@ QtcPlugin { "autotoolsbuildsystem.cpp", "autotoolsbuildsystem.h", "autotoolsprojectconstants.h", + "autotoolsprojectmanagertr.h", "autotoolsprojectplugin.cpp", "autotoolsprojectplugin.h", "configurestep.cpp", diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs index 325c2498cda..d45090def37 100644 --- a/src/plugins/baremetal/baremetal.qbs +++ b/src/plugins/baremetal/baremetal.qbs @@ -24,6 +24,7 @@ QtcPlugin { "baremetaldeviceconfigurationwizardpages.cpp", "baremetaldeviceconfigurationwizardpages.h", "baremetalplugin.cpp", "baremetalplugin.h", "baremetalrunconfiguration.cpp", "baremetalrunconfiguration.h", + "baremetaltr.h", "debugserverproviderchooser.cpp", "debugserverproviderchooser.h", "debugserverprovidermanager.cpp", "debugserverprovidermanager.h", "debugserverproviderssettingspage.cpp", "debugserverproviderssettingspage.h", diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs index 1b24a20cd79..2bbfbf84742 100644 --- a/src/plugins/bazaar/bazaar.qbs +++ b/src/plugins/bazaar/bazaar.qbs @@ -23,6 +23,7 @@ QtcPlugin { "bazaarplugin.h", "bazaarsettings.cpp", "bazaarsettings.h", + "bazaartr.h", "branchinfo.cpp", "branchinfo.h", "commiteditor.cpp", diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index a27b73bfffd..610f636d743 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -124,7 +124,7 @@ bool ArtisticStyle::isApplicable(const Core::IDocument *document) const Command ArtisticStyle::command(const QString &cfgFile) const { Command command; - command.setExecutable(m_settings.command().toString()); + command.setExecutable(m_settings.command()); command.addOption("-q"); command.addOption("--options=" + cfgFile); diff --git a/src/plugins/beautifier/beautifier.qbs b/src/plugins/beautifier/beautifier.qbs index 6dc20f7d4c2..d1160ae5f59 100644 --- a/src/plugins/beautifier/beautifier.qbs +++ b/src/plugins/beautifier/beautifier.qbs @@ -18,6 +18,7 @@ QtcPlugin { "beautifierconstants.h", "beautifierplugin.cpp", "beautifierplugin.h", + "beautifiertr.h", "configurationdialog.cpp", "configurationdialog.h", "configurationeditor.cpp", diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index f97fb515af2..c1833a77f11 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -187,7 +187,7 @@ void ClangFormat::disableFormattingSelectedText() Command ClangFormat::command() const { Command command; - command.setExecutable(m_settings.command().toString()); + command.setExecutable(m_settings.command()); command.setProcessing(Command::PipeProcessing); if (m_settings.usePredefinedStyle()) { diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index 1ce90fbeff5..2e6f6d67d59 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -159,7 +159,7 @@ bool Uncrustify::isApplicable(const Core::IDocument *document) const Command Uncrustify::command(const QString &cfgFile, bool fragment) const { Command command; - command.setExecutable(m_settings.command().toString()); + command.setExecutable(m_settings.command()); command.setProcessing(Command::PipeProcessing); if (m_settings.version() >= QVersionNumber(0, 62)) { command.addOption("--assume"); diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp index c6ded3986d0..27c8365e19e 100644 --- a/src/plugins/bookmarks/bookmark.cpp +++ b/src/plugins/bookmarks/bookmark.cpp @@ -66,11 +66,11 @@ void Bookmark::updateBlock(const QTextBlock &block) } } -void Bookmark::updateFileName(const FilePath &fileName) +void Bookmark::updateFilePath(const FilePath &filePath) { - const FilePath &oldFileName = this->fileName(); - TextMark::updateFileName(fileName); - m_manager->updateBookmarkFileName(this, oldFileName.toString()); + const FilePath oldFilePath = this->filePath(); + TextMark::updateFilePath(filePath); + m_manager->updateBookmarkFileName(this, oldFilePath); } void Bookmark::setNote(const QString ¬e) diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index 04a7f66d0a0..44277d19c60 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -17,7 +17,7 @@ public: void updateLineNumber(int lineNumber) override; void move(int line) override; void updateBlock(const QTextBlock &block) override; - void updateFileName(const Utils::FilePath &fileName) override; + void updateFilePath(const Utils::FilePath &filePath) override; void removedFromEditor() override; bool isDraggable() const override; diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp index 9c00adb46c5..7cc9bf2a759 100644 --- a/src/plugins/bookmarks/bookmarkfilter.cpp +++ b/src/plugins/bookmarks/bookmarkfilter.cpp @@ -57,7 +57,7 @@ void BookmarkFilter::prepareSearch(const QString &entry) for (const QModelIndex &idx : matches) { const Bookmark *bookmark = m_manager->bookmarkForIndex(idx); - const QString filename = bookmark->fileName().fileName(); + const QString filename = bookmark->filePath().fileName(); LocatorFilterEntry filterEntry(this, QString("%1:%2").arg(filename).arg(bookmark->lineNumber()), QVariant::fromValue(idx)); @@ -66,7 +66,7 @@ void BookmarkFilter::prepareSearch(const QString &entry) else if (!bookmark->lineText().isEmpty()) filterEntry.extraInfo = bookmark->lineText(); else - filterEntry.extraInfo = bookmark->fileName().toString(); + filterEntry.extraInfo = bookmark->filePath().toString(); int highlightIndex = filterEntry.displayName.indexOf(entry, 0, Qt::CaseInsensitive); if (highlightIndex >= 0) { filterEntry.highlightInfo = {highlightIndex, int(entry.length())}; diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 1383335130a..e7c5a4e388e 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -343,17 +343,17 @@ QVariant BookmarkManager::data(const QModelIndex &index, int role) const Bookmark *bookMark = m_bookmarksList.at(index.row()); if (role == BookmarkManager::Filename) - return bookMark->fileName().fileName(); + return bookMark->filePath().fileName(); if (role == BookmarkManager::LineNumber) return bookMark->lineNumber(); if (role == BookmarkManager::Directory) - return bookMark->fileName().toFileInfo().path(); + return bookMark->filePath().toFileInfo().path(); if (role == BookmarkManager::LineText) return bookMark->lineText(); if (role == BookmarkManager::Note) return bookMark->note(); if (role == Qt::ToolTipRole) - return bookMark->fileName().toUserOutput(); + return bookMark->filePath().toUserOutput(); return QVariant(); } @@ -381,7 +381,7 @@ QMimeData *BookmarkManager::mimeData(const QModelIndexList &indexes) const if (!index.isValid() || index.column() != 0 || index.row() < 0 || index.row() >= m_bookmarksList.count()) continue; Bookmark *bookMark = m_bookmarksList.at(index.row()); - data->addFile(bookMark->fileName(), bookMark->lineNumber()); + data->addFile(bookMark->filePath(), bookMark->lineNumber()); } return data; } @@ -400,7 +400,7 @@ void BookmarkManager::toggleBookmark(const FilePath &fileName, int lineNumber) // Add a new bookmark if no bookmark existed on this line auto mark = new Bookmark(lineNumber, this); - mark->updateFileName(fileName); + mark->updateFilePath(fileName); const QModelIndex currentIndex = selectionModel()->currentIndex(); const int insertionIndex = currentIndex.isValid() ? currentIndex.row() + 1 : m_bookmarksList.size(); @@ -417,13 +417,13 @@ void BookmarkManager::updateBookmark(Bookmark *bookmark) saveBookmarks(); } -void BookmarkManager::updateBookmarkFileName(Bookmark *bookmark, const QString &oldFileName) +void BookmarkManager::updateBookmarkFileName(Bookmark *bookmark, const FilePath &oldFilePath) { - if (oldFileName == bookmark->fileName().toString()) + if (oldFilePath == bookmark->filePath()) return; - m_bookmarksMap[Utils::FilePath::fromString(oldFileName)].removeAll(bookmark); - m_bookmarksMap[bookmark->fileName()].append(bookmark); + m_bookmarksMap[oldFilePath].removeAll(bookmark); + m_bookmarksMap[bookmark->filePath()].append(bookmark); updateBookmark(bookmark); } @@ -444,7 +444,7 @@ void BookmarkManager::deleteBookmark(Bookmark *bookmark) int idx = m_bookmarksList.indexOf(bookmark); beginRemoveRows(QModelIndex(), idx, idx); - m_bookmarksMap[bookmark->fileName()].removeAll(bookmark); + m_bookmarksMap[bookmark->filePath()].removeAll(bookmark); delete bookmark; m_bookmarksList.removeAt(idx); @@ -467,7 +467,7 @@ Bookmark *BookmarkManager::bookmarkForIndex(const QModelIndex &index) const bool BookmarkManager::gotoBookmark(const Bookmark *bookmark) const { if (IEditor *editor = EditorManager::openEditorAt( - Utils::Link(bookmark->fileName(), bookmark->lineNumber()))) { + Utils::Link(bookmark->filePath(), bookmark->lineNumber()))) { return editor->currentLine() == bookmark->lineNumber(); } return false; @@ -687,7 +687,7 @@ void BookmarkManager::insertBookmark(int idx, Bookmark *bookmark, bool userset) idx = qBound(0, idx, m_bookmarksList.size()); beginInsertRows(QModelIndex(), idx, idx); - m_bookmarksMap[bookmark->fileName()].append(bookmark); + m_bookmarksMap[bookmark->filePath()].append(bookmark); m_bookmarksList.insert(idx, bookmark); endInsertRows(); @@ -724,7 +724,7 @@ void BookmarkManager::addBookmark(const QString &s) const int lineNumber = s.mid(index2 + 1, index3 - index2 - 1).toInt(); if (!filePath.isEmpty() && !findBookmark(FilePath::fromString(filePath), lineNumber)) { auto b = new Bookmark(lineNumber, this); - b->updateFileName(FilePath::fromString(filePath)); + b->updateFilePath(FilePath::fromString(filePath)); b->setNote(note); addBookmark(b, false); } @@ -739,7 +739,7 @@ QString BookmarkManager::bookmarkToString(const Bookmark *b) const QLatin1Char colon(':'); // Using \t as delimiter because any another symbol can be a part of note. const QLatin1Char noteDelimiter('\t'); - return colon + b->fileName().toString() + + return colon + b->filePath().toString() + colon + QString::number(b->lineNumber()) + noteDelimiter + b->note(); } @@ -772,7 +772,7 @@ bool BookmarkManager::isAtCurrentBookmark() const return true; IEditor *currentEditor = EditorManager::currentEditor(); return currentEditor - && currentEditor->document()->filePath() == bk->fileName() + && currentEditor->document()->filePath() == bk->filePath() && currentEditor->currentLine() == bk->lineNumber(); } diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index be7424b61ed..a4fcf01b58c 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -31,7 +31,7 @@ public: ~BookmarkManager() final; void updateBookmark(Bookmark *bookmark); - void updateBookmarkFileName(Bookmark *bookmark, const QString &oldFileName); + void updateBookmarkFileName(Bookmark *bookmark, const Utils::FilePath &oldFilePath); void deleteBookmark(Bookmark *bookmark); // Does not remove the mark void removeAllBookmarks(); Bookmark *bookmarkForIndex(const QModelIndex &index) const; diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index 6ba0e589009..45a6abc347d 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -27,6 +27,7 @@ QtcPlugin { "clangactivationsequenceprocessor.h", "clangcodemodelplugin.cpp", "clangcodemodelplugin.h", + "clangcodemodeltr.h", "clangcompletioncontextanalyzer.cpp", "clangcompletioncontextanalyzer.h", "clangconstants.h", diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp index a34d02df21c..757ad4bf2e8 100644 --- a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp +++ b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp @@ -40,7 +40,7 @@ public: : m_followSymbol(followSymbol) {} void cancel() override { resetData(true); } - bool running() override { return m_followSymbol; } + bool running() override { return m_followSymbol && m_running; } void update(); void finalize(); void resetData(bool resetFollowSymbolData); @@ -51,10 +51,11 @@ private: return createProposal(false); } - IAssistProposal *createProposal(bool final) const; + IAssistProposal *createProposal(bool final); VirtualFunctionProposalItem *createEntry(const QString &name, const Link &link) const; QPointer m_followSymbol; + bool m_running = false; }; class ClangdFollowSymbol::VirtualFunctionAssistProvider : public IAssistProvider @@ -297,10 +298,10 @@ void ClangdFollowSymbol::VirtualFunctionAssistProcessor::resetData(bool resetFol m_followSymbol = nullptr; } -IAssistProposal * -ClangdFollowSymbol::VirtualFunctionAssistProcessor::createProposal(bool final) const +IAssistProposal *ClangdFollowSymbol::VirtualFunctionAssistProcessor::createProposal(bool final) { QTC_ASSERT(m_followSymbol, return nullptr); + m_running = !final; QList items; bool needsBaseDeclEntry = !m_followSymbol->d->defLinkNode.range() @@ -453,7 +454,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult( const QString &name, const QString &prefix, const MessageId &reqId) { qCDebug(clangdLog) << "handling symbol info reply" << link.targetFilePath.toUserOutput() << link.targetLine; - if (!sentinel) + if (!sentinel || !virtualFuncAssistProcessor) return; if (!name.isEmpty()) symbolsToDisplay.push_back({prefix + name, link}); diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp index 5034056d997..250d70ffe0e 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp @@ -20,6 +20,7 @@ #include #include +using namespace LanguageClient; using namespace LanguageServerProtocol; using namespace Utils; @@ -42,7 +43,7 @@ public: } }; -class LspWorkspaceFilter : public LanguageClient::WorkspaceLocatorFilter +class LspWorkspaceFilter : public WorkspaceLocatorFilter { public: LspWorkspaceFilter() @@ -71,7 +72,7 @@ public: } }; -class LspClassesFilter : public LanguageClient::WorkspaceClassLocatorFilter +class LspClassesFilter : public WorkspaceClassLocatorFilter { public: LspClassesFilter() { @@ -98,7 +99,7 @@ public: } }; -class LspFunctionsFilter : public LanguageClient::WorkspaceMethodLocatorFilter +class LspFunctionsFilter : public WorkspaceMethodLocatorFilter { public: LspFunctionsFilter() @@ -119,7 +120,7 @@ ClangGlobalSymbolFilter::ClangGlobalSymbolFilter() } ClangGlobalSymbolFilter::ClangGlobalSymbolFilter(ILocatorFilter *cppFilter, - ILocatorFilter *lspFilter) + WorkspaceLocatorFilter *lspFilter) : m_cppFilter(cppFilter), m_lspFilter(lspFilter) { setId(CppEditor::Constants::LOCATOR_FILTER_ID); @@ -138,17 +139,13 @@ ClangGlobalSymbolFilter::~ClangGlobalSymbolFilter() void ClangGlobalSymbolFilter::prepareSearch(const QString &entry) { m_cppFilter->prepareSearch(entry); - QList clients; + QList clients; for (ProjectExplorer::Project * const project : ProjectExplorer::SessionManager::projects()) { - if (LanguageClient::Client * const client - = ClangModelManagerSupport::clientForProject(project)) { + if (Client * const client = ClangModelManagerSupport::clientForProject(project)) clients << client; - } - } - if (!clients.isEmpty()) { - static_cast(m_lspFilter) - ->prepareSearch(entry, clients); } + if (!clients.isEmpty()) + m_lspFilter->prepareSearch(entry, clients); } QList ClangGlobalSymbolFilter::matchesFor( @@ -157,16 +154,16 @@ QList ClangGlobalSymbolFilter::matchesFor( QList matches = m_cppFilter->matchesFor(future, entry); const QList lspMatches = m_lspFilter->matchesFor(future, entry); if (!lspMatches.isEmpty()) { - std::set> locations; + std::set> locations; for (const auto &entry : std::as_const(matches)) { const CppEditor::IndexItem::Ptr item = qvariant_cast(entry.internalData); locations.insert(std::make_tuple(item->filePath(), item->line(), item->column())); } for (const auto &entry : lspMatches) { - if (!entry.internalData.canConvert()) + if (!entry.internalData.canConvert()) continue; - const auto link = qvariant_cast(entry.internalData); + const auto link = qvariant_cast(entry.internalData); if (locations.find(std::make_tuple(link.targetFilePath, link.targetLine, link.targetColumn)) == locations.cend()) { matches << entry; // TODO: Insert sorted? @@ -207,7 +204,7 @@ ClangFunctionsFilter::ClangFunctionsFilter() setDefaultIncludedByDefault(false); } -class LspCurrentDocumentFilter : public LanguageClient::DocumentLocatorFilter +class LspCurrentDocumentFilter : public DocumentLocatorFilter { public: LspCurrentDocumentFilter() diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.h b/src/plugins/clangcodemodel/clangdlocatorfilters.h index 5758026fb8c..f7deacc7605 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.h +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.h @@ -5,6 +5,8 @@ #include +namespace LanguageClient { class WorkspaceLocatorFilter; } + namespace ClangCodeModel { namespace Internal { @@ -12,7 +14,8 @@ class ClangGlobalSymbolFilter : public Core::ILocatorFilter { public: ClangGlobalSymbolFilter(); - ClangGlobalSymbolFilter(Core::ILocatorFilter *cppFilter, Core::ILocatorFilter *lspFilter); + ClangGlobalSymbolFilter(Core::ILocatorFilter *cppFilter, + LanguageClient::WorkspaceLocatorFilter *lspFilter); ~ClangGlobalSymbolFilter() override; private: @@ -23,7 +26,7 @@ private: int *selectionStart, int *selectionLength) const override; Core::ILocatorFilter * const m_cppFilter; - Core::ILocatorFilter * const m_lspFilter; + LanguageClient::WorkspaceLocatorFilter * const m_lspFilter; }; class ClangClassesFilter : public ClangGlobalSymbolFilter diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index a8608458797..a38aeb62873 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -121,8 +121,7 @@ void disableDiagnosticInCurrentProjectConfig(const ClangDiagnostic &diagnostic) // Create copy if needed if (config.isReadOnly()) { - const QString name = QCoreApplication::translate("ClangDiagnosticConfig", - "Project: %1 (based on %2)") + const QString name = Tr::tr("Project: %1 (based on %2)") .arg(project->displayName(), config.displayName()); config = ClangDiagnosticConfigsModel::createCustomConfig(config, name); } @@ -141,9 +140,7 @@ void disableDiagnosticInCurrentProjectConfig(const ClangDiagnostic &diagnostic) projectSettings.setDiagnosticConfigId(config.id()); // Notify the user about changed project specific settings - const QString text - = QCoreApplication::translate("ClangDiagnosticConfig", - "Changes applied in Projects Mode > Clang Code Model"); + const QString text = Tr::tr("Changes applied in Projects Mode > Clang Code Model"); FadingIndicator::showText(Core::ICore::mainWindow(), text, FadingIndicator::SmallText); @@ -192,7 +189,7 @@ ClangDiagnostic convertDiagnostic(const ClangdDiagnostic &src, line = match.captured(6).toInt(&ok); column = 0; } - FilePath auxFilePath = FilePath::fromUserInput(match.captured(1)); + FilePath auxFilePath = mapper(FilePath::fromUserInput(match.captured(1))); if (auxFilePath.isRelativePath() && auxFilePath.fileName() == filePath.fileName()) auxFilePath = filePath; aux.location = {auxFilePath, line, column - 1}; @@ -326,7 +323,7 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath, bool ClangdTextMark::addToolTipContent(QLayout *target) const { - const auto canApplyFixIt = [c = m_client, diag = m_lspDiagnostic, fp = fileName()] { + const auto canApplyFixIt = [c = m_client, diag = m_lspDiagnostic, fp = filePath()] { return QTC_GUARD(c) && c->reachable() && c->hasDiagnostic(fp, diag); }; const QString clientName = QTC_GUARD(m_client) ? m_client->name() : "clangd [unknown]"; diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index f577cbed4b7..f236fa81b07 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -154,15 +154,14 @@ GenerateCompilationDbResult generateCompilationDB(QList p FilePath clangIncludeDir) { QTC_ASSERT(!baseDir.isEmpty(), return GenerateCompilationDbResult(QString(), - QCoreApplication::translate("ClangUtils", "Could not retrieve build directory."))); + Tr::tr("Could not retrieve build directory."))); QTC_ASSERT(!projectInfoList.isEmpty(), return GenerateCompilationDbResult(QString(), "Could not retrieve project info.")); QTC_CHECK(baseDir.ensureWritableDir()); QFile compileCommandsFile(baseDir.pathAppended("compile_commands.json").toFSPathString()); const bool fileOpened = compileCommandsFile.open(QIODevice::WriteOnly | QIODevice::Truncate); if (!fileOpened) { - return GenerateCompilationDbResult(QString(), - QCoreApplication::translate("ClangUtils", "Could not create \"%1\": %2") + return GenerateCompilationDbResult(QString(), Tr::tr("Could not create \"%1\": %2") .arg(compileCommandsFile.fileName(), compileCommandsFile.errorString())); } compileCommandsFile.write("["); diff --git a/src/plugins/clangformat/clangformat.qbs b/src/plugins/clangformat/clangformat.qbs index 90cf01ed7dd..bd1b9677632 100644 --- a/src/plugins/clangformat/clangformat.qbs +++ b/src/plugins/clangformat/clangformat.qbs @@ -49,6 +49,7 @@ QtcPlugin { "clangformatplugin.h", "clangformatsettings.cpp", "clangformatsettings.h", + "clangformattr.h", "clangformatutils.h", "clangformatutils.cpp", ] diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp index fc08158d2d1..affabfec671 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.cpp +++ b/src/plugins/clangformat/clangformatbaseindenter.cpp @@ -26,7 +26,7 @@ namespace ClangFormat { -Internal::LlvmFileSystemAdapter llvmFileSystemAdapter; +Internal::LlvmFileSystemAdapter llvmFileSystemAdapter = {}; namespace { void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style, diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index 426e872f73e..1d91bd9857f 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -7,6 +7,7 @@ #include "clangformatconstants.h" #include "clangformatfile.h" #include "clangformatindenter.h" +#include "clangformattr.h" #include "clangformatutils.h" // the file was generated by scripts/generateClangFormatChecksLayout.py @@ -82,7 +83,7 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(TextEditor::ICodeStylePreferenc d->config = std::make_unique(filePathToCurrentSettings(codeStyle->currentPreferences())); resize(489, 305); - d->fallbackConfig = new QLabel(tr("Clang-Format Style")); + d->fallbackConfig = new QLabel(Tr::tr("Clang-Format Style")); d->checksScrollArea = new QScrollArea(); d->checksWidget = new ClangFormatChecks(); diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp index dcff7db6e6c..f332a97070f 100644 --- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp @@ -5,6 +5,7 @@ #include "clangformatconstants.h" #include "clangformatsettings.h" +#include "clangformattr.h" #include "clangformatutils.h" #include @@ -31,18 +32,18 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(ProjectExplorer::Pr resize(489, 305); m_projectHasClangFormat = new QLabel(this); - m_formattingModeLabel = new QLabel(tr("Formatting mode:")); + m_formattingModeLabel = new QLabel(Tr::tr("Formatting mode:")); m_indentingOrFormatting = new QComboBox(this); - m_formatWhileTyping = new QCheckBox(tr("Format while typing")); - m_formatOnSave = new QCheckBox(tr("Format edited code on file save")); - m_overrideDefault = new QCheckBox(tr("Override Clang Format configuration file")); - m_useGlobalSettings = new QCheckBox(tr("Use global settings")); + m_formatWhileTyping = new QCheckBox(Tr::tr("Format while typing")); + m_formatOnSave = new QCheckBox(Tr::tr("Format edited code on file save")); + m_overrideDefault = new QCheckBox(Tr::tr("Override Clang Format configuration file")); + m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings")); m_useGlobalSettings->hide(); using namespace Layouting; Group globalSettingsGroupBox { - title(tr("ClangFormat settings:")), + title(Tr::tr("ClangFormat settings:")), Column { m_useGlobalSettings, Row { m_formattingModeLabel, m_indentingOrFormatting, st }, @@ -94,11 +95,11 @@ void ClangFormatGlobalConfigWidget::initCheckBoxes() void ClangFormatGlobalConfigWidget::initIndentationOrFormattingCombobox() { m_indentingOrFormatting->insertItem(static_cast(ClangFormatSettings::Mode::Indenting), - tr("Indenting only")); + Tr::tr("Indenting only")); m_indentingOrFormatting->insertItem(static_cast(ClangFormatSettings::Mode::Formatting), - tr("Full formatting")); + Tr::tr("Full formatting")); m_indentingOrFormatting->insertItem(static_cast(ClangFormatSettings::Mode::Disable), - tr("Disable")); + Tr::tr("Disable")); m_indentingOrFormatting->setCurrentIndex( static_cast(getProjectIndentationOrFormattingSettings(m_project))); @@ -146,8 +147,8 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox() m_projectHasClangFormat->hide(); } else { m_projectHasClangFormat->show(); - m_projectHasClangFormat->setText(tr("The current project has its own .clang-format file which " - "can be overridden by the settings below.")); + m_projectHasClangFormat->setText(Tr::tr("The current project has its own .clang-format file which " + "can be overridden by the settings below.")); } auto setEnableOverrideCheckBox = [this](int index) { @@ -160,7 +161,7 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox() this, setEnableOverrideCheckBox); m_overrideDefault->setToolTip( - tr("Override Clang Format configuration file with the chosen configuration.")); + Tr::tr("Override Clang Format configuration file with the chosen configuration.")); m_overrideDefault->setChecked(getProjectOverriddenSettings(m_project)); diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp index cbb49cbd319..f77c3df6771 100644 --- a/src/plugins/clangformat/clangformatplugin.cpp +++ b/src/plugins/clangformat/clangformatplugin.cpp @@ -4,97 +4,75 @@ #include "clangformatplugin.h" #include "clangformatconfigwidget.h" -#include "clangformatglobalconfigwidget.h" #include "clangformatconstants.h" +#include "clangformatglobalconfigwidget.h" #include "clangformatindenter.h" -#include "clangformatsettings.h" +#include "clangformattr.h" #include "clangformatutils.h" #include "tests/clangformat-test.h" -#include - #include #include #include -#include #include #include -#include -#include #include -#include - #include -#include #include -#include -#include #include -#include -#include #include -#include #include -#include - -#include -#include - #include -#include -#include -#include -#include using namespace Core; +using namespace CppEditor; using namespace ProjectExplorer; +using namespace TextEditor; using namespace Utils; namespace ClangFormat { -class ClangFormatStyleFactory : public CppEditor::CppCodeStylePreferencesFactory +class ClangFormatStyleFactory : public CppCodeStylePreferencesFactory { - Q_DECLARE_TR_FUNCTIONS(ClangFormatStyleFactory) public: - TextEditor::Indenter *createIndenter(QTextDocument *doc) const override + Indenter *createIndenter(QTextDocument *doc) const override { return new ClangFormatForwardingIndenter(doc); } - std::pair additionalTab( - TextEditor::ICodeStylePreferences *codeStyle, - ProjectExplorer::Project *project, - QWidget *parent) const override + std::pair additionalTab( + ICodeStylePreferences *codeStyle, Project *project, QWidget *parent) const override { - return {new ClangFormatConfigWidget(codeStyle, project, parent), tr("ClangFormat")}; + return {new ClangFormatConfigWidget(codeStyle, project, parent), Tr::tr("ClangFormat")}; } - TextEditor::CodeStyleEditorWidget *createAdditionalGlobalSettings( - ProjectExplorer::Project *project, QWidget *parent) override + CodeStyleEditorWidget *createAdditionalGlobalSettings( + Project *project, QWidget *parent) override { return new ClangFormatGlobalConfigWidget(project, parent); } }; -static void replaceCppCodeStyle() +ClangFormatPlugin::~ClangFormatPlugin() { - using namespace TextEditor; TextEditorSettings::unregisterCodeStyleFactory(CppEditor::Constants::CPP_SETTINGS_ID); - TextEditorSettings::registerCodeStyleFactory(new ClangFormatStyleFactory); + delete m_factory; } void ClangFormatPlugin::initialize() { - replaceCppCodeStyle(); + TextEditorSettings::unregisterCodeStyleFactory(CppEditor::Constants::CPP_SETTINGS_ID); + m_factory = new ClangFormatStyleFactory; + TextEditorSettings::registerCodeStyleFactory(m_factory); ActionContainer *contextMenu = ActionManager::actionContainer(CppEditor::Constants::M_CONTEXT); if (contextMenu) { auto openClangFormatConfigAction - = new QAction(tr("Open Used .clang-format Configuration File"), this); + = new QAction(Tr::tr("Open Used .clang-format Configuration File"), this); Command *command = ActionManager::registerAction(openClangFormatConfigAction, Constants::OPEN_CURRENT_CONFIG_ID); contextMenu->addSeparator(); diff --git a/src/plugins/clangformat/clangformatplugin.h b/src/plugins/clangformat/clangformatplugin.h index 7b3560c4eec..3ab3eae984f 100644 --- a/src/plugins/clangformat/clangformatplugin.h +++ b/src/plugins/clangformat/clangformatplugin.h @@ -5,6 +5,8 @@ #include +namespace TextEditor { class ICodeStylePreferencesFactory; } + namespace ClangFormat { class ClangFormatPlugin : public ExtensionSystem::IPlugin @@ -12,8 +14,11 @@ class ClangFormatPlugin : public ExtensionSystem::IPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangFormat.json") + ~ClangFormatPlugin() override; void initialize() final; QVector createTestObjects() const override; + + TextEditor::ICodeStylePreferencesFactory *m_factory = nullptr; }; } // namespace ClangTools diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index d8bd1041777..afe60be7dc8 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -678,15 +678,14 @@ void ClangTool::startTool(ClangTool::FileSelection fileSelection, ProjectExplorerPlugin::startRunControl(m_runControl); } -Diagnostics ClangTool::read(const QString &logFilePath, +Diagnostics ClangTool::read(const FilePath &logFilePath, const QSet &projectFiles, QString *errorMessage) const { - const auto acceptFromFilePath = [projectFiles](const Utils::FilePath &filePath) { + const auto acceptFromFilePath = [projectFiles](const FilePath &filePath) { return projectFiles.contains(filePath); }; - return readExportedDiagnostics(Utils::FilePath::fromString(logFilePath), - acceptFromFilePath, errorMessage); + return readExportedDiagnostics(logFilePath, acceptFromFilePath, errorMessage); } FileInfos ClangTool::collectFileInfos(Project *project, FileSelection fileSelection) diff --git a/src/plugins/clangtools/clangtool.h b/src/plugins/clangtools/clangtool.h index db27e014122..98d219ac923 100644 --- a/src/plugins/clangtools/clangtool.h +++ b/src/plugins/clangtools/clangtool.h @@ -65,7 +65,7 @@ public: const RunSettings &runSettings, const CppEditor::ClangDiagnosticConfig &diagnosticConfig); - Diagnostics read(const QString &logFilePath, + Diagnostics read(const Utils::FilePath &logFilePath, const QSet &projectFiles, QString *errorMessage) const; diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index fda7144704a..c684774ef8d 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -189,7 +189,7 @@ void ClangToolRunWorker::start() const AnalyzeInputData input{tool, m_diagnosticConfig, m_temporaryDir.path(), m_environment, unit}; const auto setupHandler = [this, unit, tool] { - const QString filePath = FilePath::fromString(unit.file).toUserOutput(); + const QString filePath = unit.file.toUserOutput(); appendMessage(Tr::tr("Analyzing \"%1\" [%2].").arg(filePath, clangToolName(tool)), Utils::StdOutFormat); return true; @@ -231,7 +231,7 @@ void ClangToolRunWorker::onDone(const AnalyzeOutputData &output) m_filesNotAnalyzed.insert(output.fileToAnalyze); const QString message = Tr::tr("Failed to analyze \"%1\": %2") - .arg(output.fileToAnalyze, output.errorMessage); + .arg(output.fileToAnalyze.toUserOutput(), output.errorMessage); appendMessage(message, Utils::StdErrFormat); appendMessage(output.errorDetails, Utils::StdErrFormat); return; @@ -247,7 +247,8 @@ void ClangToolRunWorker::onDone(const AnalyzeOutputData &output) m_filesAnalyzed.remove(output.fileToAnalyze); m_filesNotAnalyzed.insert(output.fileToAnalyze); qCDebug(LOG) << "onRunnerFinishedWithSuccess: Error reading log file:" << errorMessage; - appendMessage(Tr::tr("Failed to analyze \"%1\": %2").arg(output.fileToAnalyze, errorMessage), + appendMessage(Tr::tr("Failed to analyze \"%1\": %2") + .arg(output.fileToAnalyze.toUserOutput(), errorMessage), Utils::StdErrFormat); } else { if (!m_filesNotAnalyzed.contains(output.fileToAnalyze)) diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h index 4a47e486106..19ad9189af4 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.h +++ b/src/plugins/clangtools/clangtoolruncontrol.h @@ -69,8 +69,8 @@ private: std::unique_ptr m_taskTree; QSet m_projectFiles; - QSet m_filesAnalyzed; - QSet m_filesNotAnalyzed; + QSet m_filesAnalyzed; + QSet m_filesNotAnalyzed; QElapsedTimer m_elapsed; }; diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index 4c2a908a789..f5c955c50e7 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -41,7 +41,7 @@ AnalyzeUnit::AnalyzeUnit(const FileInfo &fileInfo, UseLanguageDefines::No, UseBuildSystemWarnings::No, actualClangIncludeDir); - file = fileInfo.file.toString(); + file = fileInfo.file; arguments = extraClangToolsPrependOptions(); arguments.append(optionsBuilder.build(fileInfo.kind, CppEditor::getPchUsage())); arguments.append(extraClangToolsAppendOptions()); @@ -85,9 +85,9 @@ static QStringList clangArguments(const ClangDiagnosticConfig &diagnosticConfig, return arguments; } -static QString createOutputFilePath(const FilePath &dirPath, const QString &fileToAnalyze) +static FilePath createOutputFilePath(const FilePath &dirPath, const FilePath &fileToAnalyze) { - const QString fileName = QFileInfo(fileToAnalyze).fileName(); + const QString fileName = fileToAnalyze.fileName(); const FilePath fileTemplate = dirPath.pathAppended("report-" + fileName + "-XXXXXX"); TemporaryFile temporaryFile("clangtools"); @@ -95,7 +95,7 @@ static QString createOutputFilePath(const FilePath &dirPath, const QString &file temporaryFile.setFileTemplate(fileTemplate.path()); if (temporaryFile.open()) { temporaryFile.close(); - return temporaryFile.fileName(); + return FilePath::fromString(temporaryFile.fileName()); } return {}; } @@ -106,18 +106,18 @@ TaskItem clangToolTask(const AnalyzeInputData &input, { struct ClangToolStorage { QString name; - Utils::FilePath executable; - QString outputFilePath; + FilePath executable; + FilePath outputFilePath; }; const TreeStorage storage; const auto mainToolArguments = [=](const ClangToolStorage *data) { QStringList result; - result << "-export-fixes=" + data->outputFilePath; + result << "-export-fixes=" + data->outputFilePath.nativePath(); if (!input.overlayFilePath.isEmpty() && isVFSOverlaySupported(data->executable)) result << "--vfsoverlay=" + input.overlayFilePath; - result << QDir::toNativeSeparators(input.unit.file); + result << input.unit.file.nativePath(); return result; }; @@ -134,8 +134,8 @@ TaskItem clangToolTask(const AnalyzeInputData &input, } QTC_CHECK(!input.unit.arguments.contains(QLatin1String("-o"))); - QTC_CHECK(!input.unit.arguments.contains(input.unit.file)); - QTC_ASSERT(FilePath::fromString(input.unit.file).exists(), return TaskAction::StopWithError); + QTC_CHECK(!input.unit.arguments.contains(input.unit.file.nativePath())); + QTC_ASSERT(input.unit.file.exists(), return TaskAction::StopWithError); data->outputFilePath = createOutputFilePath(input.outputDirPath, input.unit.file); QTC_ASSERT(!data->outputFilePath.isEmpty(), return TaskAction::StopWithError); diff --git a/src/plugins/clangtools/clangtoolrunner.h b/src/plugins/clangtools/clangtoolrunner.h index 2ba0af444c3..104e3ab90b6 100644 --- a/src/plugins/clangtools/clangtoolrunner.h +++ b/src/plugins/clangtools/clangtoolrunner.h @@ -14,12 +14,13 @@ namespace Utils::Tasking { class TaskItem; } namespace ClangTools { namespace Internal { -struct AnalyzeUnit { +struct AnalyzeUnit +{ AnalyzeUnit(const FileInfo &fileInfo, const Utils::FilePath &clangResourceDir, const QString &clangVersion); - QString file; + Utils::FilePath file; QStringList arguments; // without file itself and "-o somePath" }; using AnalyzeUnits = QList; @@ -37,8 +38,8 @@ struct AnalyzeInputData struct AnalyzeOutputData { bool success = true; - QString fileToAnalyze; - QString outputFilePath; + Utils::FilePath fileToAnalyze; + Utils::FilePath outputFilePath; CppEditor::ClangToolType toolType; QString errorMessage = {}; QString errorDetails = {}; diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index c8be34202ae..613fe78d207 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -167,6 +167,7 @@ void ClangToolsPlugin::registerAnalyzeActions() button->setPopupMode(QToolButton::InstantPopup); button->setIcon(icon); button->setToolTip(Tr::tr("Analyze File...")); + button->setProperty("noArrow", true); widget->toolBar()->addWidget(button); const auto toolsMenu = new QMenu(widget); button->setMenu(toolsMenu); diff --git a/src/plugins/clangtools/documentclangtoolrunner.cpp b/src/plugins/clangtools/documentclangtoolrunner.cpp index 2afd12aa270..81a7e8f5444 100644 --- a/src/plugins/clangtools/documentclangtoolrunner.cpp +++ b/src/plugins/clangtools/documentclangtoolrunner.cpp @@ -233,7 +233,7 @@ void DocumentClangToolRunner::onDone(const AnalyzeOutputData &output) const FilePath mappedPath = vfso().autoSavedFilePath(m_document); Diagnostics diagnostics = readExportedDiagnostics( - FilePath::fromString(output.outputFilePath), + output.outputFilePath, [&](const FilePath &path) { return path == mappedPath; }); for (Diagnostic &diag : diagnostics) { diff --git a/src/plugins/clangtools/settingswidget.cpp b/src/plugins/clangtools/settingswidget.cpp index 8e67df96766..bbac5aa7068 100644 --- a/src/plugins/clangtools/settingswidget.cpp +++ b/src/plugins/clangtools/settingswidget.cpp @@ -116,7 +116,7 @@ ClangToolsOptionsPage::ClangToolsOptionsPage() setId(Constants::SETTINGS_PAGE_ID); setDisplayName(Tr::tr("Clang Tools")); setCategory("T.Analyzer"); - setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); + setDisplayCategory(QCoreApplication::translate("::Debugger", "Analyzer")); setCategoryIconPath(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); setWidgetCreator([] { return new SettingsWidget; }); } diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs index 791d0c768a1..8e7df50419a 100644 --- a/src/plugins/classview/classview.qbs +++ b/src/plugins/classview/classview.qbs @@ -30,6 +30,7 @@ QtcPlugin { "classviewsymbolinformation.h", "classviewsymbollocation.cpp", "classviewsymbollocation.h", + "classviewtr.h", "classviewtreeitemmodel.cpp", "classviewtreeitemmodel.h", "classviewutils.cpp", diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index 55c9a821b8b..2b65135f8de 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -33,6 +33,7 @@ QtcPlugin { "clearcasesubmiteditorwidget.h", "clearcasesync.cpp", "clearcasesync.h", + "clearcasetr.h", "settingspage.cpp", "settingspage.h", "versionselector.cpp", diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 9a18236b81b..2c6a390179f 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1583,7 +1583,7 @@ CommandResult ClearCasePluginPrivate::runCleartoolProc(const FilePath &workingDi process.setWorkingDirectory(workingDir); process.setTimeoutS(m_settings.timeOutS); process.runBlocking(); - return CommandResult(&process); + return CommandResult(process); } CommandResult ClearCasePluginPrivate::runCleartool(const FilePath &workingDir, diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index 079295f2ffa..388ce1a8c18 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -39,10 +39,12 @@ static void runProcess(QFutureInterface &future, QString buffer; while (process.waitForReadyRead() && !future.isCanceled()) { buffer += QString::fromLocal8Bit(process.readAllRawStandardOutput()); - while (const int index = buffer.indexOf('\n') != -1) { + int index = buffer.indexOf('\n'); + while (index != -1) { const QString line = buffer.left(index + 1); processLine(line, ++processed); buffer = buffer.mid(index + 1); + index = buffer.indexOf('\n'); } } if (!buffer.isEmpty()) diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index 84cfdd3a023..ef7c7f40ca4 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp @@ -14,6 +14,7 @@ #include #include +#include #include using namespace ProjectExplorer; @@ -28,20 +29,20 @@ BuildDirParameters::BuildDirParameters(CMakeBuildSystem *buildSystem) auto bc = buildSystem->cmakeBuildConfiguration(); QTC_ASSERT(bc, return); - const Utils::MacroExpander *expander = bc->macroExpander(); + expander = bc->macroExpander(); const QStringList expandedArguments = Utils::transform(buildSystem->initialCMakeArguments(), - [expander](const QString &s) { + [this](const QString &s) { return expander->expand(s); }); initialCMakeArguments = Utils::filtered(expandedArguments, [](const QString &s) { return !s.isEmpty(); }); configurationChangesArguments = Utils::transform(buildSystem->configurationChangesArguments(), - [expander](const QString &s) { + [this](const QString &s) { return expander->expand(s); }); additionalCMakeArguments = Utils::transform(buildSystem->additionalCMakeArguments(), - [expander](const QString &s) { + [this](const QString &s) { return expander->expand(s); }); const Target *t = bc->target(); diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.h b/src/plugins/cmakeprojectmanager/builddirparameters.h index 1e2c84c2d23..bc5cccddd35 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.h +++ b/src/plugins/cmakeprojectmanager/builddirparameters.h @@ -8,6 +8,8 @@ #include #include +namespace Utils { class MacroExpander; } + namespace CMakeProjectManager::Internal { class CMakeBuildSystem; @@ -34,6 +36,8 @@ public: QStringList initialCMakeArguments; QStringList configurationChangesArguments; QStringList additionalCMakeArguments; + + Utils::MacroExpander* expander = nullptr; }; } // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index e6857822483..10256fc5dc2 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1126,13 +1126,11 @@ static CommandLine defaultInitialCMakeCommand(const Kit *k, const QString buildT if (!buildType.isEmpty() && !CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) cmd.addArg("-DCMAKE_BUILD_TYPE:STRING=" + buildType); - auto settings = Internal::CMakeSpecificSettings::instance(); - - // Package manager auto setup. The file auto-setup.cmake resides on the host, - // so it's not accessible for remotely running cmakes. We need to exclude that case. - if (!cmd.executable().needsDevice() && settings->packageManagerAutoSetup.value()) { - cmd.addArg("-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=" - "%{IDE:ResourcePath}/package-manager/auto-setup.cmake"); + // Package manager auto setup + if (Internal::CMakeSpecificSettings::instance()->packageManagerAutoSetup.value()) { + cmd.addArg(QString("-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=" + "%{buildDir}/%1/auto-setup.cmake") + .arg(Constants::PACKAGE_MANAGER_DIR)); } // Cross-compilation settings: diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index b7908db22ae..e37e40337d9 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -246,7 +246,7 @@ bool CMakeBuildStep::init() RunConfiguration *rc = target()->activeRunConfiguration(); if (!rc || rc->buildKey().isEmpty()) { emit addTask(BuildSystemTask(Task::Error, - QCoreApplication::translate("ProjectExplorer::Task", + QCoreApplication::translate("::ProjectExplorer", "You asked to build the current Run Configuration's build target only, " "but it is not associated with a build target. " "Update the Make Step in your build settings."))); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index b89f6471d1c..33d5cc67e5e 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -467,7 +467,8 @@ void CMakeBuildSystem::clearCMakeCache() m_parameters.buildDirectory / "CMakeCache.txt.prev", m_parameters.buildDirectory / "CMakeFiles", m_parameters.buildDirectory / ".cmake/api/v1/reply", - m_parameters.buildDirectory / ".cmake/api/v1/reply.prev" + m_parameters.buildDirectory / ".cmake/api/v1/reply.prev", + m_parameters.buildDirectory / Constants::PACKAGE_MANAGER_DIR }; for (const FilePath &path : pathsToDelete) @@ -624,15 +625,11 @@ void CMakeBuildSystem::updateProjectData() for (const RawProjectPart &rpp : std::as_const(rpps)) { FilePath moduleMapFile = buildConfiguration()->buildDirectory() .pathAppended("qml_module_mappings/" + rpp.buildSystemTarget); - if (moduleMapFile.exists()) { - QFile mmf(moduleMapFile.toString()); - if (mmf.open(QFile::ReadOnly)) { - QByteArray content = mmf.readAll(); - auto lines = content.split('\n'); - for (const auto &line : lines) { - if (!line.isEmpty()) - moduleMappings.append(line.simplified()); - } + if (expected_str content = moduleMapFile.fileContents()) { + auto lines = content->split('\n'); + for (const QByteArray &line : lines) { + if (!line.isEmpty()) + moduleMappings.append(line.simplified()); } } @@ -1086,8 +1083,7 @@ DeploymentData CMakeBuildSystem::deploymentData() const if (!hasDeploymentFile) return result; - deploymentPrefix = result.addFilesFromDeploymentFile(deploymentFilePath.toString(), - sourceDir.toString()); + deploymentPrefix = result.addFilesFromDeploymentFile(deploymentFilePath, sourceDir); for (const CMakeBuildTarget &ct : m_buildTargets) { if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType) { if (!ct.executable.isEmpty() diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp index 0b330a5ddaa..17fbb65fbbb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp @@ -13,15 +13,15 @@ #include #include #include + #include #include #include + #include #include -#include #include -#include #include using namespace TextEditor; @@ -43,7 +43,7 @@ void CMakeFormatter::formatFile() Command CMakeFormatter::command() const { Command command; - command.setExecutable(CMakeFormatterSettings::instance()->command().toString()); + command.setExecutable(CMakeFormatterSettings::instance()->command()); command.setProcessing(Command::FileProcessing); command.addOption("--in-place"); command.addOption("%file"); diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index 3ac06675f19..7a14143a4b9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -5,7 +5,9 @@ #include "builddirparameters.h" #include "cmakeparser.h" +#include "cmakeprojectconstants.h" #include "cmakeprojectmanagertr.h" +#include "cmakespecificsettings.h" #include #include @@ -87,6 +89,16 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & } } + // Copy the "package-manager" CMake code from the ${IDE:ResourcePath} to the build directory + if (Internal::CMakeSpecificSettings::instance()->packageManagerAutoSetup.value()) { + const FilePath localPackageManagerDir = buildDirectory.pathAppended(Constants::PACKAGE_MANAGER_DIR); + const FilePath idePackageManagerDir = FilePath::fromString( + parameters.expander->expand(QStringLiteral("%{IDE:ResourcePath}/package-manager"))); + + if (!localPackageManagerDir.exists() && idePackageManagerDir.exists()) + idePackageManagerDir.copyRecursively(localPackageManagerDir); + } + const auto parser = new CMakeParser; parser->setSourceDirectory(parameters.sourceDirectory); m_parser.addLineParser(parser); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index 2d4cd089a0c..cbaa6487266 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -23,6 +23,8 @@ const char CMAKEFORMATTER_GENERAL_GROUP[] = "General"; const char CMAKEFORMATTER_ACTION_ID[] = "CMakeFormatter.Action"; const char CMAKEFORMATTER_MENU_ID[] = "CMakeFormatter.Menu"; +const char PACKAGE_MANAGER_DIR[] = ".qtc/package-manager"; + // Project const char CMAKE_PROJECT_ID[] = "CMakeProjectManager.CMakeProject"; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index 841943bbd58..89e449ae402 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs @@ -57,6 +57,7 @@ QtcPlugin { "cmakeprojectconstants.h", "cmakeprojectmanager.cpp", "cmakeprojectmanager.h", + "cmakeprojectmanagertr.h", "cmakeprojectnodes.cpp", "cmakeprojectnodes.h", "cmakeprojectplugin.cpp", diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index e0288716573..bb0270d16ef 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -181,7 +181,7 @@ void CMakeProjectPlugin::initialize() }); Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::CMAKEFORMATTER_MENU_ID); - menu->menu()->setTitle(QCoreApplication::translate("CMakeFormatter", "CMakeFormatter")); + menu->menu()->setTitle(Tr::tr("CMakeFormatter")); menu->setOnAllDisabledBehavior(Core::ActionContainer::Show); Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu); diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp index fd80369ec0f..b29351d1752 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp @@ -48,7 +48,7 @@ CMakeSpecificSettings::CMakeSpecificSettings() registerAspect(&packageManagerAutoSetup); packageManagerAutoSetup.setSettingsKey("PackageManagerAutoSetup"); - packageManagerAutoSetup.setDefaultValue(false); + packageManagerAutoSetup.setDefaultValue(true); packageManagerAutoSetup.setLabelText(::CMakeProjectManager::Tr::tr("Package manager auto setup")); packageManagerAutoSetup.setToolTip(::CMakeProjectManager::Tr::tr("Add the CMAKE_PROJECT_INCLUDE_BEFORE variable " "pointing to a CMake script that will install dependencies from the conanfile.txt, " diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp index f9dcdd745e4..43f1915709f 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp @@ -61,8 +61,9 @@ static std::vector> autoDetectCMakeTools() if (HostOsInfo::isMacHost()) { path.append("/Applications/CMake.app/Contents/bin"); - path.append("/usr/local/bin"); - path.append("/opt/local/bin"); + path.append("/usr/local/bin"); // homebrew intel + path.append("/opt/homebrew/bin"); // homebrew arm + path.append("/opt/local/bin"); // macports } FilePaths suspects; diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp index 6e7a8986a07..c8db1a85cb6 100644 --- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp +++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp @@ -95,7 +95,7 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel * if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { auto edit = static_cast(editor); if (edit->rawFilePath().toString() != data.value) - model->setData(index, edit->filePath().toString(), Qt::EditRole); + model->setData(index, edit->rawFilePath().toString(), Qt::EditRole); return; } else if (!data.values.isEmpty()) { auto edit = static_cast(editor); diff --git a/src/plugins/coco/cocoplugin.cpp b/src/plugins/coco/cocoplugin.cpp index 3601e934f9b..abea861af1e 100644 --- a/src/plugins/coco/cocoplugin.cpp +++ b/src/plugins/coco/cocoplugin.cpp @@ -4,6 +4,7 @@ #include "cocoplugin.h" #include "cocolanguageclient.h" +#include "cocotr.h" #include #include @@ -46,18 +47,17 @@ void CocoPluginPrivate::startCoco() if (!candidates.isEmpty()) cocoChooser.setFilePath(candidates.first()); cocoChooser.setExpectedKind(PathChooser::Command); - cocoChooser.setPromptDialogTitle(CocoPlugin::tr( - "Select a Squish Coco CoverageBrowser Executable")); + cocoChooser.setPromptDialogTitle(Tr::tr("Select a Squish Coco CoverageBrowser Executable")); cocoChooser.setHistoryCompleter("Coco.CoverageBrowser.history", true); - layout->addRow(CocoPlugin::tr("CoverageBrowser:"), &cocoChooser); + layout->addRow(Tr::tr("CoverageBrowser:"), &cocoChooser); PathChooser csmesChoser; csmesChoser.setHistoryCompleter("Coco.CSMes.history", true); csmesChoser.setExpectedKind(PathChooser::File); csmesChoser.setInitialBrowsePathBackup(FileUtils::homePath()); - csmesChoser.setPromptDialogFilter(CocoPlugin::tr("Coco instrumentation files (*.csmes)")); - csmesChoser.setPromptDialogTitle(CocoPlugin::tr("Select a Squish Coco Instrumentation File")); - layout->addRow(CocoPlugin::tr("CSMes:"), &csmesChoser); + csmesChoser.setPromptDialogFilter(Tr::tr("Coco instrumentation files (*.csmes)")); + csmesChoser.setPromptDialogTitle(Tr::tr("Select a Squish Coco Instrumentation File")); + layout->addRow(Tr::tr("CSMes:"), &csmesChoser); QDialogButtonBox buttons(QDialogButtonBox::Cancel | QDialogButtonBox::Open); layout->addItem(new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::MinimumExpanding)); layout->addWidget(&buttons); diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 2606791942f..5f23238d7b8 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -460,8 +460,7 @@ void CompilationDatabaseBuildSystem::updateDeploymentData() const Utils::FilePath deploymentFilePath = projectDirectory() .pathAppended("QtCreatorDeployment.txt"); DeploymentData deploymentData; - deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), - projectDirectory().toString()); + deploymentData.addFilesFromDeploymentFile(deploymentFilePath, projectDirectory()); setDeploymentData(deploymentData); if (m_deployFileWatcher->files() != QStringList(deploymentFilePath.toString())) { m_deployFileWatcher->clear(); diff --git a/src/plugins/conan/conan.qbs b/src/plugins/conan/conan.qbs index 57e2351b4f7..486df35f49f 100644 --- a/src/plugins/conan/conan.qbs +++ b/src/plugins/conan/conan.qbs @@ -16,7 +16,8 @@ QtcPlugin { "conanplugin.h", "conanplugin.cpp", "conansettings.h", - "conansettings.cpp" + "conansettings.cpp", + "conantr.h", ] } diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 54d908c3f5d..f34e7fb5b70 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -197,7 +197,7 @@ public: const QVector availableTerminals = TerminalCommand::availableTerminalEmulators(); for (const TerminalCommand &term : availableTerminals) - m_terminalComboBox->addItem(term.command, QVariant::fromValue(term)); + m_terminalComboBox->addItem(term.command.toUserOutput(), QVariant::fromValue(term)); updateTerminalUi(TerminalCommand::terminalEmulator()); connect(m_terminalComboBox, &QComboBox::currentIndexChanged, this, [this](int index) { updateTerminalUi(m_terminalComboBox->itemData(index).value()); @@ -373,9 +373,11 @@ void SystemSettingsWidget::apply() QtcSettings *settings = ICore::settings(); EditorManager::setReloadSetting(IDocument::ReloadSetting(m_reloadBehavior->currentIndex())); if (HostOsInfo::isAnyUnixHost()) { - TerminalCommand::setTerminalEmulator({m_terminalComboBox->lineEdit()->text(), - m_terminalOpenArgs->text(), - m_terminalExecuteArgs->text()}); + TerminalCommand::setTerminalEmulator({ + FilePath::fromUserInput(m_terminalComboBox->lineEdit()->text()), + m_terminalOpenArgs->text(), + m_terminalExecuteArgs->text() + }); if (!HostOsInfo::isMacHost()) { UnixUtils::setFileBrowser(settings, m_externalFileBrowserEdit->text()); } @@ -423,7 +425,7 @@ void SystemSettingsWidget::resetTerminal() void SystemSettingsWidget::updateTerminalUi(const TerminalCommand &term) { - m_terminalComboBox->lineEdit()->setText(term.command); + m_terminalComboBox->lineEdit()->setText(term.command.toUserOutput()); m_terminalOpenArgs->setText(term.openArgs); m_terminalExecuteArgs->setText(term.executeArgs); } diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs index 6a878f46830..0896eae2738 100644 --- a/src/plugins/cpaster/cpaster.qbs +++ b/src/plugins/cpaster/cpaster.qbs @@ -19,6 +19,7 @@ QtcPlugin { "cpaster.qrc", "cpasterplugin.cpp", "cpasterplugin.h", + "cpastertr.h", "dpastedotcomprotocol.cpp", "dpastedotcomprotocol.h", "fileshareprotocol.cpp", diff --git a/src/plugins/cppcheck/cppcheck.qbs b/src/plugins/cppcheck/cppcheck.qbs index 575fd7622a4..e7b5f185baa 100644 --- a/src/plugins/cppcheck/cppcheck.qbs +++ b/src/plugins/cppcheck/cppcheck.qbs @@ -35,6 +35,7 @@ QtcPlugin { "cppchecktextmarkmanager.h", "cppchecktool.cpp", "cppchecktool.h", + "cppchecktr.h", "cppchecktrigger.cpp", "cppchecktrigger.h" ] diff --git a/src/plugins/cppcheck/cppcheckoptions.cpp b/src/plugins/cppcheck/cppcheckoptions.cpp index e78f2d59fe9..217a8e9063f 100644 --- a/src/plugins/cppcheck/cppcheckoptions.cpp +++ b/src/plugins/cppcheck/cppcheckoptions.cpp @@ -126,7 +126,7 @@ CppcheckOptionsPage::CppcheckOptionsPage(CppcheckTool &tool, CppcheckTrigger &tr setId(Constants::OPTIONS_PAGE_ID); setDisplayName(Tr::tr("Cppcheck")); setCategory("T.Analyzer"); - setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); + setDisplayCategory(QCoreApplication::translate("::Debugger", "Analyzer")); setCategoryIconPath(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); CppcheckOptions options; diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp index 9459aefa621..30bda87af69 100644 --- a/src/plugins/cppeditor/cppfilesettingspage.cpp +++ b/src/plugins/cppeditor/cppfilesettingspage.cpp @@ -39,7 +39,7 @@ const char sourceSearchPathsKeyC[] = "SourceSearchPaths"; const char headerPragmaOnceC[] = "HeaderPragmaOnce"; const char licenseTemplatePathKeyC[] = "LicenseTemplate"; -const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppEditor", +const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("::CppEditor", "/**************************************************************************\n" "** %1 license header template\n" "** Special keywords: %USER% %DATE% %YEAR%\n" diff --git a/src/plugins/cppeditor/cppoutlinemodel.cpp b/src/plugins/cppeditor/cppoutlinemodel.cpp index 967c3987792..313074d4d9f 100644 --- a/src/plugins/cppeditor/cppoutlinemodel.cpp +++ b/src/plugins/cppeditor/cppoutlinemodel.cpp @@ -32,8 +32,8 @@ public: switch (role) { case Qt::DisplayRole: if (parent()->childCount() > 1) - return QString(QT_TRANSLATE_NOOP("CppEditor", "")); + return QString(QT_TRANSLATE_NOOP("::CppEditor", "")); default: return QVariant(); } diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 57a8246620c..90ddfbdf905 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -489,7 +489,7 @@ void FollowSymbolTest::initTestCase() const QString clangdFromEnv = Utils::qtcEnvironmentVariable("QTC_CLANGD"); if (clangdFromEnv.isEmpty()) return; - ClangdSettings::setClangdFilePath(Utils::FilePath::fromString(clangdFromEnv)); + ClangdSettings::setClangdFilePath(Utils::FilePath::fromUserInput(clangdFromEnv)); const auto clangd = ClangdSettings::instance().clangdFilePath(); if (clangd.isEmpty() || !clangd.exists()) return; diff --git a/src/plugins/ctfvisualizer/ctfvisualizer.qbs b/src/plugins/ctfvisualizer/ctfvisualizer.qbs index 71d9ebc2606..63091dc4b45 100644 --- a/src/plugins/ctfvisualizer/ctfvisualizer.qbs +++ b/src/plugins/ctfvisualizer/ctfvisualizer.qbs @@ -18,10 +18,11 @@ QtcPlugin { "ctfstatisticsview.cpp", "ctfstatisticsview.h", "ctftimelinemodel.cpp", "ctftimelinemodel.h", "ctftracemanager.cpp", "ctftracemanager.h", + "ctfvisualizerconstants.h", "ctfvisualizerplugin.cpp", "ctfvisualizerplugin.h", "ctfvisualizertool.cpp", "ctfvisualizertool.h", "ctfvisualizertraceview.cpp", "ctfvisualizertraceview.h", - "ctfvisualizerconstants.h", + "ctfvisualizertr.h", "../../libs/3rdparty/json/json.hpp", ] } diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp index 606eaa2d76d..0fbc5cac650 100644 --- a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp +++ b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp @@ -7,6 +7,7 @@ #include "ctfstatisticsmodel.h" #include "ctfstatisticsview.h" #include "ctftimelinemodel.h" +#include "ctfvisualizertr.h" #include "ctfvisualizertraceview.h" #include diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.h b/src/plugins/ctfvisualizer/ctfvisualizertool.h index af2284b5fa4..24c1bf45cac 100644 --- a/src/plugins/ctfvisualizer/ctfvisualizertool.h +++ b/src/plugins/ctfvisualizer/ctfvisualizertool.h @@ -4,12 +4,12 @@ #pragma once #include "ctfvisualizerconstants.h" -#include "ctfvisualizertr.h" #include #include #include +#include #include namespace CtfVisualizer { @@ -46,7 +46,8 @@ private: void toggleThreadRestriction(QAction *action); Utils::Perspective m_perspective{Constants::CtfVisualizerPerspectiveId, - ::CtfVisualizer::Tr::tr("Chrome Trace Format Visualizer")}; + QCoreApplication::translate("::CtfVisualizer", + "Chrome Trace Format Visualizer")}; bool m_isLoading; QScopedPointer m_loadJson; diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs index 53fae819f28..a8e53712d98 100644 --- a/src/plugins/cvs/cvs.qbs +++ b/src/plugins/cvs/cvs.qbs @@ -19,6 +19,7 @@ QtcPlugin { "cvssettings.h", "cvssubmiteditor.cpp", "cvssubmiteditor.h", + "cvstr.h", "cvsutils.cpp", "cvsutils.h", ] diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 6581dfa39c9..bcc50a4b0d0 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -89,9 +89,9 @@ public: gbp->m_params.lineNumber = lineNumber; } - void updateFileName(const FilePath &fileName) final + void updateFilePath(const FilePath &fileName) final { - TextMark::updateFileName(fileName); + TextMark::updateFilePath(fileName); QTC_ASSERT(m_bp, return); m_bp->setFileName(fileName); if (GlobalBreakpoint gbp = m_bp->globalBreakpoint()) @@ -158,9 +158,9 @@ public: m_gbp->updateLineNumber(lineNumber); } - void updateFileName(const FilePath &fileName) final + void updateFilePath(const FilePath &fileName) final { - TextMark::updateFileName(fileName); + TextMark::updateFilePath(fileName); QTC_ASSERT(m_gbp, return); m_gbp->updateFileName(fileName); } @@ -1883,7 +1883,7 @@ void BreakpointItem::updateMarker() { const FilePath &file = markerFileName(); int line = markerLineNumber(); - if (m_marker && (file != m_marker->fileName() || line != m_marker->lineNumber())) + if (m_marker && (file != m_marker->filePath() || line != m_marker->lineNumber())) destroyMarker(); if (!m_marker && !file.isEmpty() && line > 0) @@ -2308,8 +2308,8 @@ void GlobalBreakpointItem::updateMarker() const int line = m_params.lineNumber; if (m_marker) { - if (m_params.fileName != m_marker->fileName()) - m_marker->updateFileName(m_params.fileName); + if (m_params.fileName != m_marker->filePath()) + m_marker->updateFilePath(m_params.fileName); if (line != m_marker->lineNumber()) m_marker->move(line); } else if (!m_params.fileName.isEmpty() && line > 0) { diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 98d89bd9f65..4759c239880 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -33,12 +33,12 @@ struct EventsDescription { // Parameters of the "sxe" command const EventsDescription eventDescriptions[] = { - {"eh", false, QT_TRANSLATE_NOOP("Debugger", "C++ exception")}, - {"ct", false, QT_TRANSLATE_NOOP("Debugger", "Thread creation")}, - {"et", false, QT_TRANSLATE_NOOP("Debugger", "Thread exit")}, - {"ld", true, QT_TRANSLATE_NOOP("Debugger", "Load module:")}, - {"ud", true, QT_TRANSLATE_NOOP("Debugger", "Unload module:")}, - {"out", true, QT_TRANSLATE_NOOP("Debugger", "Output:")} + {"eh", false, QT_TRANSLATE_NOOP("::Debugger", "C++ exception")}, + {"ct", false, QT_TRANSLATE_NOOP("::Debugger", "Thread creation")}, + {"et", false, QT_TRANSLATE_NOOP("::Debugger", "Thread exit")}, + {"ld", true, QT_TRANSLATE_NOOP("::Debugger", "Load module:")}, + {"ud", true, QT_TRANSLATE_NOOP("::Debugger", "Unload module:")}, + {"out", true, QT_TRANSLATE_NOOP("::Debugger", "Output:")} }; static inline int indexOfEvent(const QString &abbrev) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index ae4532b2bd5..4e3d00298bf 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1521,31 +1521,26 @@ void DebuggerPluginPrivate::attachCore() if (!lastExternalKit.isEmpty()) dlg.setKitId(Id::fromString(lastExternalKit)); dlg.setSymbolFile(FilePath::fromSettings(configValue("LastExternalExecutableFile"))); - dlg.setLocalCoreFile(FilePath::fromSettings(configValue("LastLocalCoreFile"))); - dlg.setRemoteCoreFile(FilePath::fromSettings(configValue("LastRemoteCoreFile"))); + dlg.setCoreFile(FilePath::fromSettings(configValue("LastLocalCoreFile"))); dlg.setOverrideStartScript(FilePath::fromSettings(configValue("LastExternalStartScript"))); dlg.setSysRoot(FilePath::fromSettings(configValue("LastSysRoot"))); - dlg.setForceLocalCoreFile(configValue("LastForceLocalCoreFile").toBool()); if (dlg.exec() != QDialog::Accepted) return; setConfigValue("LastExternalExecutableFile", dlg.symbolFile().toSettings()); - setConfigValue("LastLocalCoreFile", dlg.localCoreFile().toSettings()); - setConfigValue("LastRemoteCoreFile", dlg.remoteCoreFile().toSettings()); + setConfigValue("LastLocalCoreFile", dlg.coreFile().toSettings()); setConfigValue("LastExternalKit", dlg.kit()->id().toSetting()); setConfigValue("LastExternalStartScript", dlg.overrideStartScript().toSettings()); setConfigValue("LastSysRoot", dlg.sysRoot().toSettings()); - setConfigValue("LastForceLocalCoreFile", dlg.forcesLocalCoreFile()); auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); runControl->setKit(dlg.kit()); - runControl->setDisplayName(Tr::tr("Core file \"%1\"") - .arg(dlg.useLocalCoreFile() ? dlg.localCoreFile().toUserOutput() - : dlg.remoteCoreFile().toUserOutput())); + runControl->setDisplayName(Tr::tr("Core file \"%1\"").arg(dlg.coreFile().toUserOutput())); auto debugger = new DebuggerRunTool(runControl); - debugger->setInferiorExecutable(dlg.symbolFile()); - debugger->setCoreFilePath(dlg.localCoreFile()); + + debugger->setInferiorExecutable(dlg.symbolFileCopy()); + debugger->setCoreFilePath(dlg.coreFileCopy()); debugger->setStartMode(AttachToCore); debugger->setCloseMode(DetachAtClose); debugger->setOverrideStartScript(dlg.overrideStartScript()); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index d228a7d4bc3..8b6ac29c995 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -786,11 +786,11 @@ bool DebuggerRunTool::fixupParameters() } if (HostOsInfo::isWindowsHost()) { + // Otherwise command lines with '> tmp.log' hang. ProcessArgs::SplitError perr; - rp.inferior.command.setArguments( - ProcessArgs::prepareArgs(rp.inferior.command.arguments(), &perr, - HostOsInfo::hostOs(), nullptr, - &rp.inferior.workingDirectory).toWindowsArgs()); + ProcessArgs::prepareArgs(rp.inferior.command.arguments(), &perr, + HostOsInfo::hostOs(), nullptr, + &rp.inferior.workingDirectory).toWindowsArgs(); if (perr != ProcessArgs::SplitOk) { // perr == BadQuoting is never returned on Windows // FIXME? QTCREATORBUG-2809 diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 933e923d625..b420104afb5 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4439,12 +4439,11 @@ void GdbEngine::setupInferior() } // Do that first, otherwise no symbols are loaded. - QFileInfo fi = executable.toFileInfo(); - QString path = fi.absoluteFilePath(); + const QString localExecutablePath = executable.absoluteFilePath().path(); // This is *not* equivalent to -file-exec-and-symbols. If the file is not executable // (contains only debugging symbols), this should still work. - runCommand({"-file-exec-file \"" + path + '"'}); - runCommand({"-file-symbol-file \"" + path + '"', + runCommand({"-file-exec-file \"" + localExecutablePath + '"'}); + runCommand({"-file-symbol-file \"" + localExecutablePath + '"', CB(handleFileExecAndSymbols)}); } else if (isTermEngine()) { @@ -5078,7 +5077,7 @@ void GdbEngine::handleFetchVariables(const DebuggerResponse &response) QString GdbEngine::msgPtraceError(DebuggerStartMode sm) { if (sm == StartInternal) { - return QCoreApplication::translate("QtDumperHelper", + return Tr::tr( "ptrace: Operation not permitted.\n\n" "Could not attach to the process. " "Make sure no other debugger traces this process.\n" @@ -5086,7 +5085,7 @@ QString GdbEngine::msgPtraceError(DebuggerStartMode sm) "/proc/sys/kernel/yama/ptrace_scope\n" "For more details, see /etc/sysctl.d/10-ptrace.conf\n"); } - return QCoreApplication::translate("QtDumperHelper", + return Tr::tr( "ptrace: Operation not permitted.\n\n" "Could not attach to the process. " "Make sure no other debugger traces this process.\n" diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index b360f937018..86c9c738dc3 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -7,16 +7,17 @@ #include "debuggertr.h" #include "gdb/gdbengine.h" -#include -#include #include #include #include +#include #include #include #include +#include #include +#include #include #include @@ -25,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -36,112 +38,6 @@ using namespace Utils; namespace Debugger::Internal { -/////////////////////////////////////////////////////////////////////// -// -// SelectRemoteFileDialog -// -/////////////////////////////////////////////////////////////////////// - -class SelectRemoteFileDialog : public QDialog -{ -public: - explicit SelectRemoteFileDialog(QWidget *parent); - - void attachToDevice(Kit *k); - FilePath localFile() const { return m_localFile; } - FilePath remoteFile() const { return m_remoteFile; } - -private: - void selectFile(); - - QSortFilterProxyModel m_model; - DeviceFileSystemModel m_fileSystemModel; - QTreeView *m_fileSystemView; - QTextBrowser *m_textBrowser; - QDialogButtonBox *m_buttonBox; - FilePath m_localFile; - FilePath m_remoteFile; - FileTransfer m_fileTransfer; -}; - -SelectRemoteFileDialog::SelectRemoteFileDialog(QWidget *parent) - : QDialog(parent) -{ - m_model.setSourceModel(&m_fileSystemModel); - - m_fileSystemView = new QTreeView(this); - m_fileSystemView->setModel(&m_model); - m_fileSystemView->setSortingEnabled(true); - m_fileSystemView->sortByColumn(1, Qt::AscendingOrder); - m_fileSystemView->setUniformRowHeights(true); - m_fileSystemView->setSelectionMode(QAbstractItemView::SingleSelection); - m_fileSystemView->setSelectionBehavior(QAbstractItemView::SelectRows); - m_fileSystemView->header()->setDefaultSectionSize(100); - m_fileSystemView->header()->setStretchLastSection(true); - - m_textBrowser = new QTextBrowser(this); - m_textBrowser->setReadOnly(true); - - m_buttonBox = new QDialogButtonBox(this); - m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); - m_buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); - m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - - auto layout = new QVBoxLayout(this); - layout->addWidget(m_fileSystemView); - layout->addWidget(m_textBrowser); - layout->addWidget(m_buttonBox); - - connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - connect(m_buttonBox, &QDialogButtonBox::accepted, this, &SelectRemoteFileDialog::selectFile); - - connect(&m_fileTransfer, &FileTransfer::done, this, [this](const ProcessResultData &result) { - const bool success = result.m_error == QProcess::UnknownError - && result.m_exitStatus == QProcess::NormalExit - && result.m_exitCode == 0; - if (success) { - m_textBrowser->append(Tr::tr("Download of remote file succeeded.")); - accept(); - } else { - m_textBrowser->append(Tr::tr("Download of remote file failed: %1") - .arg(result.m_errorString)); - m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); - m_fileSystemView->setEnabled(true); - } - }); -} - -void SelectRemoteFileDialog::attachToDevice(Kit *k) -{ - m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); - QTC_ASSERT(k, return); - IDevice::ConstPtr device = DeviceKitAspect::device(k); - QTC_ASSERT(device, return); - m_fileSystemModel.setDevice(device); -} - -void SelectRemoteFileDialog::selectFile() -{ - QModelIndex idx = m_model.mapToSource(m_fileSystemView->currentIndex()); - if (!idx.isValid()) - return; - - m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - m_fileSystemView->setEnabled(false); - - { - TemporaryFile localFile("remotecore-XXXXXX"); - localFile.open(); - m_localFile = FilePath::fromString(localFile.fileName()); - } - - idx = idx.sibling(idx.row(), 1); - m_remoteFile = FilePath::fromVariant(m_fileSystemModel.data(idx, DeviceFileSystemModel::PathRole)); - - m_fileTransfer.setFilesToTransfer({{m_remoteFile, m_localFile}}); - m_fileTransfer.start(); -} - /////////////////////////////////////////////////////////////////////// // // AttachCoreDialog @@ -153,17 +49,20 @@ class AttachCoreDialogPrivate public: KitChooser *kitChooser; - QCheckBox *forceLocalCheckBox; - QLabel *forceLocalLabel; PathChooser *symbolFileName; - PathChooser *localCoreFileName; - PathChooser *remoteCoreFileName; - QPushButton *selectRemoteCoreButton; - + PathChooser *coreFileName; PathChooser *overrideStartScriptFileName; PathChooser *sysRootDirectory; + FilePath debuggerPath; + QDialogButtonBox *buttonBox; + ProgressIndicator *progressIndicator; + QLabel *progressLabel; + + TaskTree taskTree; + expected_str coreFileResult; + expected_str symbolFileResult; struct State { @@ -175,23 +74,14 @@ public: bool validKit; bool validSymbolFilename; bool validCoreFilename; - bool localCoreFile; - bool localKit; }; - State getDialogState(const AttachCoreDialog &p) const + State getDialogState() const { State st; - st.localCoreFile = p.useLocalCoreFile(); st.validKit = (kitChooser->currentKit() != nullptr); st.validSymbolFilename = symbolFileName->isValid(); - - if (st.localCoreFile) - st.validCoreFilename = localCoreFileName->isValid(); - else - st.validCoreFilename = !p.remoteCoreFile().isEmpty(); - - st.localKit = p.isLocalKit(); + st.validCoreFilename = coreFileName->isValid(); return st; } }; @@ -210,23 +100,17 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent) d->kitChooser->setShowIcons(true); d->kitChooser->populate(); - d->forceLocalCheckBox = new QCheckBox(this); - d->forceLocalLabel = new QLabel(this); - d->forceLocalLabel->setText(Tr::tr("Use local core file:")); - d->forceLocalLabel->setBuddy(d->forceLocalCheckBox); - - d->remoteCoreFileName = new PathChooser(this); - d->selectRemoteCoreButton = new QPushButton(PathChooser::browseButtonLabel(), this); - - d->localCoreFileName = new PathChooser(this); - d->localCoreFileName->setHistoryCompleter("Debugger.CoreFile.History"); - d->localCoreFileName->setExpectedKind(PathChooser::File); - d->localCoreFileName->setPromptDialogTitle(Tr::tr("Select Core File")); + d->coreFileName = new PathChooser(this); + d->coreFileName->setHistoryCompleter("Debugger.CoreFile.History"); + d->coreFileName->setExpectedKind(PathChooser::File); + d->coreFileName->setPromptDialogTitle(Tr::tr("Select Core File")); + d->coreFileName->setAllowPathFromDevice(true); d->symbolFileName = new PathChooser(this); - d->symbolFileName->setHistoryCompleter("LocalExecutable"); + d->symbolFileName->setHistoryCompleter("Executable"); d->symbolFileName->setExpectedKind(PathChooser::File); d->symbolFileName->setPromptDialogTitle(Tr::tr("Select Executable or Symbol File")); + d->symbolFileName->setAllowPathFromDevice(true); d->symbolFileName->setToolTip( Tr::tr("Select a file containing debug information corresponding to the core file. " "Typically, this is the executable or a *.debug file if the debug " @@ -244,28 +128,30 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent) d->sysRootDirectory->setToolTip(Tr::tr( "This option can be used to override the kit's SysRoot setting")); - auto coreLayout = new QHBoxLayout; - coreLayout->addWidget(d->localCoreFileName); - coreLayout->addWidget(d->remoteCoreFileName); - coreLayout->addWidget(d->selectRemoteCoreButton); + d->progressIndicator = new ProgressIndicator(ProgressIndicatorSize::Small, this); + d->progressIndicator->setVisible(false); - auto formLayout = new QFormLayout; - formLayout->setContentsMargins(0, 0, 0, 0); - formLayout->setHorizontalSpacing(6); - formLayout->setVerticalSpacing(6); - formLayout->addRow(Tr::tr("Kit:"), d->kitChooser); - formLayout->addRow(d->forceLocalLabel, d->forceLocalCheckBox); - formLayout->addRow(Tr::tr("Core file:"), coreLayout); - formLayout->addRow(Tr::tr("&Executable or symbol file:"), d->symbolFileName); - formLayout->addRow(Tr::tr("Override &start script:"), d->overrideStartScriptFileName); - formLayout->addRow(Tr::tr("Override S&ysRoot:"), d->sysRootDirectory); - formLayout->addRow(d->buttonBox); + d->progressLabel = new QLabel(); + d->progressLabel->setVisible(false); - auto vboxLayout = new QVBoxLayout(this); - vboxLayout->addLayout(formLayout); - vboxLayout->addStretch(); - vboxLayout->addWidget(Layouting::createHr()); - vboxLayout->addWidget(d->buttonBox); + // clang-format off + using namespace Layouting; + + Column { + Form { + Tr::tr("Kit:"), d->kitChooser, br, + Tr::tr("Core file:"), d->coreFileName, br, + Tr::tr("&Executable or symbol file:"), d->symbolFileName, br, + Tr::tr("Override &start script:"), d->overrideStartScriptFileName, br, + Tr::tr("Override S&ysRoot:"), d->sysRootDirectory, br, + }, + st, + hr, + Row { + d->progressIndicator, d->progressLabel, d->buttonBox + } + }.attachTo(this); + // clang-format on } AttachCoreDialog::~AttachCoreDialog() @@ -275,28 +161,50 @@ AttachCoreDialog::~AttachCoreDialog() int AttachCoreDialog::exec() { - connect(d->selectRemoteCoreButton, &QAbstractButton::clicked, this, &AttachCoreDialog::selectRemoteCoreFile); - connect(d->remoteCoreFileName, &PathChooser::textChanged, this, [this] { - coreFileChanged(d->remoteCoreFileName->rawFilePath()); - }); connect(d->symbolFileName, &PathChooser::textChanged, this, &AttachCoreDialog::changed); - connect(d->localCoreFileName, &PathChooser::textChanged, this, [this] { - coreFileChanged(d->localCoreFileName->rawFilePath()); + connect(d->coreFileName, &PathChooser::textChanged, this, [this] { + coreFileChanged(d->coreFileName->rawFilePath()); }); - connect(d->forceLocalCheckBox, &QCheckBox::stateChanged, this, &AttachCoreDialog::changed); connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed); connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(d->buttonBox, &QDialogButtonBox::accepted, this, &AttachCoreDialog::accepted); changed(); - AttachCoreDialogPrivate::State st = d->getDialogState(*this); + connect(&d->taskTree, &TaskTree::done, this, [&]() { + setEnabled(true); + d->progressIndicator->setVisible(false); + d->progressLabel->setVisible(false); + + if (!d->coreFileResult) { + QMessageBox::critical(this, + Tr::tr("Error"), + Tr::tr("Failed to copy core file to device: %1") + .arg(d->coreFileResult.error())); + return; + } + + if (!d->symbolFileResult) { + QMessageBox::critical(this, + Tr::tr("Error"), + Tr::tr("Failed to copy symbol file to device: %1") + .arg(d->coreFileResult.error())); + return; + } + + accept(); + }); + connect(&d->taskTree, &TaskTree::progressValueChanged, this, [this](int value) { + const QString text = Tr::tr("Copying files to device... %1/%2") + .arg(value) + .arg(d->taskTree.progressMaximum()); + d->progressLabel->setText(text); + }); + + AttachCoreDialogPrivate::State st = d->getDialogState(); if (!st.validKit) { d->kitChooser->setFocus(); } else if (!st.validCoreFilename) { - if (st.localCoreFile) - d->localCoreFileName->setFocus(); - else - d->remoteCoreFileName->setFocus(); + d->coreFileName->setFocus(); } else if (!st.validSymbolFilename) { d->symbolFileName->setFocus(); } @@ -304,18 +212,61 @@ int AttachCoreDialog::exec() return QDialog::exec(); } -bool AttachCoreDialog::isLocalKit() const +void AttachCoreDialog::accepted() { - Kit *k = d->kitChooser->currentKit(); - QTC_ASSERT(k, return false); - IDevice::ConstPtr device = DeviceKitAspect::device(k); - QTC_ASSERT(device, return false); - return device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; -} + const DebuggerItem *debuggerItem = Debugger::DebuggerKitAspect::debugger(kit()); + const FilePath debuggerCommand = debuggerItem->command(); -bool AttachCoreDialog::useLocalCoreFile() const -{ - return isLocalKit() || d->forceLocalCheckBox->isChecked(); + using namespace Tasking; + + const auto copyFile = [debuggerCommand](const FilePath &srcPath) -> expected_str { + if (!srcPath.isSameDevice(debuggerCommand)) { + const expected_str tmpPath = debuggerCommand.tmpDir(); + if (!tmpPath) + return make_unexpected(tmpPath.error()); + + const FilePath pattern = (tmpPath.value() + / (srcPath.fileName() + ".XXXXXXXXXXX")); + + const expected_str resultPath = pattern.createTempFile(); + if (!resultPath) + return make_unexpected(resultPath.error()); + const expected_str result = srcPath.copyFile(resultPath.value()); + if (!result) + return make_unexpected(result.error()); + + return resultPath; + } + + return srcPath; + }; + + using ResultType = expected_str; + + const auto copyFileAsync = [=](QFutureInterface &fi, const FilePath &srcPath) { + fi.reportResult(copyFile(srcPath)); + }; + + const Group root = { + parallel, + Async{[=](auto &task) { + task.setAsyncCallData(copyFileAsync, this->coreFile()); + }, + [=](const auto &task) { d->coreFileResult = task.result(); }}, + Async{[=](auto &task) { + task.setAsyncCallData(copyFileAsync, this->symbolFile()); + }, + [=](const auto &task) { d->symbolFileResult = task.result(); }}, + }; + + d->taskTree.setupRoot(root); + d->taskTree.start(); + + d->progressLabel->setText(Tr::tr("Copying files to device...")); + + setEnabled(false); + d->progressIndicator->setVisible(true); + d->progressLabel->setVisible(true); } void AttachCoreDialog::coreFileChanged(const FilePath &coreFile) @@ -335,40 +286,13 @@ void AttachCoreDialog::coreFileChanged(const FilePath &coreFile) void AttachCoreDialog::changed() { - AttachCoreDialogPrivate::State st = d->getDialogState(*this); - - d->forceLocalLabel->setVisible(!st.localKit); - d->forceLocalCheckBox->setVisible(!st.localKit); - if (st.localCoreFile) { - d->localCoreFileName->setVisible(true); - d->remoteCoreFileName->setVisible(false); - d->selectRemoteCoreButton->setVisible(false); - } else { - d->localCoreFileName->setVisible(false); - d->remoteCoreFileName->setVisible(true); - d->selectRemoteCoreButton->setVisible(true); - } - + AttachCoreDialogPrivate::State st = d->getDialogState(); d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(st.isValid()); } -void AttachCoreDialog::selectRemoteCoreFile() +FilePath AttachCoreDialog::coreFile() const { - changed(); - QTC_ASSERT(!isLocalKit(), return); - SelectRemoteFileDialog dlg(this); - dlg.setWindowTitle(Tr::tr("Select Remote Core File")); - dlg.attachToDevice(d->kitChooser->currentKit()); - if (dlg.exec() == QDialog::Rejected) - return; - d->localCoreFileName->setFilePath(dlg.localFile()); - d->remoteCoreFileName->setFilePath(dlg.remoteFile()); - changed(); -} - -FilePath AttachCoreDialog::localCoreFile() const -{ - return d->localCoreFileName->filePath(); + return d->coreFileName->filePath(); } FilePath AttachCoreDialog::symbolFile() const @@ -376,24 +300,24 @@ FilePath AttachCoreDialog::symbolFile() const return d->symbolFileName->filePath(); } +FilePath AttachCoreDialog::coreFileCopy() const +{ + return d->coreFileResult.value_or(d->symbolFileName->filePath()); +} + +FilePath AttachCoreDialog::symbolFileCopy() const +{ + return d->symbolFileResult.value_or(d->symbolFileName->filePath()); +} + void AttachCoreDialog::setSymbolFile(const FilePath &symbolFilePath) { d->symbolFileName->setFilePath(symbolFilePath); } -void AttachCoreDialog::setLocalCoreFile(const FilePath &coreFilePath) +void AttachCoreDialog::setCoreFile(const FilePath &coreFilePath) { - d->localCoreFileName->setFilePath(coreFilePath); -} - -void AttachCoreDialog::setRemoteCoreFile(const FilePath &coreFilePath) -{ - d->remoteCoreFileName->setFilePath(coreFilePath); -} - -FilePath AttachCoreDialog::remoteCoreFile() const -{ - return d->remoteCoreFileName->filePath(); + d->coreFileName->setFilePath(coreFilePath); } void AttachCoreDialog::setKitId(Id id) @@ -401,16 +325,6 @@ void AttachCoreDialog::setKitId(Id id) d->kitChooser->setCurrentKitId(id); } -void AttachCoreDialog::setForceLocalCoreFile(bool on) -{ - d->forceLocalCheckBox->setChecked(on); -} - -bool AttachCoreDialog::forcesLocalCoreFile() const -{ - return d->forceLocalCheckBox->isChecked(); -} - Kit *AttachCoreDialog::kit() const { return d->kitChooser->currentKit(); diff --git a/src/plugins/debugger/loadcoredialog.h b/src/plugins/debugger/loadcoredialog.h index 4c07cf6cfa6..ee1d065f92d 100644 --- a/src/plugins/debugger/loadcoredialog.h +++ b/src/plugins/debugger/loadcoredialog.h @@ -21,28 +21,26 @@ public: int exec() override; Utils::FilePath symbolFile() const; - Utils::FilePath localCoreFile() const; - Utils::FilePath remoteCoreFile() const; + Utils::FilePath coreFile() const; Utils::FilePath overrideStartScript() const; Utils::FilePath sysRoot() const; - bool useLocalCoreFile() const; - bool forcesLocalCoreFile() const; - bool isLocalKit() const; // For persistance. ProjectExplorer::Kit *kit() const; void setSymbolFile(const Utils::FilePath &symbolFilePath); - void setLocalCoreFile(const Utils::FilePath &coreFilePath); - void setRemoteCoreFile(const Utils::FilePath &coreFilePath); + void setCoreFile(const Utils::FilePath &coreFilePath); void setOverrideStartScript(const Utils::FilePath &scriptName); void setSysRoot(const Utils::FilePath &sysRoot); void setKitId(Utils::Id id); - void setForceLocalCoreFile(bool on); + + Utils::FilePath coreFileCopy() const; + Utils::FilePath symbolFileCopy() const; + + void accepted(); private: void changed(); void coreFileChanged(const Utils::FilePath &core); - void selectRemoteCoreFile(); class AttachCoreDialogPrivate *d; }; diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 1e7c6c6c677..204d6c4437c 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -1079,7 +1079,7 @@ void QmlEnginePrivate::updateScriptSource(const QString &fileName, int lineOffse } //update open editors - QString titlePattern = QCoreApplication::translate("QmlEngine", "JS Source for %1").arg(fileName); + QString titlePattern = Tr::tr("JS Source for %1").arg(fileName); //Check if there are open editors with the same title const QList documents = DocumentModel::openedDocuments(); for (IDocument *doc: documents) { @@ -2044,7 +2044,7 @@ StackFrame QmlEnginePrivate::extractStackFrame(const QVariant &bodyVal) stackFrame.function = extractString(body.value("func")); if (stackFrame.function.isEmpty()) - stackFrame.function = QCoreApplication::translate("QmlEngine", "Anonymous Function"); + stackFrame.function = Tr::tr("Anonymous Function"); stackFrame.file = FilePath::fromString( engine->toFileInProject(extractString(body.value("script")))); stackFrame.usable = stackFrame.file.isReadableFile(); diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs index 582abe0c499..411be43283b 100644 --- a/src/plugins/designer/designer.qbs +++ b/src/plugins/designer/designer.qbs @@ -35,6 +35,7 @@ QtcPlugin { "designer_export.h", "designerconstants.h", "designercontext.cpp", "designercontext.h", + "designertr.h", "editordata.h", "editorwidget.cpp", "editorwidget.h", "formeditorfactory.cpp", "formeditorfactory.h", diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 5453af18548..8b2a34dffeb 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -11,10 +11,10 @@ namespace Constants { const char INFO_READ_ONLY[] = "DesignerXmlEditor.ReadOnly"; const char K_DESIGNER_XML_EDITOR_ID[] = "FormEditor.DesignerXmlEditor"; const char C_DESIGNER_XML_EDITOR[] = "Designer Xml Editor"; -const char C_DESIGNER_XML_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Designer", "Form Editor"); +const char C_DESIGNER_XML_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::Designer", "Form Editor"); const char SETTINGS_CATEGORY[] = "P.Designer"; -const char SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Designer", "Designer"); +const char SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("::Designer", "Designer"); // Context const char C_FORMEDITOR[] = "FormEditor.FormEditor"; diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp index 7eb2d47c0bc..a77b5b4321b 100644 --- a/src/plugins/designer/formtemplatewizardpage.cpp +++ b/src/plugins/designer/formtemplatewizardpage.cpp @@ -46,7 +46,7 @@ bool FormPageFactory::validateData(Utils::Id typeId, const QVariant &data, QStri { QTC_ASSERT(canCreate(typeId), return false); if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) { - *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizard", + *errorMessage = QCoreApplication::translate("::ProjectExplorer", "\"data\" for a \"Form\" page needs to be unset or an empty object."); return false; } diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index aaa9fd3a1ea..5c11a0e7dc7 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -290,7 +290,9 @@ void DockerProcessImpl::start() if (m_setup.m_lowPriority) m_process.setLowPriority(); - const bool interactive = m_setup.m_processMode == ProcessMode::Writer; + const bool interactive = m_setup.m_processMode == ProcessMode::Writer + || !m_setup.m_writeData.isEmpty(); + const CommandLine fullCommandLine = m_devicePrivate ->withDockerExecCmd(m_setup.m_commandLine, &m_setup.m_environment, @@ -657,11 +659,7 @@ void DockerDevicePrivate::startContainer() if (!createContainer()) return; - m_shell = std::make_unique(m_settings, - m_container, - FilePath::fromString( - QString("device://%1/") - .arg(this->q->id().toString()))); + m_shell = std::make_unique(m_settings, m_container, q->rootPath()); connect(m_shell.get(), &DeviceShell::done, this, [this](const ProcessResultData &resultData) { if (resultData.m_error != QProcess::UnknownError diff --git a/src/plugins/docker/dockerdevicewidget.cpp b/src/plugins/docker/dockerdevicewidget.cpp index b69e9232836..bc9c76f5b25 100644 --- a/src/plugins/docker/dockerdevicewidget.cpp +++ b/src/plugins/docker/dockerdevicewidget.cpp @@ -182,10 +182,13 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device) logView->clear(); dockerDevice->updateContainerAccess(); - const FilePath clangdPath = dockerDevice->systemEnvironment() - .searchInPath("clangd", {}, [](const FilePath &clangd) { - return Utils::checkClangdVersion(clangd); - }); + const FilePath clangdPath = dockerDevice->filePath("clangd") + .searchInPath({}, + FilePath::AppendToPath, + [](const FilePath &clangd) { + return Utils::checkClangdVersion(clangd); + }); + if (!clangdPath.isEmpty()) m_clangdExecutable->setFilePath(clangdPath); diff --git a/src/plugins/emacskeys/emacskeys.qbs b/src/plugins/emacskeys/emacskeys.qbs index b71caa3e4a5..a97b20b182c 100644 --- a/src/plugins/emacskeys/emacskeys.qbs +++ b/src/plugins/emacskeys/emacskeys.qbs @@ -9,10 +9,11 @@ QtcPlugin { Depends { name: "TextEditor" } files: [ + "emacskeysconstants.h", "emacskeysplugin.cpp", "emacskeysplugin.h", "emacskeysstate.cpp", "emacskeysstate.h", - "emacskeysconstants.h", + "emacskeystr.h", ] } diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp index fbd5e3b4efe..acb2be5b892 100644 --- a/src/plugins/emacskeys/emacskeysplugin.cpp +++ b/src/plugins/emacskeys/emacskeysplugin.cpp @@ -23,8 +23,10 @@ ****************************************************************************/ #include "emacskeysplugin.h" + #include "emacskeysconstants.h" #include "emacskeysstate.h" +#include "emacskeystr.h" #include #include @@ -83,50 +85,50 @@ void EmacsKeysPlugin::initialize() this, &EmacsKeysPlugin::currentEditorChanged); registerAction(Constants::DELETE_CHARACTER, - &EmacsKeysPlugin::deleteCharacter, tr("Delete Character")); + &EmacsKeysPlugin::deleteCharacter, Tr::tr("Delete Character")); registerAction(Constants::KILL_WORD, - &EmacsKeysPlugin::killWord, tr("Kill Word")); + &EmacsKeysPlugin::killWord, Tr::tr("Kill Word")); registerAction(Constants::KILL_LINE, - &EmacsKeysPlugin::killLine, tr("Kill Line")); + &EmacsKeysPlugin::killLine, Tr::tr("Kill Line")); registerAction(Constants::INSERT_LINE_AND_INDENT, - &EmacsKeysPlugin::insertLineAndIndent, tr("Insert New Line and Indent")); + &EmacsKeysPlugin::insertLineAndIndent, Tr::tr("Insert New Line and Indent")); registerAction(Constants::GOTO_FILE_START, - &EmacsKeysPlugin::gotoFileStart, tr("Go to File Start")); + &EmacsKeysPlugin::gotoFileStart, Tr::tr("Go to File Start")); registerAction(Constants::GOTO_FILE_END, - &EmacsKeysPlugin::gotoFileEnd, tr("Go to File End")); + &EmacsKeysPlugin::gotoFileEnd, Tr::tr("Go to File End")); registerAction(Constants::GOTO_LINE_START, - &EmacsKeysPlugin::gotoLineStart, tr("Go to Line Start")); + &EmacsKeysPlugin::gotoLineStart, Tr::tr("Go to Line Start")); registerAction(Constants::GOTO_LINE_END, - &EmacsKeysPlugin::gotoLineEnd, tr("Go to Line End")); + &EmacsKeysPlugin::gotoLineEnd, Tr::tr("Go to Line End")); registerAction(Constants::GOTO_NEXT_LINE, - &EmacsKeysPlugin::gotoNextLine, tr("Go to Next Line")); + &EmacsKeysPlugin::gotoNextLine, Tr::tr("Go to Next Line")); registerAction(Constants::GOTO_PREVIOUS_LINE, - &EmacsKeysPlugin::gotoPreviousLine, tr("Go to Previous Line")); + &EmacsKeysPlugin::gotoPreviousLine, Tr::tr("Go to Previous Line")); registerAction(Constants::GOTO_NEXT_CHARACTER, - &EmacsKeysPlugin::gotoNextCharacter, tr("Go to Next Character")); + &EmacsKeysPlugin::gotoNextCharacter, Tr::tr("Go to Next Character")); registerAction(Constants::GOTO_PREVIOUS_CHARACTER, - &EmacsKeysPlugin::gotoPreviousCharacter, tr("Go to Previous Character")); + &EmacsKeysPlugin::gotoPreviousCharacter, Tr::tr("Go to Previous Character")); registerAction(Constants::GOTO_NEXT_WORD, - &EmacsKeysPlugin::gotoNextWord, tr("Go to Next Word")); + &EmacsKeysPlugin::gotoNextWord, Tr::tr("Go to Next Word")); registerAction(Constants::GOTO_PREVIOUS_WORD, - &EmacsKeysPlugin::gotoPreviousWord, tr("Go to Previous Word")); + &EmacsKeysPlugin::gotoPreviousWord, Tr::tr("Go to Previous Word")); registerAction(Constants::MARK, - &EmacsKeysPlugin::mark, tr("Mark")); + &EmacsKeysPlugin::mark, Tr::tr("Mark")); registerAction(Constants::EXCHANGE_CURSOR_AND_MARK, - &EmacsKeysPlugin::exchangeCursorAndMark, tr("Exchange Cursor and Mark")); + &EmacsKeysPlugin::exchangeCursorAndMark, Tr::tr("Exchange Cursor and Mark")); registerAction(Constants::COPY, - &EmacsKeysPlugin::copy, tr("Copy")); + &EmacsKeysPlugin::copy, Tr::tr("Copy")); registerAction(Constants::CUT, - &EmacsKeysPlugin::cut, tr("Cut")); + &EmacsKeysPlugin::cut, Tr::tr("Cut")); registerAction(Constants::YANK, - &EmacsKeysPlugin::yank, tr("Yank")); + &EmacsKeysPlugin::yank, Tr::tr("Yank")); registerAction(Constants::SCROLL_HALF_DOWN, - &EmacsKeysPlugin::scrollHalfDown, tr("Scroll Half Screen Down")); + &EmacsKeysPlugin::scrollHalfDown, Tr::tr("Scroll Half Screen Down")); registerAction(Constants::SCROLL_HALF_UP, - &EmacsKeysPlugin::scrollHalfUp, tr("Scroll Half Screen Up")); + &EmacsKeysPlugin::scrollHalfUp, Tr::tr("Scroll Half Screen Up")); } void EmacsKeysPlugin::extensionsInitialized() diff --git a/src/plugins/fossil/CMakeLists.txt b/src/plugins/fossil/CMakeLists.txt index f5cb697c57e..22f76911043 100644 --- a/src/plugins/fossil/CMakeLists.txt +++ b/src/plugins/fossil/CMakeLists.txt @@ -6,17 +6,15 @@ add_qtc_plugin(Fossil annotationhighlighter.cpp annotationhighlighter.h branchinfo.h commiteditor.cpp commiteditor.h - configuredialog.cpp configuredialog.h configuredialog.ui + configuredialog.cpp configuredialog.h constants.h fossil.qrc fossilclient.cpp fossilclient.h - fossilcommitpanel.ui fossilcommitwidget.cpp fossilcommitwidget.h fossileditor.cpp fossileditor.h fossilplugin.cpp fossilplugin.h fossilsettings.cpp fossilsettings.h - pullorpushdialog.cpp pullorpushdialog.h pullorpushdialog.ui - revertdialog.ui + pullorpushdialog.cpp pullorpushdialog.h revisioninfo.h wizard/fossiljsextension.cpp wizard/fossiljsextension.h ) diff --git a/src/plugins/fossil/commiteditor.cpp b/src/plugins/fossil/commiteditor.cpp index b73be487aa1..78da152aa83 100644 --- a/src/plugins/fossil/commiteditor.cpp +++ b/src/plugins/fossil/commiteditor.cpp @@ -1,10 +1,12 @@ // Copyright (c) 2018 Artur Shepilko // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "branchinfo.h" #include "commiteditor.h" + +#include "branchinfo.h" #include "constants.h" #include "fossilcommitwidget.h" +#include "fossiltr.h" #include #include @@ -17,7 +19,7 @@ namespace Internal { CommitEditor::CommitEditor() : VcsBase::VcsBaseSubmitEditor(new FossilCommitWidget) { - document()->setPreferredDisplayName(tr("Commit Editor")); + document()->setPreferredDisplayName(Tr::tr("Commit Editor")); } FossilCommitWidget *CommitEditor::commitWidget() diff --git a/src/plugins/fossil/configuredialog.cpp b/src/plugins/fossil/configuredialog.cpp index f71509134b4..69c74ad8c84 100644 --- a/src/plugins/fossil/configuredialog.cpp +++ b/src/plugins/fossil/configuredialog.cpp @@ -2,13 +2,17 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "configuredialog.h" -#include "ui_configuredialog.h" #include "fossilsettings.h" +#include "fossiltr.h" +#include #include +#include +#include #include +#include namespace Fossil { namespace Internal { @@ -17,30 +21,68 @@ class ConfigureDialogPrivate { public: RepositorySettings settings() const { - return {m_ui.userLineEdit->text().trimmed(), - m_ui.sslIdentityFilePathChooser->filePath().toString(), - m_ui.disableAutosyncCheckBox->isChecked() + return {m_userLineEdit->text().trimmed(), + m_sslIdentityFilePathChooser->filePath().toString(), + m_disableAutosyncCheckBox->isChecked() ? RepositorySettings::AutosyncOff : RepositorySettings::AutosyncOn}; } void updateUi() { - m_ui.userLineEdit->setText(m_settings.user.trimmed()); - m_ui.userLineEdit->selectAll(); - m_ui.sslIdentityFilePathChooser->setPath(QDir::toNativeSeparators(m_settings.sslIdentityFile)); - m_ui.disableAutosyncCheckBox->setChecked(m_settings.autosync == RepositorySettings::AutosyncOff); + m_userLineEdit->setText(m_settings.user.trimmed()); + m_userLineEdit->selectAll(); + m_sslIdentityFilePathChooser->setPath(QDir::toNativeSeparators(m_settings.sslIdentityFile)); + m_disableAutosyncCheckBox->setChecked(m_settings.autosync == RepositorySettings::AutosyncOff); } - Ui::ConfigureDialog m_ui; + QLineEdit *m_userLineEdit; + Utils::PathChooser *m_sslIdentityFilePathChooser; + QCheckBox *m_disableAutosyncCheckBox; + RepositorySettings m_settings; }; ConfigureDialog::ConfigureDialog(QWidget *parent) : QDialog(parent), d(new ConfigureDialogPrivate) { - d->m_ui.setupUi(this); - d->m_ui.sslIdentityFilePathChooser->setExpectedKind(Utils::PathChooser::File); - d->m_ui.sslIdentityFilePathChooser->setPromptDialogTitle(tr("SSL/TLS Identity Key")); - setWindowTitle(tr("Configure Repository")); + setWindowTitle(Tr::tr("Configure Repository")); + resize(600, 0); + + d->m_userLineEdit = new QLineEdit; + d->m_userLineEdit->setToolTip( + Tr::tr("Existing user to become an author of changes made to the repository.")); + + d->m_sslIdentityFilePathChooser = new Utils::PathChooser; + d->m_sslIdentityFilePathChooser->setExpectedKind(Utils::PathChooser::File); + d->m_sslIdentityFilePathChooser->setPromptDialogTitle(Tr::tr("SSL/TLS Identity Key")); + d->m_sslIdentityFilePathChooser->setToolTip( + Tr::tr("SSL/TLS client identity key to use if requested by the server.")); + + d->m_disableAutosyncCheckBox = new QCheckBox(Tr::tr("Disable auto-sync")); + d->m_disableAutosyncCheckBox->setToolTip( + Tr::tr("Disable automatic pull prior to commit or update and automatic push " + "after commit or tag or branch creation.")); + + auto buttonBox = new QDialogButtonBox; + buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + + using namespace Utils::Layouting; + Column { + Group { + title(Tr::tr("Repository User")), + Form { Tr::tr("User:"), d->m_userLineEdit, }, + }, + Group { + title(Tr::tr("Repository Settings")), + Form { + Tr::tr("SSL/TLS identity:"), d->m_sslIdentityFilePathChooser, br, + d->m_disableAutosyncCheckBox, + }, + }, + buttonBox, + }.attachTo(this); + d->updateUi(); } @@ -60,17 +102,5 @@ void ConfigureDialog::setSettings(const RepositorySettings &settings) d->updateUi(); } -void ConfigureDialog::changeEvent(QEvent *e) -{ - QDialog::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - d->m_ui.retranslateUi(this); - break; - default: - break; - } -} - } // namespace Internal } // namespace Fossil diff --git a/src/plugins/fossil/configuredialog.h b/src/plugins/fossil/configuredialog.h index 383fe4b970f..9fc0ea652db 100644 --- a/src/plugins/fossil/configuredialog.h +++ b/src/plugins/fossil/configuredialog.h @@ -22,9 +22,6 @@ public: const RepositorySettings settings() const; void setSettings(const RepositorySettings &settings); -protected: - void changeEvent(QEvent *e) final; - private: ConfigureDialogPrivate *d = nullptr; }; diff --git a/src/plugins/fossil/configuredialog.ui b/src/plugins/fossil/configuredialog.ui deleted file mode 100644 index d68ad2f6b5f..00000000000 --- a/src/plugins/fossil/configuredialog.ui +++ /dev/null @@ -1,132 +0,0 @@ - - - Fossil::Internal::ConfigureDialog - - - - 0 - 0 - 385 - 202 - - - - Configure Repository - - - - - - Repository User - - - - - - User: - - - - - - - Existing user to become an author of changes made to the repository. - - - - - - - - - - Repository Settings - - - - - - SSL/TLS identity: - - - - - - - SSL/TLS client identity key to use if requested by the server. - - - - - - - Disable automatic pull prior to commit or update and automatic push after commit or tag or branch creation. - - - Disable auto-sync - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - editingFinished() - browsingFinished() - - - - - - - buttonBox - accepted() - Fossil::Internal::ConfigureDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Fossil::Internal::ConfigureDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/plugins/fossil/constants.h b/src/plugins/fossil/constants.h index f4a0dab0298..acaf3aa4d70 100644 --- a/src/plugins/fossil/constants.h +++ b/src/plugins/fossil/constants.h @@ -31,20 +31,20 @@ const char DIFFFILE_ID_EXACT[] = "[+]{3} (.*)\\s*"; // match and capture //BaseEditorParameters const char FILELOG_ID[] = "Fossil File Log Editor"; -const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Fossil File Log Editor"); +const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil File Log Editor"); const char LOGAPP[] = "text/vnd.qtcreator.fossil.log"; const char ANNOTATELOG_ID[] = "Fossil Annotation Editor"; -const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Fossil Annotation Editor"); +const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil Annotation Editor"); const char ANNOTATEAPP[] = "text/vnd.qtcreator.fossil.annotation"; const char DIFFLOG_ID[] = "Fossil Diff Editor"; -const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Fossil Diff Editor"); +const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil Diff Editor"); const char DIFFAPP[] = "text/x-patch"; //SubmitEditorParameters const char COMMIT_ID[] = "Fossil Commit Log Editor"; -const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Fossil Commit Log Editor"); +const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil Commit Log Editor"); const char COMMITMIMETYPE[] = "text/vnd.qtcreator.fossil.commit"; //menu items diff --git a/src/plugins/fossil/fossil.qbs b/src/plugins/fossil/fossil.qbs index 0bab349e392..e29b89dd34f 100644 --- a/src/plugins/fossil/fossil.qbs +++ b/src/plugins/fossil/fossil.qbs @@ -12,21 +12,20 @@ QtcPlugin { Depends { name: "VcsBase" } files: [ - "constants.h", - "fossilclient.cpp", "fossilclient.h", - "fossilplugin.cpp", "fossilplugin.h", - "fossilsettings.cpp", "fossilsettings.h", + "annotationhighlighter.cpp", "annotationhighlighter.h", + "branchinfo.h", "commiteditor.cpp", "commiteditor.h", + "configuredialog.cpp", "configuredialog.h", + "constants.h", + "fossil.qrc", + "fossilclient.cpp", "fossilclient.h", "fossilcommitwidget.cpp", "fossilcommitwidget.h", "fossileditor.cpp", "fossileditor.h", - "annotationhighlighter.cpp", "annotationhighlighter.h", - "pullorpushdialog.cpp", "pullorpushdialog.h", "pullorpushdialog.ui", - "branchinfo.h", - "configuredialog.cpp", "configuredialog.h", "configuredialog.ui", + "fossilplugin.cpp", "fossilplugin.h", + "fossilsettings.cpp", "fossilsettings.h", + "fossiltr.h", + "pullorpushdialog.cpp", "pullorpushdialog.h", "revisioninfo.h", - "fossil.qrc", - "revertdialog.ui", - "fossilcommitpanel.ui", ] Group { diff --git a/src/plugins/fossil/fossilclient.cpp b/src/plugins/fossil/fossilclient.cpp index 336b543496d..16038150cb9 100644 --- a/src/plugins/fossil/fossilclient.cpp +++ b/src/plugins/fossil/fossilclient.cpp @@ -2,8 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "fossilclient.h" -#include "fossileditor.h" + #include "constants.h" +#include "fossileditor.h" +#include "fossiltr.h" #include #include @@ -52,9 +54,9 @@ public: addReloadButton(); if (features.testFlag(FossilClient::DiffIgnoreWhiteSpaceFeature)) { - mapSetting(addToggleButton("-w", tr("Ignore All Whitespace")), + mapSetting(addToggleButton("-w", Tr::tr("Ignore All Whitespace")), &client->settings().diffIgnoreAllWhiteSpace); - mapSetting(addToggleButton("--strip-trailing-cr", tr("Strip Trailing CR")), + mapSetting(addToggleButton("--strip-trailing-cr", Tr::tr("Strip Trailing CR")), &client->settings().diffStripTrailingCR); } } @@ -75,7 +77,7 @@ public: FossilClient::SupportedFeatures features = client->supportedFeatures(); if (features.testFlag(FossilClient::AnnotateBlameFeature)) { - mapSetting(addToggleButton("|BLAME|", tr("Show Committers")), + mapSetting(addToggleButton("|BLAME|", Tr::tr("Show Committers")), &settings.annotateShowCommitters); } @@ -83,7 +85,7 @@ public: // This way the annotated line number would not get offset by the version list. settings.annotateListVersions.setValue(false); - mapSetting(addToggleButton("--log", tr("List Versions")), + mapSetting(addToggleButton("--log", Tr::tr("List Versions")), &settings.annotateListVersions); } }; @@ -130,11 +132,11 @@ public: // then parse it out in arguments. // All-choice is a blank argument with no additional parameters const QList lineageFilterChoices = { - ChoiceItem(tr("Ancestors"), "ancestors"), - ChoiceItem(tr("Descendants"), "descendants"), - ChoiceItem(tr("Unfiltered"), "") + ChoiceItem(Tr::tr("Ancestors"), "ancestors"), + ChoiceItem(Tr::tr("Descendants"), "descendants"), + ChoiceItem(Tr::tr("Unfiltered"), "") }; - mapSetting(addChoices(tr("Lineage"), QStringList("|LINEAGE|%1|current"), lineageFilterChoices), + mapSetting(addChoices(Tr::tr("Lineage"), QStringList("|LINEAGE|%1|current"), lineageFilterChoices), &settings.timelineLineageFilter); } @@ -143,8 +145,8 @@ public: FossilSettings &settings = m_client->settings(); // show files - mapSetting(addToggleButton("-showfiles", tr("Verbose"), - tr("Show files changed in each revision")), + mapSetting(addToggleButton("-showfiles", Tr::tr("Verbose"), + Tr::tr("Show files changed in each revision")), &settings.timelineVerbose); } @@ -154,19 +156,19 @@ public: // option: -t const QList itemTypeChoices = { - ChoiceItem(tr("All Items"), "all"), - ChoiceItem(tr("File Commits"), "ci"), - ChoiceItem(tr("Technical Notes"), "e"), - ChoiceItem(tr("Tags"), "g"), - ChoiceItem(tr("Tickets"), "t"), - ChoiceItem(tr("Wiki Commits"), "w") + ChoiceItem(Tr::tr("All Items"), "all"), + ChoiceItem(Tr::tr("File Commits"), "ci"), + ChoiceItem(Tr::tr("Technical Notes"), "e"), + ChoiceItem(Tr::tr("Tags"), "g"), + ChoiceItem(Tr::tr("Tickets"), "t"), + ChoiceItem(Tr::tr("Wiki Commits"), "w") }; // here we setup the ComboBox to map to the "-t ", which will produce // the enquoted option-values (e.g "-t all"). // Fossil expects separate arguments for option and value ( i.e. "-t" "all") // so we need to handle the splitting explicitly in arguments(). - mapSetting(addChoices(tr("Item Types"), QStringList("-t %1"), itemTypeChoices), + mapSetting(addChoices(Tr::tr("Item Types"), QStringList("-t %1"), itemTypeChoices), &settings.timelineItemType); } @@ -619,7 +621,8 @@ bool FossilClient::synchronousCreateRepository(const FilePath &workingDirectory, outputWindow->append(sanitizeFossilOutput(result.cleanedStdOut())); // check out the created repository file into the working directory - result = vcsSynchronousExec(workingDirectory, {"open", repoFilePath.toUserOutput()}); + // --force as it may be not empty e.g. when creating a project from wizard + result = vcsSynchronousExec(workingDirectory, {"open", "--force", repoFilePath.toUserOutput()}); if (result.result() != ProcessResult::FinishedWithSuccess) return false; outputWindow->append(sanitizeFossilOutput(result.cleanedStdOut())); diff --git a/src/plugins/fossil/fossilcommitpanel.ui b/src/plugins/fossil/fossilcommitpanel.ui deleted file mode 100644 index b08e7883a5f..00000000000 --- a/src/plugins/fossil/fossilcommitpanel.ui +++ /dev/null @@ -1,177 +0,0 @@ - - - Fossil::Internal::FossilCommitPanel - - - - 0 - 0 - 374 - 270 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Current Information - - - - QFormLayout::ExpandingFieldsGrow - - - - - Local root: - - - - - - - Qt::NoFocus - - - true - - - - - - - Branch: - - - - - - - Qt::NoFocus - - - true - - - - - - - Tags: - - - - - - - Qt::NoFocus - - - true - - - - - - - - - - Commit Information - - - - - - New branch: - - - - - - - - - - - 50 - 20 - - - - - - - :/projectexplorer/images/compile_error.png - - - - - - - Create a private check-in that is never synced. -Children of private check-ins are automatically private. -Private check-ins are not pushed to the remote repository by default. - - - Private - - - - - - - Tags: - - - - - - - Tag names to apply; comma-separated. - - - - - - - Author: - - - - - - - - - - Qt::Horizontal - - - - 160 - 20 - - - - - - - - - - - - diff --git a/src/plugins/fossil/fossilcommitwidget.cpp b/src/plugins/fossil/fossilcommitwidget.cpp index f48f9850363..5658ed9f760 100644 --- a/src/plugins/fossil/fossilcommitwidget.cpp +++ b/src/plugins/fossil/fossilcommitwidget.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "fossilcommitwidget.h" + #include "branchinfo.h" +#include "fossiltr.h" #include #include @@ -10,12 +12,18 @@ #include #include +#include +#include #include +#include #include +#include #include #include +using namespace Utils; + namespace Fossil { namespace Internal { @@ -31,7 +39,7 @@ static QTextCharFormat commentFormat() class FossilSubmitHighlighter : QSyntaxHighlighter { public: - explicit FossilSubmitHighlighter(Utils::CompletingTextEdit *parent); + explicit FossilSubmitHighlighter(CompletingTextEdit *parent); void highlightBlock(const QString &text) final; private: @@ -39,7 +47,7 @@ private: const QRegularExpression m_keywordPattern; }; -FossilSubmitHighlighter::FossilSubmitHighlighter(Utils::CompletingTextEdit *parent) : QSyntaxHighlighter(parent), +FossilSubmitHighlighter::FossilSubmitHighlighter(CompletingTextEdit *parent) : QSyntaxHighlighter(parent), m_commentFormat(commentFormat()), m_keywordPattern("\\[([0-9a-f]{5,40})\\]") { @@ -65,35 +73,83 @@ void FossilSubmitHighlighter::highlightBlock(const QString &text) FossilCommitWidget::FossilCommitWidget() : m_commitPanel(new QWidget) { - m_commitPanelUi.setupUi(m_commitPanel); + m_localRootLineEdit = new QLineEdit; + m_localRootLineEdit->setFocusPolicy(Qt::NoFocus); + m_localRootLineEdit->setReadOnly(true); + + m_currentBranchLineEdit = new QLineEdit; + m_currentBranchLineEdit->setFocusPolicy(Qt::NoFocus); + m_currentBranchLineEdit->setReadOnly(true); + + m_currentTagsLineEdit = new QLineEdit; + m_currentTagsLineEdit->setFocusPolicy(Qt::NoFocus); + m_currentTagsLineEdit->setReadOnly(true); + + m_branchLineEdit = new QLineEdit; + + m_invalidBranchLabel = new InfoLabel; + m_invalidBranchLabel->setMinimumSize(QSize(50, 20)); + m_invalidBranchLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); + m_invalidBranchLabel->setType(InfoLabel::Error); + + m_isPrivateCheckBox = new QCheckBox(Tr::tr("Private")); + m_isPrivateCheckBox->setToolTip(Tr::tr("Create a private check-in that is never synced.\n" + "Children of private check-ins are automatically private.\n" + "Private check-ins are not pushed to the remote repository by default.")); + + m_tagsLineEdit = new QLineEdit; + m_tagsLineEdit->setToolTip(Tr::tr("Tag names to apply; comma-separated.")); + + m_authorLineEdit = new QLineEdit; + + using namespace Layouting; + + Column { + Group { + title(Tr::tr("Current Information")), + Form { + Tr::tr("Local root:"), m_localRootLineEdit, + Tr::tr("Branch:"), m_currentBranchLineEdit, + Tr::tr("Tags:"), m_currentTagsLineEdit + } + }, + Group { + title(Tr::tr("Commit Information")), + Grid { + Tr::tr("New branch:"), m_branchLineEdit, m_invalidBranchLabel, m_isPrivateCheckBox, br, + Tr::tr("Tags:"), m_tagsLineEdit, br, + Tr::tr("Author:"), m_authorLineEdit, st, + } + } + }.attachTo(m_commitPanel, WithoutMargins); + insertTopWidget(m_commitPanel); new FossilSubmitHighlighter(descriptionEdit()); m_branchValidator = new QRegularExpressionValidator(QRegularExpression("[^\\n]*"), this); - connect(m_commitPanelUi.branchLineEdit, &QLineEdit::textChanged, + connect(m_branchLineEdit, &QLineEdit::textChanged, this, &FossilCommitWidget::branchChanged); } -void FossilCommitWidget::setFields(const Utils::FilePath &repoPath, const BranchInfo &branch, +void FossilCommitWidget::setFields(const FilePath &repoPath, const BranchInfo &branch, const QStringList &tags, const QString &userName) { - m_commitPanelUi.localRootLineEdit->setText(repoPath.toUserOutput()); - m_commitPanelUi.currentBranchLineEdit->setText(branch.name); - const QString tagsText = tags.join(", "); - m_commitPanelUi.currentTagsLineEdit->setText(tagsText); - m_commitPanelUi.authorLineEdit->setText(userName); + m_localRootLineEdit->setText(repoPath.toUserOutput()); + m_currentBranchLineEdit->setText(branch.name); + m_currentTagsLineEdit->setText(tags.join(", ")); + m_authorLineEdit->setText(userName); branchChanged(); } QString FossilCommitWidget::newBranch() const { - return m_commitPanelUi.branchLineEdit->text().trimmed(); + return m_branchLineEdit->text().trimmed(); } QStringList FossilCommitWidget::tags() const { - QString tagsText = m_commitPanelUi.tagsLineEdit->text().trimmed(); + QString tagsText = m_tagsLineEdit->text().trimmed(); if (tagsText.isEmpty()) return {}; @@ -102,21 +158,21 @@ QStringList FossilCommitWidget::tags() const QString FossilCommitWidget::committer() const { - return m_commitPanelUi.authorLineEdit->text(); + return m_authorLineEdit->text(); } bool FossilCommitWidget::isPrivateOptionEnabled() const { - return m_commitPanelUi.isPrivateCheckBox->isChecked(); + return m_isPrivateCheckBox->isChecked(); } bool FossilCommitWidget::canSubmit(QString *whyNot) const { QString message = cleanupDescription(descriptionText()).trimmed(); - if (m_commitPanelUi.invalidBranchLabel->isVisible() || message.isEmpty()) { + if (m_invalidBranchLabel->isVisible() || message.isEmpty()) { if (whyNot) - *whyNot = tr("Message check failed."); + *whyNot = Tr::tr("Message check failed."); return false; } @@ -125,15 +181,15 @@ bool FossilCommitWidget::canSubmit(QString *whyNot) const void FossilCommitWidget::branchChanged() { - m_commitPanelUi.invalidBranchLabel->setVisible(!isValidBranch()); + m_invalidBranchLabel->setVisible(!isValidBranch()); updateSubmitAction(); } bool FossilCommitWidget::isValidBranch() const { - int pos = m_commitPanelUi.branchLineEdit->cursorPosition(); - QString text = m_commitPanelUi.branchLineEdit->text(); + int pos = m_branchLineEdit->cursorPosition(); + QString text = m_branchLineEdit->text(); return m_branchValidator->validate(text, pos) == QValidator::Acceptable; } diff --git a/src/plugins/fossil/fossilcommitwidget.h b/src/plugins/fossil/fossilcommitwidget.h index fd419f0dd8a..1d3bc1d4e0f 100644 --- a/src/plugins/fossil/fossilcommitwidget.h +++ b/src/plugins/fossil/fossilcommitwidget.h @@ -3,15 +3,19 @@ #pragma once -#include "ui_fossilcommitpanel.h" - #include QT_BEGIN_NAMESPACE +class QCheckBox; +class QLabel; +class QLineEdit; class QValidator; QT_END_NAMESPACE -namespace Utils { class FilePath; } +namespace Utils { +class FilePath; +class InfoLabel; +} namespace Fossil { namespace Internal { @@ -22,7 +26,7 @@ class BranchInfo; Some extra fields have been added to the standard SubmitEditorWidget, to help to conform to the commit style that is used by both git and Fossil*/ -class FossilCommitWidget : public VcsBase::SubmitEditorWidget +class FossilCommitWidget final : public VcsBase::SubmitEditorWidget { Q_OBJECT @@ -37,18 +41,23 @@ public: QString committer() const; bool isPrivateOptionEnabled() const; -protected: - bool canSubmit(QString *whyNot = nullptr) const; - -private slots: - void branchChanged(); - private: + bool canSubmit(QString *whyNot = nullptr) const final; + + void branchChanged(); bool isValidBranch() const; QWidget *m_commitPanel; - Ui::FossilCommitPanel m_commitPanelUi; QValidator *m_branchValidator; + + QLineEdit *m_localRootLineEdit; + QLineEdit *m_currentBranchLineEdit; + QLineEdit *m_currentTagsLineEdit; + QLineEdit *m_branchLineEdit; + Utils::InfoLabel *m_invalidBranchLabel; + QCheckBox *m_isPrivateCheckBox; + QLineEdit *m_tagsLineEdit; + QLineEdit *m_authorLineEdit; }; } // namespace Internal diff --git a/src/plugins/fossil/fossileditor.cpp b/src/plugins/fossil/fossileditor.cpp index 12faab7d054..48268754089 100644 --- a/src/plugins/fossil/fossileditor.cpp +++ b/src/plugins/fossil/fossileditor.cpp @@ -2,10 +2,12 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "fossileditor.h" + #include "annotationhighlighter.h" #include "constants.h" -#include "fossilplugin.h" #include "fossilclient.h" +#include "fossilplugin.h" +#include "fossiltr.h" #include @@ -31,8 +33,8 @@ public: FossilEditorWidget::FossilEditorWidget() : d(new FossilEditorWidgetPrivate) { - setAnnotateRevisionTextFormat(tr("&Annotate %1")); - setAnnotatePreviousRevisionTextFormat(tr("Annotate &Parent Revision %1")); + setAnnotateRevisionTextFormat(Tr::tr("&Annotate %1")); + setAnnotatePreviousRevisionTextFormat(Tr::tr("Annotate &Parent Revision %1")); setDiffFilePattern(Constants::DIFFFILE_ID_EXACT); setLogEntryPattern("^.*\\[([0-9a-f]{5,40})\\]"); setAnnotationEntryPattern(QString("^") + Constants::CHANGESET_ID + " "); diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp index 4ad865d78cd..94f800e1ea6 100644 --- a/src/plugins/fossil/fossilplugin.cpp +++ b/src/plugins/fossil/fossilplugin.cpp @@ -2,17 +2,17 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "fossilplugin.h" + +#include "commiteditor.h" +#include "configuredialog.h" #include "constants.h" #include "fossilclient.h" #include "fossilcommitwidget.h" #include "fossileditor.h" +#include "fossiltr.h" #include "pullorpushdialog.h" -#include "configuredialog.h" -#include "commiteditor.h" #include "wizard/fossiljsextension.h" -#include "ui_revertdialog.h" - #include #include #include @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -44,14 +45,16 @@ #include #include -#include #include -#include -#include #include -#include +#include +#include #include +#include +#include +#include #include +#include using namespace Core; using namespace Utils; @@ -114,8 +117,6 @@ const VcsBaseSubmitEditorParameters submitEditorParameters { class FossilPluginPrivate final : public VcsBase::VcsBasePluginPrivate { - Q_DECLARE_TR_FUNCTIONS(Fossil::Internal::FossilPlugin) - public: enum SyncMode { SyncPull, @@ -244,6 +245,14 @@ public: static FossilPluginPrivate *dd = nullptr; +class RevertDialog : public QDialog +{ +public: + RevertDialog(const QString &title, QWidget *parent = nullptr); + + QLineEdit *m_revisionLineEdit; +}; + FossilPlugin::~FossilPlugin() { delete dd; @@ -257,8 +266,6 @@ bool FossilPlugin::initialize(const QStringList &arguments, QString *errorMessag dd = new FossilPluginPrivate; - ProjectExplorer::JsonWizardFactory::addWizardPath(":/fossil/wizard/"); - return true; } @@ -300,7 +307,7 @@ void FossilPluginPrivate::createMenu(const Core::Context &context) // Create menu item for Fossil m_fossilContainer = Core::ActionManager::createMenu("Fossil.FossilMenu"); QMenu *menu = m_fossilContainer->menu(); - menu->setTitle(tr("&Fossil")); + menu->setTitle(Tr::tr("&Fossil")); createFileActions(context); m_fossilContainer->addSeparator(context); @@ -319,54 +326,57 @@ void FossilPluginPrivate::createFileActions(const Core::Context &context) { Core::Command *command; - m_annotateFile = new Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_annotateFile = new Utils::ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_annotateFile, Constants::ANNOTATE, context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_annotateFile, &QAction::triggered, this, &FossilPluginPrivate::annotateCurrentFile); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - m_diffFile = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_diffFile = new Utils::ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_diffFile, Constants::DIFF, context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I,Meta+D") : tr("ALT+I,Alt+D"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+D") + : Tr::tr("ALT+I,Alt+D"))); connect(m_diffFile, &QAction::triggered, this, &FossilPluginPrivate::diffCurrentFile); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - m_logFile = new Utils::ParameterAction(tr("Timeline Current File"), tr("Timeline \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_logFile = new Utils::ParameterAction(Tr::tr("Timeline Current File"), Tr::tr("Timeline \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_logFile, Constants::LOG, context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I,Meta+L") : tr("ALT+I,Alt+L"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+L") + : Tr::tr("ALT+I,Alt+L"))); connect(m_logFile, &QAction::triggered, this, &FossilPluginPrivate::logCurrentFile); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - m_statusFile = new Utils::ParameterAction(tr("Status Current File"), tr("Status \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_statusFile = new Utils::ParameterAction(Tr::tr("Status Current File"), Tr::tr("Status \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_statusFile, Constants::STATUS, context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I,Meta+S") : tr("ALT+I,Alt+S"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+S") + : Tr::tr("ALT+I,Alt+S"))); connect(m_statusFile, &QAction::triggered, this, &FossilPluginPrivate::statusCurrentFile); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); m_fossilContainer->addSeparator(context); - m_addAction = new Utils::ParameterAction(tr("Add Current File"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); + m_addAction = new Utils::ParameterAction(Tr::tr("Add Current File"), Tr::tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_addAction, Constants::ADD, context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_addAction, &QAction::triggered, this, &FossilPluginPrivate::addCurrentFile); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - m_deleteAction = new Utils::ParameterAction(tr("Delete Current File..."), tr("Delete \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this); + m_deleteAction = new Utils::ParameterAction(Tr::tr("Delete Current File..."), Tr::tr("Delete \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_deleteAction, Constants::DELETE, context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_deleteAction, &QAction::triggered, this, &FossilPluginPrivate::deleteCurrentFile); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - m_revertFile = new Utils::ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this); + m_revertFile = new Utils::ParameterAction(Tr::tr("Revert Current File..."), Tr::tr("Revert \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_revertFile, Constants::REVERT, context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_revertFile, &QAction::triggered, this, &FossilPluginPrivate::revertCurrentFile); @@ -425,13 +435,14 @@ void FossilPluginPrivate::revertCurrentFile() QTC_ASSERT(state.hasFile(), return); QDialog dialog(Core::ICore::dialogParent()); - Ui::RevertDialog revertUi; - revertUi.setupUi(&dialog); + + auto revisionLineEdit = new QLineEdit; + if (dialog.exec() != QDialog::Accepted) return; m_client.revertFile(state.currentFileTopLevel(), - state.relativeCurrentFile(), - revertUi.revisionLineEdit->text()); + state.relativeCurrentFile(), + revisionLineEdit->text()); } void FossilPluginPrivate::statusCurrentFile() @@ -446,29 +457,30 @@ void FossilPluginPrivate::createDirectoryActions(const Core::Context &context) QAction *action; Core::Command *command; - action = new QAction(tr("Diff"), this); + action = new QAction(Tr::tr("Diff"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::DIFFMULTI, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::diffRepository); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Timeline"), this); + action = new QAction(Tr::tr("Timeline"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::LOGMULTI, context); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I,Meta+T") : tr("ALT+I,Alt+T"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+T") + : Tr::tr("ALT+I,Alt+T"))); connect(action, &QAction::triggered, this, &FossilPluginPrivate::logRepository); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Revert..."), this); + action = new QAction(Tr::tr("Revert..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::REVERTMULTI, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::revertAll); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Status"), this); + action = new QAction(Tr::tr("Status"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::STATUSMULTI, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::statusMulti); @@ -503,12 +515,9 @@ void FossilPluginPrivate::revertAll() const VcsBase::VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); - QDialog dialog(Core::ICore::dialogParent()); - Ui::RevertDialog revertUi; - revertUi.setupUi(&dialog); - if (dialog.exec() != QDialog::Accepted) - return; - m_client.revertAll(state.topLevel(), revertUi.revisionLineEdit->text()); + RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent()); + if (dialog.exec() == QDialog::Accepted) + m_client.revertAll(state.topLevel(), dialog.m_revisionLineEdit->text()); } void FossilPluginPrivate::statusMulti() @@ -523,37 +532,39 @@ void FossilPluginPrivate::createRepositoryActions(const Core::Context &context) QAction *action = 0; Core::Command *command = 0; - action = new QAction(tr("Pull..."), this); + action = new QAction(Tr::tr("Pull..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::PULL, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::pull); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Push..."), this); + action = new QAction(Tr::tr("Push..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::PUSH, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::push); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Update..."), this); + action = new QAction(Tr::tr("Update..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::UPDATE, context); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I,Meta+U") : tr("ALT+I,Alt+U"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+U") + : Tr::tr("ALT+I,Alt+U"))); connect(action, &QAction::triggered, this, &FossilPluginPrivate::update); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Commit..."), this); + action = new QAction(Tr::tr("Commit..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::COMMIT, context); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I,Meta+C") : tr("ALT+I,Alt+C"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+C") + : Tr::tr("ALT+I,Alt+C"))); connect(action, &QAction::triggered, this, &FossilPluginPrivate::commit); m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Settings ..."), this); + action = new QAction(Tr::tr("Settings ..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::CONFIGURE_REPOSITORY, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::configureRepository); @@ -562,7 +573,7 @@ void FossilPluginPrivate::createRepositoryActions(const Core::Context &context) // Register "Create Repository..." action in global context, so that it's visible // without active repository to allow creating a new one. - m_createRepositoryAction = new QAction(tr("Create Repository..."), this); + m_createRepositoryAction = new QAction(Tr::tr("Create Repository..."), this); command = Core::ActionManager::registerAction(m_createRepositoryAction, Constants::CREATE_REPOSITORY); connect(m_createRepositoryAction, &QAction::triggered, this, &FossilPluginPrivate::createRepository); m_fossilContainer->addAction(command); @@ -594,7 +605,7 @@ bool FossilPluginPrivate::pullOrPush(FossilPluginPrivate::SyncMode mode) QString remoteLocation(dialog.remoteLocation()); if (remoteLocation.isEmpty() && defaultURL.isEmpty()) { - VcsBase::VcsOutputWindow::appendError(tr("Remote repository is not defined.")); + VcsBase::VcsOutputWindow::appendError(Tr::tr("Remote repository is not defined.")); return false; } else if (remoteLocation == defaultURL) { remoteLocation.clear(); @@ -620,13 +631,9 @@ void FossilPluginPrivate::update() const VcsBase::VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); - QDialog dialog(Core::ICore::dialogParent()); - Ui::RevertDialog revertUi; - revertUi.setupUi(&dialog); - dialog.setWindowTitle(tr("Update")); - if (dialog.exec() != QDialog::Accepted) - return; - m_client.update(state.topLevel(), revertUi.revisionLineEdit->text()); + RevertDialog dialog(Tr::tr("Update"), Core::ICore::dialogParent()); + if (dialog.exec() == QDialog::Accepted) + m_client.update(state.topLevel(), dialog.m_revisionLineEdit->text()); } void FossilPluginPrivate::configureRepository() @@ -670,7 +677,7 @@ void FossilPluginPrivate::showCommitWidget(const QList(editor); if (!commitEditor) { - VcsBase::VcsOutputWindow::appendError(tr("Unable to create a commit editor.")); + VcsBase::VcsOutputWindow::appendError(Tr::tr("Unable to create a commit editor.")); return; } setSubmitEditor(commitEditor); - const QString msg = tr("Commit changes for \"%1\".").arg(m_submitRepository.toUserOutput()); + const QString msg = Tr::tr("Commit changes for \"%1\".").arg(m_submitRepository.toUserOutput()); commitEditor->document()->setPreferredDisplayName(msg); const RevisionInfo currentRevision = m_client.synchronousRevisionQuery(m_submitRepository); @@ -736,28 +743,28 @@ void FossilPluginPrivate::createRepository() // Prompt for a directory that is not under version control yet QWidget *mw = Core::ICore::dialogParent(); do { - directory = FileUtils::getExistingDirectory(nullptr, tr("Choose Checkout Directory"), directory); + directory = FileUtils::getExistingDirectory(nullptr, Tr::tr("Choose Checkout Directory"), directory); if (directory.isEmpty()) return; const Core::IVersionControl *managingControl = Core::VcsManager::findVersionControlForDirectory(directory); if (managingControl == 0) break; - const QString question = tr("The directory \"%1\" is already managed by a version control system (%2)." + const QString question = Tr::tr("The directory \"%1\" is already managed by a version control system (%2)." " Would you like to specify another directory?").arg(directory.toUserOutput(), managingControl->displayName()); - if (!ask(mw, tr("Repository already under version control"), question)) + if (!ask(mw, Tr::tr("Repository already under version control"), question)) return; } while (true); // Create const bool rc = vcsCreateRepository(directory); const QString nativeDir = directory.toUserOutput(); if (rc) { - QMessageBox::information(mw, tr("Repository Created"), - tr("A version control repository has been created in %1."). + QMessageBox::information(mw, Tr::tr("Repository Created"), + Tr::tr("A version control repository has been created in %1."). arg(nativeDir)); } else { - QMessageBox::warning(mw, tr("Repository Creation Failed"), - tr("A version control repository could not be created in %1."). + QMessageBox::warning(mw, Tr::tr("Repository Creation Failed"), + Tr::tr("A version control repository could not be created in %1."). arg(nativeDir)); } } @@ -838,7 +845,7 @@ void FossilPluginPrivate::updateActions(VcsBase::VcsBasePluginPrivate::ActionSta QString FossilPluginPrivate::displayName() const { - return tr("Fossil"); + return Tr::tr("Fossil"); } Id FossilPluginPrivate::id() const @@ -1068,6 +1075,35 @@ void FossilPluginPrivate::changed(const QVariant &v) } } +RevertDialog::RevertDialog(const QString &title, QWidget *parent) + : QDialog(parent) +{ + resize(600, 0); + setWindowTitle(title); + + auto *groupBox = new QGroupBox(Tr::tr("Specify a revision other than the default?")); + groupBox->setCheckable(true); + groupBox->setChecked(false); + groupBox->setToolTip(Tr::tr("Checkout revision, can also be a branch or a tag name.")); + + m_revisionLineEdit = new QLineEdit; + + auto buttonBox = new QDialogButtonBox; + buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + + using namespace Utils::Layouting; + Form { + Tr::tr("Revision"), m_revisionLineEdit, br, + }.attachTo(groupBox); + + Column { + groupBox, + buttonBox, + }.attachTo(this); +} + } // namespace Internal } // namespace Fossil diff --git a/src/plugins/fossil/fossilsettings.cpp b/src/plugins/fossil/fossilsettings.cpp index b522168cdf4..130ff5c2c56 100644 --- a/src/plugins/fossil/fossilsettings.cpp +++ b/src/plugins/fossil/fossilsettings.cpp @@ -4,6 +4,7 @@ #include "fossilsettings.h" #include "constants.h" +#include "fossiltr.h" #include @@ -26,30 +27,30 @@ FossilSettings::FossilSettings() binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay); binaryPath.setExpectedKind(PathChooser::ExistingCommand); binaryPath.setDefaultValue(Constants::FOSSILDEFAULT); - binaryPath.setDisplayName(tr("Fossil Command")); + binaryPath.setDisplayName(Tr::tr("Fossil Command")); binaryPath.setHistoryCompleter("Fossil.Command.History"); - binaryPath.setLabelText(tr("Command:")); + binaryPath.setLabelText(Tr::tr("Command:")); registerAspect(&defaultRepoPath); defaultRepoPath.setSettingsKey("defaultRepoPath"); defaultRepoPath.setDisplayStyle(StringAspect::PathChooserDisplay); defaultRepoPath.setExpectedKind(PathChooser::Directory); - defaultRepoPath.setDisplayName(tr("Fossil Repositories")); - defaultRepoPath.setLabelText(tr("Default path:")); - defaultRepoPath.setToolTip(tr("Directory to store local repositories by default.")); + defaultRepoPath.setDisplayName(Tr::tr("Fossil Repositories")); + defaultRepoPath.setLabelText(Tr::tr("Default path:")); + defaultRepoPath.setToolTip(Tr::tr("Directory to store local repositories by default.")); registerAspect(&userName); userName.setDisplayStyle(StringAspect::LineEditDisplay); - userName.setLabelText(tr("Default user:")); - userName.setToolTip(tr("Existing user to become an author of changes made to the repository.")); + userName.setLabelText(Tr::tr("Default user:")); + userName.setToolTip(Tr::tr("Existing user to become an author of changes made to the repository.")); registerAspect(&sslIdentityFile); sslIdentityFile.setSettingsKey("sslIdentityFile"); sslIdentityFile.setDisplayStyle(StringAspect::PathChooserDisplay); sslIdentityFile.setExpectedKind(PathChooser::File); - sslIdentityFile.setDisplayName(tr("SSL/TLS Identity Key")); - sslIdentityFile.setLabelText(tr("SSL/TLS identity:")); - sslIdentityFile.setToolTip(tr("SSL/TLS client identity key to use if requested by the server.")); + sslIdentityFile.setDisplayName(Tr::tr("SSL/TLS Identity Key")); + sslIdentityFile.setLabelText(Tr::tr("SSL/TLS identity:")); + sslIdentityFile.setToolTip(Tr::tr("SSL/TLS client identity key to use if requested by the server.")); registerAspect(&diffIgnoreAllWhiteSpace); diffIgnoreAllWhiteSpace.setSettingsKey("diffIgnoreAllWhiteSpace"); @@ -65,8 +66,8 @@ FossilSettings::FossilSettings() registerAspect(&timelineWidth); timelineWidth.setSettingsKey("timelineWidth"); - timelineWidth.setLabelText(tr("Log width:")); - timelineWidth.setToolTip(tr("The width of log entry line (>20). " + timelineWidth.setLabelText(Tr::tr("Log width:")); + timelineWidth.setToolTip(Tr::tr("The width of log entry line (>20). " "Choose 0 to see a single line per entry.")); registerAspect(&timelineLineageFilter); @@ -82,17 +83,17 @@ FossilSettings::FossilSettings() registerAspect(&disableAutosync); disableAutosync.setSettingsKey("disableAutosync"); disableAutosync.setDefaultValue(true); - disableAutosync.setLabelText(tr("Disable auto-sync")); - disableAutosync.setToolTip(tr("Disable automatic pull prior to commit or update and " + disableAutosync.setLabelText(Tr::tr("Disable auto-sync")); + disableAutosync.setToolTip(Tr::tr("Disable automatic pull prior to commit or update and " "automatic push after commit or tag or branch creation.")); registerAspect(&timeout); - timeout.setLabelText(tr("Timeout:")); - timeout.setSuffix(tr("s")); + timeout.setLabelText(Tr::tr("Timeout:")); + timeout.setSuffix(Tr::tr("s")); registerAspect(&logCount); - logCount.setLabelText(tr("Log count:")); - logCount.setToolTip(tr("The number of recent commit log entries to show. " + logCount.setLabelText(Tr::tr("Log count:")); + logCount.setToolTip(Tr::tr("The number of recent commit log entries to show. " "Choose 0 to see all entries.")); }; @@ -100,8 +101,6 @@ FossilSettings::FossilSettings() class OptionsPageWidget final : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(Fossil::Internal::OptionsPageWidget) - public: OptionsPageWidget(const std::function &onApply, FossilSettings *settings); void apply() final; @@ -130,16 +129,16 @@ OptionsPageWidget::OptionsPageWidget(const std::function &onApply, Fossi Column { Group { - title(tr("Configuration")), + title(Tr::tr("Configuration")), Row { s.binaryPath } }, Group { - title(tr("Local Repositories")), + title(Tr::tr("Local Repositories")), Row { s.defaultRepoPath } }, Group { - title(tr("User")), + title(Tr::tr("User")), Form { s.userName, br, s.sslIdentityFile @@ -147,7 +146,7 @@ OptionsPageWidget::OptionsPageWidget(const std::function &onApply, Fossi }, Group { - title(tr("Miscellaneous")), + title(Tr::tr("Miscellaneous")), Column { Row { s.logCount, @@ -166,7 +165,7 @@ OptionsPageWidget::OptionsPageWidget(const std::function &onApply, Fossi OptionsPage::OptionsPage(const std::function &onApply, FossilSettings *settings) { setId(Constants::VCS_ID_FOSSIL); - setDisplayName(OptionsPageWidget::tr("Fossil")); + setDisplayName(Tr::tr("Fossil")); setWidgetCreator([onApply, settings]() { return new OptionsPageWidget(onApply, settings); }); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); } diff --git a/src/plugins/fossil/fossiltr.h b/src/plugins/fossil/fossiltr.h new file mode 100644 index 00000000000..657db81f859 --- /dev/null +++ b/src/plugins/fossil/fossiltr.h @@ -0,0 +1,15 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +#pragma once + +#include + +namespace Fossil { + +struct Tr +{ + Q_DECLARE_TR_FUNCTIONS(::Fossil) +}; + +} // namespace Fossil diff --git a/src/plugins/fossil/pullorpushdialog.cpp b/src/plugins/fossil/pullorpushdialog.cpp index 7a93f411a56..05bdf136f18 100644 --- a/src/plugins/fossil/pullorpushdialog.cpp +++ b/src/plugins/fossil/pullorpushdialog.cpp @@ -2,86 +2,113 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "pullorpushdialog.h" -#include "ui_pullorpushdialog.h" #include "constants.h" +#include "fossiltr.h" +#include +#include #include +#include +#include +#include +#include + namespace Fossil { namespace Internal { -PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) : QDialog(parent), - m_mode(mode), - m_ui(new Ui::PullOrPushDialog) +PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) + : QDialog(parent) { - m_ui->setupUi(this); - m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::File); - m_ui->localPathChooser->setPromptDialogFilter(tr(Constants::FOSSIL_FILE_FILTER)); + setWindowTitle(mode == PullMode ? Tr::tr("Pull Source") : Tr::tr("Push Destination")); + resize(600, 0); - switch (m_mode) { - case PullMode: - this->setWindowTitle(tr("Pull Source")); - break; - case PushMode: - this->setWindowTitle(tr("Push Destination")); - break; - } + m_defaultButton = new QRadioButton(Tr::tr("Default location")); + m_defaultButton->setChecked(true); + + m_localButton = new QRadioButton(Tr::tr("Local filesystem:")); + + m_localPathChooser = new Utils::PathChooser; + m_localPathChooser->setEnabled(false); + m_localPathChooser->setExpectedKind(Utils::PathChooser::File); + m_localPathChooser->setPromptDialogFilter(Tr::tr(Constants::FOSSIL_FILE_FILTER)); + + m_urlButton = new QRadioButton(Tr::tr("Specify URL:")); + m_urlButton->setToolTip(Tr::tr("For example: https://[user[:pass]@]host[:port]/[path]")); + + m_urlLineEdit = new QLineEdit; + m_urlLineEdit->setEnabled(false); + m_urlLineEdit->setToolTip(m_urlButton->toolTip()); + + m_rememberCheckBox = new QCheckBox(Tr::tr("Remember specified location as default")); + m_rememberCheckBox->setEnabled(false); + + m_privateCheckBox = new QCheckBox(Tr::tr("Include private branches")); + m_privateCheckBox->setToolTip(Tr::tr("Allow transfer of private branches.")); + + auto buttonBox = new QDialogButtonBox; + buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + + using namespace Utils::Layouting; + Column { + Group { + title(Tr::tr("Remote Location")), + Form { + m_defaultButton, br, + m_localButton, m_localPathChooser, br, + m_urlButton, m_urlLineEdit, br, + }, + }, + Group { + title(Tr::tr("Options")), + Column { m_rememberCheckBox, m_privateCheckBox, }, + }, + buttonBox, + }.attachTo(this); // select URL text in line edit when clicking the radio button - m_ui->localButton->setFocusProxy(m_ui->localPathChooser); - m_ui->urlButton->setFocusProxy(m_ui->urlLineEdit); - connect(m_ui->urlButton, &QRadioButton::clicked, m_ui->urlLineEdit, &QLineEdit::selectAll); - - this->adjustSize(); -} - -PullOrPushDialog::~PullOrPushDialog() -{ - delete m_ui; + m_localButton->setFocusProxy(m_localPathChooser); + m_urlButton->setFocusProxy(m_urlLineEdit); + connect(m_urlButton, &QRadioButton::clicked, m_urlLineEdit, &QLineEdit::selectAll); + connect(m_urlButton, &QRadioButton::toggled, m_urlLineEdit, &QLineEdit::setEnabled); + connect(m_localButton, &QRadioButton::toggled, m_localPathChooser, + &Utils::PathChooser::setEnabled); + connect(m_urlButton, &QRadioButton::toggled, m_rememberCheckBox, &QCheckBox::setEnabled); + connect(m_localButton, &QRadioButton::toggled, m_rememberCheckBox, &QCheckBox::setEnabled); } QString PullOrPushDialog::remoteLocation() const { - if (m_ui->defaultButton->isChecked()) + if (m_defaultButton->isChecked()) return QString(); - if (m_ui->localButton->isChecked()) - return m_ui->localPathChooser->filePath().toString(); - return m_ui->urlLineEdit->text(); + if (m_localButton->isChecked()) + return m_localPathChooser->filePath().toString(); + return m_urlLineEdit->text(); } bool PullOrPushDialog::isRememberOptionEnabled() const { - if (m_ui->defaultButton->isChecked()) + if (m_defaultButton->isChecked()) return false; - return m_ui->rememberCheckBox->isChecked(); + return m_rememberCheckBox->isChecked(); } bool PullOrPushDialog::isPrivateOptionEnabled() const { - return m_ui->privateCheckBox->isChecked(); + return m_privateCheckBox->isChecked(); } void PullOrPushDialog::setDefaultRemoteLocation(const QString &url) { - m_ui->urlLineEdit->setText(url); + m_urlLineEdit->setText(url); } void PullOrPushDialog::setLocalBaseDirectory(const QString &dir) { - m_ui->localPathChooser->setBaseDirectory(Utils::FilePath::fromString(dir)); -} - -void PullOrPushDialog::changeEvent(QEvent *e) -{ - QDialog::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - m_ui->retranslateUi(this); - break; - default: - break; - } + m_localPathChooser->setBaseDirectory(Utils::FilePath::fromString(dir)); } } // namespace Internal diff --git a/src/plugins/fossil/pullorpushdialog.h b/src/plugins/fossil/pullorpushdialog.h index f578b00cf17..1d921733b69 100644 --- a/src/plugins/fossil/pullorpushdialog.h +++ b/src/plugins/fossil/pullorpushdialog.h @@ -5,11 +5,17 @@ #include +QT_BEGIN_NAMESPACE +class QCheckBox; +class QLineEdit; +class QRadioButton; +QT_END_NAMESPACE + +namespace Utils { class PathChooser; } + namespace Fossil { namespace Internal { -namespace Ui { class PullOrPushDialog; } - class PullOrPushDialog : public QDialog { Q_OBJECT @@ -21,7 +27,6 @@ public: }; explicit PullOrPushDialog(Mode mode, QWidget *parent = nullptr); - ~PullOrPushDialog() final; // Common parameters and options QString remoteLocation() const; @@ -32,12 +37,14 @@ public: // Pull-specific options // Push-specific options -protected: - void changeEvent(QEvent *e) final; - private: - Mode m_mode; - Ui::PullOrPushDialog *m_ui; + QRadioButton *m_defaultButton; + QRadioButton *m_localButton; + Utils::PathChooser *m_localPathChooser; + QRadioButton *m_urlButton; + QLineEdit *m_urlLineEdit; + QCheckBox *m_rememberCheckBox; + QCheckBox *m_privateCheckBox; }; } // namespace Internal diff --git a/src/plugins/fossil/pullorpushdialog.ui b/src/plugins/fossil/pullorpushdialog.ui deleted file mode 100644 index eec47059a67..00000000000 --- a/src/plugins/fossil/pullorpushdialog.ui +++ /dev/null @@ -1,235 +0,0 @@ - - - Fossil::Internal::PullOrPushDialog - - - - 0 - 0 - 477 - 268 - - - - Dialog - - - - - - Remote Location - - - - - - Default location - - - true - - - - - - - Local filesystem: - - - - - - - false - - - - - - - For example: https://[user[:pass]@]host[:port]/[path] - - - Specify URL: - - - - - - - false - - - For example: https://[user[:pass]@]host[:port]/[path] - - - - - - - - - - Options - - - - - - false - - - Remember specified location as default - - - - - - - Allow transfer of private branches. - - - Include private branches - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - Qt::Vertical - - - - 20 - 4 - - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - editingFinished() - browsingFinished() - - - - - - - buttonBox - accepted() - Fossil::Internal::PullOrPushDialog - accept() - - - 257 - 177 - - - 157 - 274 - - - - - buttonBox - rejected() - Fossil::Internal::PullOrPushDialog - reject() - - - 325 - 177 - - - 286 - 274 - - - - - urlButton - toggled(bool) - urlLineEdit - setEnabled(bool) - - - 80 - 121 - - - 332 - 123 - - - - - localButton - toggled(bool) - localPathChooser - setEnabled(bool) - - - 112 - 81 - - - 346 - 81 - - - - - urlButton - toggled(bool) - rememberCheckBox - setEnabled(bool) - - - 71 - 92 - - - 163 - 153 - - - - - localButton - toggled(bool) - rememberCheckBox - setEnabled(bool) - - - 71 - 67 - - - 163 - 153 - - - - - diff --git a/src/plugins/fossil/revertdialog.ui b/src/plugins/fossil/revertdialog.ui deleted file mode 100644 index 1d43276410d..00000000000 --- a/src/plugins/fossil/revertdialog.ui +++ /dev/null @@ -1,106 +0,0 @@ - - - Fossil::Internal::RevertDialog - - - - 0 - 0 - 400 - 120 - - - - Revert - - - - - - Specify a revision other than the default? - - - true - - - false - - - - - 10 - 30 - 361 - 31 - - - - - - - Checkout revision, can also be a branch or a tag name. - - - Revision: - - - - - - - Checkout revision, can also be a branch or a tag name. - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - Fossil::Internal::RevertDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Fossil::Internal::RevertDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 38f72d14cb6..e819235c9b6 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -599,8 +599,7 @@ void GenericBuildSystem::updateDeploymentData() } if (hasDeploymentData) { DeploymentData deploymentData; - deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), - projectDirectory().toString()); + deploymentData.addFilesFromDeploymentFile(deploymentFilePath, projectDirectory()); setDeploymentData(deploymentData); if (m_deployFileWatcher.filePaths() != FilePaths{deploymentFilePath}) { m_deployFileWatcher.clear(); diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs index a6e3a4f529a..db678bd9dcd 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs +++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs @@ -33,6 +33,7 @@ QtcPlugin { "genericprojectconstants.h", "genericprojectfileseditor.cpp", "genericprojectfileseditor.h", + "genericprojectmanagertr.h", "genericprojectplugin.cpp", "genericprojectplugin.h", "genericprojectwizard.cpp", diff --git a/src/plugins/git/gerrit/authenticationdialog.h b/src/plugins/git/gerrit/authenticationdialog.h index 99d94a39d8d..e666851e383 100644 --- a/src/plugins/git/gerrit/authenticationdialog.h +++ b/src/plugins/git/gerrit/authenticationdialog.h @@ -19,8 +19,6 @@ class GerritServer; class AuthenticationDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(Gerrit::Internal::AuthenticationDialog) - public: AuthenticationDialog(GerritServer *server); ~AuthenticationDialog() override; diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp index 793586f54f0..a02174b2053 100644 --- a/src/plugins/git/gerrit/gerritserver.cpp +++ b/src/plugins/git/gerrit/gerritserver.cpp @@ -5,6 +5,7 @@ #include "gerritparameters.h" #include "gerritserver.h" #include "../gitclient.h" +#include "../gittr.h" #include @@ -281,10 +282,8 @@ bool GerritServer::resolveRoot() case CertificateError: if (QMessageBox::question( Core::ICore::dialogParent(), - QCoreApplication::translate( - "Gerrit::Internal::GerritDialog", "Certificate Error"), - QCoreApplication::translate( - "Gerrit::Internal::GerritDialog", + ::Git::Tr::tr("Certificate Error"), + ::Git::Tr::tr( "Server certificate for %1 cannot be authenticated.\n" "Do you want to disable SSL verification for this server?\n" "Note: This can expose you to man-in-the-middle attack.") diff --git a/src/plugins/gitlab/gitlabclonedialog.cpp b/src/plugins/gitlab/gitlabclonedialog.cpp index 4906bc2ef17..4d54105e447 100644 --- a/src/plugins/gitlab/gitlabclonedialog.cpp +++ b/src/plugins/gitlab/gitlabclonedialog.cpp @@ -4,6 +4,7 @@ #include "gitlabclonedialog.h" #include "gitlabprojectsettings.h" +#include "gitlabtr.h" #include "resultparser.h" #include @@ -48,28 +49,28 @@ namespace GitLab { GitLabCloneDialog::GitLabCloneDialog(const Project &project, QWidget *parent) : QDialog(parent) { - setWindowTitle(tr("Clone Repository")); + setWindowTitle(Tr::tr("Clone Repository")); QVBoxLayout *layout = new QVBoxLayout(this); - layout->addWidget(new QLabel(tr("Specify repository URL, checkout path and directory."))); + layout->addWidget(new QLabel(Tr::tr("Specify repository URL, checkout path and directory."))); QHBoxLayout *centerLayout = new QHBoxLayout; QFormLayout *form = new QFormLayout; m_repositoryCB = new QComboBox(this); m_repositoryCB->addItems({project.sshUrl, project.httpUrl}); - form->addRow(tr("Repository"), m_repositoryCB); + form->addRow(Tr::tr("Repository"), m_repositoryCB); m_pathChooser = new PathChooser(this); m_pathChooser->setExpectedKind(PathChooser::ExistingDirectory); - form->addRow(tr("Path"), m_pathChooser); + form->addRow(Tr::tr("Path"), m_pathChooser); m_directoryLE = new FancyLineEdit(this); m_directoryLE->setValidationFunction([this](FancyLineEdit *e, QString *msg) { const FilePath fullPath = m_pathChooser->filePath().pathAppended(e->text()); bool alreadyExists = fullPath.exists(); if (alreadyExists && msg) - *msg = tr("Path \"%1\" already exists.").arg(fullPath.toUserOutput()); + *msg = Tr::tr("Path \"%1\" already exists.").arg(fullPath.toUserOutput()); return !alreadyExists; }); - form->addRow(tr("Directory"), m_directoryLE); + form->addRow(Tr::tr("Directory"), m_directoryLE); m_submodulesCB = new QCheckBox(this); - form->addRow(tr("Recursive"), m_submodulesCB); + form->addRow(Tr::tr("Recursive"), m_submodulesCB); form->addItem(new QSpacerItem(10, 10)); centerLayout->addLayout(form); m_cloneOutput = new QPlainTextEdit(this); @@ -79,7 +80,7 @@ GitLabCloneDialog::GitLabCloneDialog(const Project &project, QWidget *parent) m_infoLabel = new InfoLabel(this); layout->addWidget(m_infoLabel); auto buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, this); - m_cloneButton = new QPushButton(tr("Clone"), this); + m_cloneButton = new QPushButton(Tr::tr("Clone"), this); buttons->addButton(m_cloneButton, QDialogButtonBox::ActionRole); m_cancelButton = buttons->button(QDialogButtonBox::Cancel); layout->addWidget(buttons); @@ -161,7 +162,7 @@ void GitLabCloneDialog::cloneProject() void GitLabCloneDialog::cancel() { if (m_commandRunning) { - m_cloneOutput->appendPlainText(tr("User canceled process.")); + m_cloneOutput->appendPlainText(Tr::tr("User canceled process.")); m_cancelButton->setEnabled(false); m_command->cancel(); // FIXME does not cancel the git processes... QTCREATORBUG-27567 } else { @@ -194,7 +195,7 @@ void GitLabCloneDialog::cloneFinished(bool success) QApplication::restoreOverrideCursor(); if (success) { - m_cloneOutput->appendPlainText(tr("Cloning succeeded.") + emptyLine); + m_cloneOutput->appendPlainText(Tr::tr("Cloning succeeded.") + emptyLine); m_cloneButton->setEnabled(false); const FilePath base = m_pathChooser->filePath().pathAppended(m_directoryLE->text()); @@ -215,8 +216,8 @@ void GitLabCloneDialog::cloneFinished(bool success) hide(); // avoid to many dialogs.. FIXME: maybe change to some wizard approach? if (filesWeMayOpen.isEmpty()) { - QMessageBox::warning(this, tr("Warning"), - tr("Cloned project does not have a project file that can be " + QMessageBox::warning(this, Tr::tr("Warning"), + Tr::tr("Cloned project does not have a project file that can be " "opened. Try importing the project as a generic project.")); accept(); } else { @@ -225,15 +226,15 @@ void GitLabCloneDialog::cloneFinished(bool success) }); bool ok = false; const QString fileToOpen - = QInputDialog::getItem(this, tr("Open Project"), - tr("Choose the project file to be opened."), + = QInputDialog::getItem(this, Tr::tr("Open Project"), + Tr::tr("Choose the project file to be opened."), pFiles, 0, false, &ok); accept(); if (ok && !fileToOpen.isEmpty()) ProjectExplorer::ProjectExplorerPlugin::openProject(base.pathAppended(fileToOpen)); } } else { - m_cloneOutput->appendPlainText(tr("Cloning failed.") + emptyLine); + m_cloneOutput->appendPlainText(Tr::tr("Cloning failed.") + emptyLine); const FilePath fullPath = m_pathChooser->filePath().pathAppended(m_directoryLE->text()); fullPath.removeRecursively(); m_cloneButton->setEnabled(true); diff --git a/src/plugins/gitlab/gitlabclonedialog.h b/src/plugins/gitlab/gitlabclonedialog.h index efd141467c3..351175fa59b 100644 --- a/src/plugins/gitlab/gitlabclonedialog.h +++ b/src/plugins/gitlab/gitlabclonedialog.h @@ -3,7 +3,6 @@ #pragma once -#include #include QT_BEGIN_NAMESPACE @@ -27,7 +26,6 @@ class Project; class GitLabCloneDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(GitLab::GitLabCloneDialog) public: explicit GitLabCloneDialog(const Project &project, QWidget *parent = nullptr); diff --git a/src/plugins/gitlab/gitlabdialog.cpp b/src/plugins/gitlab/gitlabdialog.cpp index 9aa5235d536..97d57e42651 100644 --- a/src/plugins/gitlab/gitlabdialog.cpp +++ b/src/plugins/gitlab/gitlabdialog.cpp @@ -7,6 +7,7 @@ #include "gitlabparameters.h" #include "gitlabplugin.h" #include "gitlabprojectsettings.h" +#include "gitlabtr.h" #include @@ -46,7 +47,7 @@ GitLabDialog::GitLabDialog(QWidget *parent) : QDialog(parent) , m_lastTreeViewQuery(Query::NoQuery) { - setWindowTitle(tr("GitLab")); + setWindowTitle(Tr::tr("GitLab")); resize(665, 530); m_mainLabel = new QLabel; @@ -59,9 +60,9 @@ GitLabDialog::GitLabDialog(QWidget *parent) m_searchLineEdit = new QLineEdit(this); m_searchLineEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - m_searchLineEdit->setPlaceholderText(tr("Search")); + m_searchLineEdit->setPlaceholderText(Tr::tr("Search")); - auto searchPB = new QPushButton(tr("Search")); + auto searchPB = new QPushButton(Tr::tr("Search")); searchPB->setDefault(true); m_treeView = new QTreeView(this); @@ -75,18 +76,18 @@ GitLabDialog::GitLabDialog(QWidget *parent) m_firstToolButton->setText(QString::fromUtf8("|<")); m_previousToolButton = new QToolButton(this); - m_previousToolButton->setText(tr("...")); + m_previousToolButton->setText(Tr::tr("...")); m_currentPageLabel = new QLabel(this); - m_currentPageLabel->setText(tr("0")); + m_currentPageLabel->setText(Tr::tr("0")); m_nextToolButton = new QToolButton(this); - m_nextToolButton->setText(tr("...")); + m_nextToolButton->setText(Tr::tr("...")); m_lastToolButton = new QToolButton(this); m_lastToolButton->setText(QString::fromUtf8(">|")); - m_clonePB = new QPushButton(Utils::Icons::DOWNLOAD.icon(), tr("Clone..."), this); + m_clonePB = new QPushButton(Utils::Icons::DOWNLOAD.icon(), Tr::tr("Clone..."), this); m_clonePB->setEnabled(false); auto buttonBox = new QDialogButtonBox(this); @@ -102,7 +103,7 @@ GitLabDialog::GitLabDialog(QWidget *parent) m_detailsLabel }, st, - tr("Remote:"), + Tr::tr("Remote:"), m_remoteComboBox }, Space(40), @@ -293,34 +294,34 @@ void GitLabDialog::handleUser(const User &user) m_currentUserId = user.id; if (!user.error.message.isEmpty()) { - m_mainLabel->setText(tr("Not logged in.")); + m_mainLabel->setText(Tr::tr("Not logged in.")); if (user.error.code == 1) { - m_detailsLabel->setText(tr("Insufficient access token.")); + m_detailsLabel->setText(Tr::tr("Insufficient access token.")); m_detailsLabel->setToolTip(user.error.message + QLatin1Char('\n') - + tr("Permission scope read_api or api needed.")); + + Tr::tr("Permission scope read_api or api needed.")); } else if (user.error.code >= 300 && user.error.code < 400) { - m_detailsLabel->setText(tr("Check settings for misconfiguration.")); + m_detailsLabel->setText(Tr::tr("Check settings for misconfiguration.")); m_detailsLabel->setToolTip(user.error.message); } else { m_detailsLabel->setText({}); m_detailsLabel->setToolTip({}); } updatePageButtons(); - m_treeViewTitle->setText(tr("Projects (%1)").arg(0)); + m_treeViewTitle->setText(Tr::tr("Projects (%1)").arg(0)); return; } if (user.id != -1) { if (user.bot) { - m_mainLabel->setText(tr("Using project access token.")); + m_mainLabel->setText(Tr::tr("Using project access token.")); m_detailsLabel->setText({}); } else { - m_mainLabel->setText(tr("Logged in as %1").arg(user.name)); - m_detailsLabel->setText(tr("Id: %1 (%2)").arg(user.id).arg(user.email)); + m_mainLabel->setText(Tr::tr("Logged in as %1").arg(user.name)); + m_detailsLabel->setText(Tr::tr("Id: %1 (%2)").arg(user.id).arg(user.email)); } m_detailsLabel->setToolTip({}); } else { - m_mainLabel->setText(tr("Not logged in.")); + m_mainLabel->setText(Tr::tr("Not logged in.")); m_detailsLabel->setText({}); m_detailsLabel->setToolTip({}); } @@ -344,7 +345,7 @@ void GitLabDialog::handleProjects(const Projects &projects) }); resetTreeView(m_treeView, listModel); int count = projects.error.message.isEmpty() ? projects.pageInfo.total : 0; - m_treeViewTitle->setText(tr("Projects (%1)").arg(count)); + m_treeViewTitle->setText(Tr::tr("Projects (%1)").arg(count)); m_lastPageInformation = projects.pageInfo; updatePageButtons(); diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp index 65b8ce70451..4f519e77886 100644 --- a/src/plugins/gitlab/gitlaboptionspage.cpp +++ b/src/plugins/gitlab/gitlaboptionspage.cpp @@ -4,6 +4,7 @@ #include "gitlaboptionspage.h" #include "gitlabparameters.h" +#include "gitlabtr.h" #include @@ -47,27 +48,27 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent) : QWidget(parent) , m_mode(m) { - m_host.setLabelText(GitLabOptionsPage::tr("Host:")); + m_host.setLabelText(Tr::tr("Host:")); m_host.setDisplayStyle(m == Display ? Utils::StringAspect::LabelDisplay : Utils::StringAspect::LineEditDisplay); m_host.setValidationFunction([](Utils::FancyLineEdit *l, QString *) { return hostValid(l->text()); }); - m_description.setLabelText(GitLabOptionsPage::tr("Description:")); + m_description.setLabelText(Tr::tr("Description:")); m_description.setDisplayStyle(m == Display ? Utils::StringAspect::LabelDisplay : Utils::StringAspect::LineEditDisplay); - m_token.setLabelText(GitLabOptionsPage::tr("Access token:")); + m_token.setLabelText(Tr::tr("Access token:")); m_token.setDisplayStyle(m == Display ? Utils::StringAspect::LabelDisplay : Utils::StringAspect::LineEditDisplay); m_token.setVisible(m == Edit); - m_port.setLabelText(GitLabOptionsPage::tr("Port:")); + m_port.setLabelText(Tr::tr("Port:")); m_port.setRange(1, 65535); m_port.setValue(GitLabServer::defaultPort); m_port.setEnabled(m == Edit); - m_secure.setLabelText(GitLabOptionsPage::tr("HTTPS:")); + m_secure.setLabelText(Tr::tr("HTTPS:")); m_secure.setLabelPlacement(Utils::BoolAspect::LabelPlacement::InExtraLabel); m_secure.setDefaultValue(true); m_secure.setEnabled(m == Edit); @@ -110,20 +111,20 @@ void GitLabServerWidget::setGitLabServer(const GitLabServer &server) GitLabOptionsWidget::GitLabOptionsWidget(QWidget *parent) : QWidget(parent) { - auto defaultLabel = new QLabel(tr("Default:"), this); + auto defaultLabel = new QLabel(Tr::tr("Default:"), this); m_defaultGitLabServer = new QComboBox(this); m_curl.setDisplayStyle(Utils::StringAspect::DisplayStyle::PathChooserDisplay); - m_curl.setLabelText(tr("curl:")); + m_curl.setLabelText(Tr::tr("curl:")); m_curl.setExpectedKind(Utils::PathChooser::ExistingCommand); m_gitLabServerWidget = new GitLabServerWidget(GitLabServerWidget::Display, this); - m_edit = new QPushButton(tr("Edit..."), this); - m_edit->setToolTip(tr("Edit current selected GitLab server configuration.")); - m_remove = new QPushButton(tr("Remove"), this); - m_remove->setToolTip(tr("Remove current selected GitLab server configuration.")); - m_add = new QPushButton(tr("Add..."), this); - m_add->setToolTip(tr("Add new GitLab server configuration.")); + m_edit = new QPushButton(Tr::tr("Edit..."), this); + m_edit->setToolTip(Tr::tr("Edit current selected GitLab server configuration.")); + m_remove = new QPushButton(Tr::tr("Remove"), this); + m_remove->setToolTip(Tr::tr("Remove current selected GitLab server configuration.")); + m_add = new QPushButton(Tr::tr("Add..."), this); + m_add->setToolTip(Tr::tr("Add new GitLab server configuration.")); using namespace Utils::Layouting; @@ -177,13 +178,13 @@ void GitLabOptionsWidget::showEditServerDialog() { const GitLabServer old = m_defaultGitLabServer->currentData().value(); QDialog d; - d.setWindowTitle(tr("Edit Server...")); + d.setWindowTitle(Tr::tr("Edit Server...")); QVBoxLayout *layout = new QVBoxLayout; GitLabServerWidget *serverWidget = new GitLabServerWidget(GitLabServerWidget::Edit, this); serverWidget->setGitLabServer(old); layout->addWidget(serverWidget); auto buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, this); - auto modifyButton = buttons->addButton(tr("Modify"), QDialogButtonBox::AcceptRole); + auto modifyButton = buttons->addButton(Tr::tr("Modify"), QDialogButtonBox::AcceptRole); connect(modifyButton, &QPushButton::clicked, &d, &QDialog::accept); connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject); layout->addWidget(buttons); @@ -199,12 +200,12 @@ void GitLabOptionsWidget::showEditServerDialog() void GitLabOptionsWidget::showAddServerDialog() { QDialog d; - d.setWindowTitle(tr("Add Server...")); + d.setWindowTitle(Tr::tr("Add Server...")); QVBoxLayout *layout = new QVBoxLayout; GitLabServerWidget *serverWidget = new GitLabServerWidget(GitLabServerWidget::Edit, this); layout->addWidget(serverWidget); auto buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, this); - auto addButton = buttons->addButton(tr("Add"), QDialogButtonBox::AcceptRole); + auto addButton = buttons->addButton(Tr::tr("Add"), QDialogButtonBox::AcceptRole); connect(addButton, &QPushButton::clicked, &d, &QDialog::accept); connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject); layout->addWidget(buttons); @@ -257,7 +258,7 @@ GitLabOptionsPage::GitLabOptionsPage(GitLabParameters *p, QObject *parent) , m_parameters(p) { setId(Constants::GITLAB_SETTINGS); - setDisplayName(tr("GitLab")); + setDisplayName(Tr::tr("GitLab")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); } diff --git a/src/plugins/gitlab/gitlabplugin.cpp b/src/plugins/gitlab/gitlabplugin.cpp index 7994a95304f..2059ae4d84b 100644 --- a/src/plugins/gitlab/gitlabplugin.cpp +++ b/src/plugins/gitlab/gitlabplugin.cpp @@ -7,6 +7,7 @@ #include "gitlaboptionspage.h" #include "gitlabparameters.h" #include "gitlabprojectsettings.h" +#include "gitlabtr.h" #include "queryrunner.h" #include "resultparser.h" @@ -73,12 +74,12 @@ void GitLabPlugin::initialize() dd->parameters.fromSettings(Core::ICore::settings()); auto panelFactory = new ProjectExplorer::ProjectPanelFactory; panelFactory->setPriority(999); - panelFactory->setDisplayName(tr("GitLab")); + panelFactory->setDisplayName(Tr::tr("GitLab")); panelFactory->setCreateWidgetFunction([](ProjectExplorer::Project *project) { return new GitLabProjectSettingsWidget(project); }); ProjectExplorer::ProjectPanelFactory::registerFactory(panelFactory); - QAction *openViewAction = new QAction(tr("GitLab..."), this); + QAction *openViewAction = new QAction(Tr::tr("GitLab..."), this); auto gitlabCommand = Core::ActionManager::registerAction(openViewAction, Constants::GITLAB_OPEN_VIEW); connect(openViewAction, &QAction::triggered, this, &GitLabPlugin::openView); @@ -97,8 +98,8 @@ void GitLabPlugin::openView() { if (dd->dialog.isNull()) { while (!dd->parameters.isValid()) { - QMessageBox::warning(Core::ICore::dialogParent(), tr("Error"), - tr("Invalid GitLab configuration. For a fully functional " + QMessageBox::warning(Core::ICore::dialogParent(), Tr::tr("Error"), + Tr::tr("Invalid GitLab configuration. For a fully functional " "configuration, you need to set up host name or address and " "an access token. Providing the path to curl is mandatory.")); if (!Core::ICore::showOptionsDialog("GitLab")) @@ -290,10 +291,8 @@ bool GitLabPlugin::handleCertificateIssue(const Utils::Id &serverId) GitLabServer server = dd->parameters.serverForId(serverId); if (QMessageBox::question(Core::ICore::dialogParent(), - QCoreApplication::translate( - "GitLab::GitLabDialog", "Certificate Error"), - QCoreApplication::translate( - "GitLab::GitLabDialog", + Tr::tr("Certificate Error"), + Tr::tr( "Server certificate for %1 cannot be authenticated.\n" "Do you want to disable SSL verification for this server?\n" "Note: This can expose you to man-in-the-middle attack.") diff --git a/src/plugins/gitlab/gitlabprojectsettings.cpp b/src/plugins/gitlab/gitlabprojectsettings.cpp index bc24a63fad0..73532e492f8 100644 --- a/src/plugins/gitlab/gitlabprojectsettings.cpp +++ b/src/plugins/gitlab/gitlabprojectsettings.cpp @@ -5,6 +5,7 @@ #include "gitlaboptionspage.h" #include "gitlabplugin.h" +#include "gitlabtr.h" #include "queryrunner.h" #include "resultparser.h" @@ -31,13 +32,12 @@ const char PSK_LAST_REQ[] = "GitLab.LastRequest"; static QString accessLevelString(int accessLevel) { - const char trContext[] = "GitLab::GitLabProjectSettingsWidget"; switch (accessLevel) { - case 10: return QCoreApplication::translate(trContext, "Guest"); - case 20: return QCoreApplication::translate(trContext, "Reporter"); - case 30: return QCoreApplication::translate(trContext, "Developer"); - case 40: return QCoreApplication::translate(trContext, "Maintainer"); - case 50: return QCoreApplication::translate(trContext, "Owner"); + case 10: return Tr::tr("Guest"); + case 20: return Tr::tr("Reporter"); + case 30: return Tr::tr("Developer"); + case 40: return Tr::tr("Maintainer"); + case 50: return Tr::tr("Owner"); } return {}; } @@ -120,27 +120,28 @@ GitLabProjectSettingsWidget::GitLabProjectSettingsWidget(ProjectExplorer::Projec verticalLayout->setContentsMargins(0, 0, 0, 0); auto formLayout = new QFormLayout; m_hostCB = new QComboBox; - formLayout->addRow(tr("Host:"), m_hostCB); + formLayout->addRow(Tr::tr("Host:"), m_hostCB); m_linkedGitLabServer = new QComboBox; - formLayout->addRow(tr("Linked GitLab Configuration:"), m_linkedGitLabServer); + formLayout->addRow(Tr::tr("Linked GitLab Configuration:"), m_linkedGitLabServer); verticalLayout->addLayout(formLayout); m_infoLabel = new Utils::InfoLabel; m_infoLabel->setVisible(false); verticalLayout->addWidget(m_infoLabel); auto horizontalLayout = new QHBoxLayout; horizontalLayout->setContentsMargins(0, 0, 0, 0); - m_linkWithGitLab = new QPushButton(tr("Link with GitLab")); + m_linkWithGitLab = new QPushButton(Tr::tr("Link with GitLab")); horizontalLayout->addWidget(m_linkWithGitLab); - m_unlink = new QPushButton(tr("Unlink from GitLab")); + m_unlink = new QPushButton(Tr::tr("Unlink from GitLab")); m_unlink->setEnabled(false); horizontalLayout->addWidget(m_unlink); - m_checkConnection = new QPushButton(tr("Test Connection")); + m_checkConnection = new QPushButton(Tr::tr("Test Connection")); m_checkConnection->setEnabled(false); horizontalLayout->addWidget(m_checkConnection); horizontalLayout->addStretch(1); verticalLayout->addLayout(horizontalLayout); - verticalLayout->addWidget(new QLabel(tr("Projects linked with GitLab receive event " - "notifications in the Version Control output pane."))); + verticalLayout->addWidget(new QLabel(Tr::tr("Projects linked with GitLab receive event " + "notifications in the Version Control output " + "pane."))); connect(m_linkWithGitLab, &QPushButton::clicked, this, [this] { checkConnection(Link); @@ -178,7 +179,7 @@ void GitLabProjectSettingsWidget::checkConnection(CheckMode mode) const auto [remoteHost, projName, port] = GitLabProjectSettings::remotePartsFromRemote(remote); if (remoteHost != server.host) { // port check as well m_infoLabel->setType(Utils::InfoLabel::NotOk); - m_infoLabel->setText(tr("Remote host does not match chosen GitLab configuration.")); + m_infoLabel->setText(Tr::tr("Remote host does not match chosen GitLab configuration.")); m_infoLabel->setVisible(true); return; } @@ -210,17 +211,17 @@ void GitLabProjectSettingsWidget::onConnectionChecked(const Project &project, bool linkable = false; if (!project.error.message.isEmpty()) { m_infoLabel->setType(Utils::InfoLabel::Error); - m_infoLabel->setText(tr("Check settings for misconfiguration.") + m_infoLabel->setText(Tr::tr("Check settings for misconfiguration.") + " (" + project.error.message + ')'); } else { if (project.accessLevel != -1) { m_infoLabel->setType(Utils::InfoLabel::Ok); - m_infoLabel->setText(tr("Accessible (%1).") + m_infoLabel->setText(Tr::tr("Accessible (%1).") .arg(accessLevelString(project.accessLevel))); linkable = true; } else { m_infoLabel->setType(Utils::InfoLabel::Warning); - m_infoLabel->setText(tr("Read only access.")); + m_infoLabel->setText(Tr::tr("Read only access.")); } } m_infoLabel->setVisible(true); @@ -294,9 +295,9 @@ void GitLabProjectSettingsWidget::updateEnabledStates() const Utils::FilePath repository = gitClient ? gitClient->findRepositoryForDirectory(projectDirectory) : Utils::FilePath(); if (repository.isEmpty()) - m_infoLabel->setText(tr("Not a git repository.")); + m_infoLabel->setText(Tr::tr("Not a git repository.")); else - m_infoLabel->setText(tr("Local git repository without remotes.")); + m_infoLabel->setText(Tr::tr("Local git repository without remotes.")); m_infoLabel->setType(Utils::InfoLabel::None); m_infoLabel->setVisible(true); } diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs index 64359cb6c64..e0aefe02a1b 100644 --- a/src/plugins/glsleditor/glsleditor.qbs +++ b/src/plugins/glsleditor/glsleditor.qbs @@ -23,6 +23,7 @@ QtcPlugin { "glsleditorconstants.h", "glsleditorplugin.cpp", "glsleditorplugin.h", + "glsleditortr.h", "glslhighlighter.cpp", "glslhighlighter.h", "glslindenter.cpp", diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp index eff94565279..5d238a4f2b4 100644 --- a/src/plugins/glsleditor/glsleditorplugin.cpp +++ b/src/plugins/glsleditor/glsleditorplugin.cpp @@ -2,9 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "glsleditorplugin.h" + #include "glslcompletionassist.h" #include "glsleditor.h" #include "glsleditorconstants.h" +#include "glsleditortr.h" #include "glslhighlighter.h" #include @@ -101,7 +103,7 @@ void GlslEditorPlugin::initialize() glslToolsMenu->setOnAllDisabledBehavior(ActionContainer::Hide); QMenu *menu = glslToolsMenu->menu(); //: GLSL sub-menu in the Tools menu - menu->setTitle(tr("GLSL")); + menu->setTitle(Tr::tr("GLSL")); ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(glslToolsMenu); // Insert marker for "Refactoring" menu: diff --git a/src/plugins/glsleditor/glsleditortr.h b/src/plugins/glsleditor/glsleditortr.h index 8c16d30d486..e5c4023c932 100644 --- a/src/plugins/glsleditor/glsleditortr.h +++ b/src/plugins/glsleditor/glsleditortr.h @@ -5,11 +5,11 @@ #include -namespace GLSLEditor { +namespace GlslEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::GLSLEditor) + Q_DECLARE_TR_FUNCTIONS(::GlslEditor) }; } // namespace GLSLEditor diff --git a/src/plugins/haskell/haskell_global.h b/src/plugins/haskell/haskell_global.h index 9452e44653c..f80808c24cd 100644 --- a/src/plugins/haskell/haskell_global.h +++ b/src/plugins/haskell/haskell_global.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellbuildconfiguration.cpp b/src/plugins/haskell/haskellbuildconfiguration.cpp index 77bee060a77..4e3d27a6bfa 100644 --- a/src/plugins/haskell/haskellbuildconfiguration.cpp +++ b/src/plugins/haskell/haskellbuildconfiguration.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskellbuildconfiguration.h" diff --git a/src/plugins/haskell/haskellbuildconfiguration.h b/src/plugins/haskell/haskellbuildconfiguration.h index c93161e5353..e8cbc1dbc61 100644 --- a/src/plugins/haskell/haskellbuildconfiguration.h +++ b/src/plugins/haskell/haskellbuildconfiguration.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellconstants.h b/src/plugins/haskell/haskellconstants.h index 8b63761ada0..7561a53a040 100644 --- a/src/plugins/haskell/haskellconstants.h +++ b/src/plugins/haskell/haskellconstants.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskelleditorfactory.cpp b/src/plugins/haskell/haskelleditorfactory.cpp index 206677915ba..948402d6825 100644 --- a/src/plugins/haskell/haskelleditorfactory.cpp +++ b/src/plugins/haskell/haskelleditorfactory.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskelleditorfactory.h" diff --git a/src/plugins/haskell/haskelleditorfactory.h b/src/plugins/haskell/haskelleditorfactory.h index a48632d289d..c91f875df29 100644 --- a/src/plugins/haskell/haskelleditorfactory.h +++ b/src/plugins/haskell/haskelleditorfactory.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellhighlighter.cpp b/src/plugins/haskell/haskellhighlighter.cpp index 8a5b6cae76e..c89c4ae4805 100644 --- a/src/plugins/haskell/haskellhighlighter.cpp +++ b/src/plugins/haskell/haskellhighlighter.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskellhighlighter.h" diff --git a/src/plugins/haskell/haskellhighlighter.h b/src/plugins/haskell/haskellhighlighter.h index 621333341bc..9bf71413b32 100644 --- a/src/plugins/haskell/haskellhighlighter.h +++ b/src/plugins/haskell/haskellhighlighter.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellmanager.cpp b/src/plugins/haskell/haskellmanager.cpp index dd6a3712b95..d98976b4741 100644 --- a/src/plugins/haskell/haskellmanager.cpp +++ b/src/plugins/haskell/haskellmanager.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskellmanager.h" diff --git a/src/plugins/haskell/haskellmanager.h b/src/plugins/haskell/haskellmanager.h index 361b8f8e966..da4018930d1 100644 --- a/src/plugins/haskell/haskellmanager.h +++ b/src/plugins/haskell/haskellmanager.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellplugin.cpp b/src/plugins/haskell/haskellplugin.cpp index c3ae400629c..04def3d92f7 100644 --- a/src/plugins/haskell/haskellplugin.cpp +++ b/src/plugins/haskell/haskellplugin.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskellplugin.h" diff --git a/src/plugins/haskell/haskellplugin.h b/src/plugins/haskell/haskellplugin.h index 163f40b959b..acae0d2001a 100644 --- a/src/plugins/haskell/haskellplugin.h +++ b/src/plugins/haskell/haskellplugin.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellproject.cpp b/src/plugins/haskell/haskellproject.cpp index 248f898aeed..916632c5dc6 100644 --- a/src/plugins/haskell/haskellproject.cpp +++ b/src/plugins/haskell/haskellproject.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskellproject.h" diff --git a/src/plugins/haskell/haskellproject.h b/src/plugins/haskell/haskellproject.h index 0ee05d90333..79bec049ae4 100644 --- a/src/plugins/haskell/haskellproject.h +++ b/src/plugins/haskell/haskellproject.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskellrunconfiguration.cpp b/src/plugins/haskell/haskellrunconfiguration.cpp index 74574710f6f..6f6842f239f 100644 --- a/src/plugins/haskell/haskellrunconfiguration.cpp +++ b/src/plugins/haskell/haskellrunconfiguration.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskellrunconfiguration.h" diff --git a/src/plugins/haskell/haskellrunconfiguration.h b/src/plugins/haskell/haskellrunconfiguration.h index 27e4a83f9ad..c0c0423d2a0 100644 --- a/src/plugins/haskell/haskellrunconfiguration.h +++ b/src/plugins/haskell/haskellrunconfiguration.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/haskelltokenizer.cpp b/src/plugins/haskell/haskelltokenizer.cpp index 6f2556d2475..197af94d0ae 100644 --- a/src/plugins/haskell/haskelltokenizer.cpp +++ b/src/plugins/haskell/haskelltokenizer.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "haskelltokenizer.h" diff --git a/src/plugins/haskell/optionspage.cpp b/src/plugins/haskell/optionspage.cpp index 63d159443b0..0b8add0cf21 100644 --- a/src/plugins/haskell/optionspage.cpp +++ b/src/plugins/haskell/optionspage.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "optionspage.h" diff --git a/src/plugins/haskell/optionspage.h b/src/plugins/haskell/optionspage.h index c1663c7a47e..a477d72dfce 100644 --- a/src/plugins/haskell/optionspage.h +++ b/src/plugins/haskell/optionspage.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/haskell/stackbuildstep.cpp b/src/plugins/haskell/stackbuildstep.cpp index 52ed64f2834..0b944e23ba3 100644 --- a/src/plugins/haskell/stackbuildstep.cpp +++ b/src/plugins/haskell/stackbuildstep.cpp @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "stackbuildstep.h" diff --git a/src/plugins/haskell/stackbuildstep.h b/src/plugins/haskell/stackbuildstep.h index d74d155b708..dbfbf2e72cd 100644 --- a/src/plugins/haskell/stackbuildstep.h +++ b/src/plugins/haskell/stackbuildstep.h @@ -1,27 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ +// Copyright (c) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index 0e01d583594..25d85bdc37e 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -47,6 +47,7 @@ Project { "helpplugin.cpp", "helpplugin.h", "helpviewer.cpp", "helpviewer.h", "helpwidget.cpp", "helpwidget.h", + "helptr.h", "localhelpmanager.cpp", "localhelpmanager.h", "openpagesmanager.cpp", "openpagesmanager.h", "openpagesswitcher.cpp", "openpagesswitcher.h", diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index 84533adb2ae..163f12a2586 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -34,14 +34,14 @@ const char HELP_SEARCH[] = "Help.Search"; const char HELP_BOOKMARKS[] = "Help.Bookmarks"; const char HELP_OPENPAGES[] = "Help.OpenPages"; -static const char SB_INDEX[] = QT_TRANSLATE_NOOP("Help", "Index"); -static const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("Help", "Contents"); -static const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("Help", "Bookmarks"); -static const char SB_OPENPAGES[] = QT_TRANSLATE_NOOP("Help", "Open Pages"); -static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("Help", "Search"); +static const char SB_INDEX[] = QT_TRANSLATE_NOOP("::Help", "Index"); +static const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("::Help", "Contents"); +static const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("::Help", "Bookmarks"); +static const char SB_OPENPAGES[] = QT_TRANSLATE_NOOP("::Help", "Open Pages"); +static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("::Help", "Search"); -static const char TR_OPEN_LINK_AS_NEW_PAGE[] = QT_TRANSLATE_NOOP("Help", "Open Link as New Page"); -static const char TR_OPEN_LINK_IN_WINDOW[] = QT_TRANSLATE_NOOP("Help", "Open Link in Window"); +static const char TR_OPEN_LINK_AS_NEW_PAGE[] = QT_TRANSLATE_NOOP("::Help", "Open Link as New Page"); +static const char TR_OPEN_LINK_IN_WINDOW[] = QT_TRANSLATE_NOOP("::Help", "Open Link in Window"); } // Constants } // Help diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs index c5fe2c8eb9d..4731cbffb5b 100644 --- a/src/plugins/imageviewer/imageviewer.qbs +++ b/src/plugins/imageviewer/imageviewer.qbs @@ -27,5 +27,6 @@ QtcPlugin { "imageviewerfile.h", "imageviewerplugin.cpp", "imageviewerplugin.h", + "imageviewertr.h", ] } diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs index cf1bc762f3d..ac4575c4e3d 100644 --- a/src/plugins/ios/ios.qbs +++ b/src/plugins/ios/ios.qbs @@ -49,6 +49,7 @@ QtcPlugin { "iossimulator.h", "iostoolhandler.cpp", "iostoolhandler.h", + "iostr.h", "simulatorcontrol.cpp", "simulatorcontrol.h", "simulatorinfomodel.cpp", diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs index 47d5e3fda24..f6579c7394d 100644 --- a/src/plugins/macros/macros.qbs +++ b/src/plugins/macros/macros.qbs @@ -35,6 +35,7 @@ QtcPlugin { "macrosconstants.h", "macrosplugin.cpp", "macrosplugin.h", + "macrostr.h", "macrotextfind.cpp", "macrotextfind.h", "savedialog.cpp", diff --git a/src/plugins/marketplace/marketplace.qbs b/src/plugins/marketplace/marketplace.qbs index 342ad65cf53..04b300e2245 100644 --- a/src/plugins/marketplace/marketplace.qbs +++ b/src/plugins/marketplace/marketplace.qbs @@ -11,6 +11,7 @@ QtcPlugin { files: [ "marketplaceplugin.h", + "marketplacetr.h", "productlistmodel.cpp", "productlistmodel.h", "qtmarketplacewelcomepage.cpp", "qtmarketplacewelcomepage.h", ] diff --git a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp index 785320cc480..44272858c5e 100644 --- a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp +++ b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp @@ -3,6 +3,7 @@ #include "qtmarketplacewelcomepage.h" +#include "marketplacetr.h" #include "productlistmodel.h" #include @@ -25,7 +26,7 @@ using namespace Utils; QString QtMarketplaceWelcomePage::title() const { - return tr("Marketplace"); + return Tr::tr("Marketplace"); } int QtMarketplaceWelcomePage::priority() const @@ -45,7 +46,7 @@ public: { auto searchBox = new Core::SearchBox(this); m_searcher = searchBox->m_lineEdit; - m_searcher->setPlaceholderText(QtMarketplaceWelcomePage::tr("Search in Marketplace...")); + m_searcher->setPlaceholderText(Tr::tr("Search in Marketplace...")); auto vbox = new QVBoxLayout(this); vbox->setContentsMargins(0, 0, 0, Core::WelcomePageHelpers::ItemGap); @@ -82,7 +83,7 @@ public: f.setPixelSize(20); m_errorLabel->setFont(f); const QString txt - = QtMarketplaceWelcomePage::tr( + = Tr::tr( "

Could not fetch data from Qt Marketplace.

Try with your browser " "instead: https://marketplace.qt.io" "


Error: %1

").arg(message); diff --git a/src/plugins/marketplace/qtmarketplacewelcomepage.h b/src/plugins/marketplace/qtmarketplacewelcomepage.h index ce419380e70..fb3f1a5fe16 100644 --- a/src/plugins/marketplace/qtmarketplacewelcomepage.h +++ b/src/plugins/marketplace/qtmarketplacewelcomepage.h @@ -12,7 +12,6 @@ namespace Internal { class QtMarketplaceWelcomePage : public Core::IWelcomePage { - Q_DECLARE_TR_FUNCTIONS(Marketplace::Internal::QtMarketplaceWelcomePage) public: QtMarketplaceWelcomePage() = default; diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index e66c87ff5e5..474314b6a6b 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -113,8 +113,7 @@ void McuSdkRepository::expandVariablesAndWildcards() } // drop empty_split_entry(linux)|root(windows) QString root = pathComponents.takeFirst(); - if (root.isEmpty()) // Linux - root = "/"; + root.append('/'); // ensure we have a path (UNIX just a '/', Windows 'C:/' or similar) package->setPath( expandWildcards(FilePath::fromString(root), diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs index 58fb641cb4d..e5b18f080cc 100644 --- a/src/plugins/mercurial/mercurial.qbs +++ b/src/plugins/mercurial/mercurial.qbs @@ -29,6 +29,7 @@ QtcPlugin { "mercurialplugin.h", "mercurialsettings.cpp", "mercurialsettings.h", + "mercurialtr.h", "revertdialog.cpp", "revertdialog.h", "srcdestdialog.cpp", diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager.h index ee3826e692b..0bb81c753b3 100644 --- a/src/plugins/mesonprojectmanager/mesonactionsmanager.h +++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.h @@ -3,10 +3,10 @@ #pragma once -#include "mesonprojectmanagertr.h" - #include +#include + namespace MesonProjectManager { namespace Internal { @@ -14,8 +14,8 @@ class MesonActionsManager : public QObject { Q_OBJECT Utils::ParameterAction buildTargetContextAction{ - ::MesonProjectManager::Tr::tr("Build"), - ::MesonProjectManager::Tr::tr("Build \"%1\""), + QCoreApplication::translate("::MesonProjectManager", "Build"), + QCoreApplication::translate("::MesonProjectManager", "Build \"%1\""), Utils::ParameterAction::AlwaysEnabled /*handled manually*/ }; QAction configureActionMenu; diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs index 8334e6de0a3..9de8b4ccde9 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs +++ b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs @@ -63,6 +63,7 @@ Project { "mesonproject.h", "mesonprojectimporter.cpp", "mesonprojectimporter.h", + "mesonprojectmanagertr.h", "mesonprojectparser.cpp", "mesonprojectparser.h", "mesonrunconfiguration.cpp", diff --git a/src/plugins/nim/nim.qbs b/src/plugins/nim/nim.qbs index 42bc669518a..34a20473b8f 100644 --- a/src/plugins/nim/nim.qbs +++ b/src/plugins/nim/nim.qbs @@ -15,9 +15,10 @@ QtcPlugin { Group { name: "General" files: [ - "nimplugin.cpp", "nimplugin.h", - "nimconstants.h", "nim.qrc", + "nimconstants.h", + "nimplugin.cpp", "nimplugin.h", + "nimtr.h", ] } diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h index f826348d820..21e00d5e754 100644 --- a/src/plugins/nim/nimconstants.h +++ b/src/plugins/nim/nimconstants.h @@ -52,7 +52,7 @@ const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY[] = "Z.Nim"; const char C_NIMTOOLSSETTINGSPAGE_ID[] = "Nim.NimToolsSettings"; const char C_NIMTOOLSSETTINGSPAGE_CATEGORY[] = "Z.Nim"; -const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("Nim", "Nim"); +const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("::Nim", "Nim"); const char C_NIMGLOBALCODESTYLE_ID[] = "NimGlobal"; const QString C_NIMSNIPPETSGROUP_ID = QStringLiteral("Nim.NimSnippetsGroup"); diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs index 6d2e7ca0be3..cbf35b1efaf 100644 --- a/src/plugins/perforce/perforce.qbs +++ b/src/plugins/perforce/perforce.qbs @@ -28,6 +28,7 @@ QtcPlugin { "perforcesubmiteditor.cpp", "perforcesubmiteditor.h", "perforcesubmiteditorwidget.cpp", - "perforcesubmiteditorwidget.h" + "perforcesubmiteditorwidget.h", + "perforcetr.h", ] } diff --git a/src/plugins/perfprofiler/perfoptionspage.cpp b/src/plugins/perfprofiler/perfoptionspage.cpp index 0ca8230b13f..c67d18d63f7 100644 --- a/src/plugins/perfprofiler/perfoptionspage.cpp +++ b/src/plugins/perfprofiler/perfoptionspage.cpp @@ -16,7 +16,7 @@ PerfOptionsPage::PerfOptionsPage(PerfSettings *settings) setId(Constants::PerfSettingsId); setDisplayName(Tr::tr("CPU Usage")); setCategory("T.Analyzer"); - setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); + setDisplayCategory(QCoreApplication::translate("::Debugger", "Analyzer")); setCategoryIconPath(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); setWidgetCreator([settings] { return new PerfConfigWidget(settings); }); } diff --git a/src/plugins/perfprofiler/perfprofilerplugin.cpp b/src/plugins/perfprofiler/perfprofilerplugin.cpp index 12c006b48d4..1293d84f436 100644 --- a/src/plugins/perfprofiler/perfprofilerplugin.cpp +++ b/src/plugins/perfprofiler/perfprofilerplugin.cpp @@ -12,24 +12,6 @@ # include "tests/perfresourcecounter_test.h" #endif // WITH_TESTS -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include using namespace ProjectExplorer; @@ -58,6 +40,11 @@ PerfProfilerPlugin::~PerfProfilerPlugin() void PerfProfilerPlugin::initialize() { d = new PerfProfilerPluginPrivate; + +#if WITH_TESTS +// addTest(); // FIXME these tests have to get rewritten + addTest(); +#endif // WITH_TESTS } PerfSettings *PerfProfilerPlugin::globalSettings() @@ -65,14 +52,4 @@ PerfSettings *PerfProfilerPlugin::globalSettings() return perfGlobalSettings(); } -QVector PerfProfilerPlugin::createTestObjects() const -{ - QVector tests; -#if WITH_TESTS -// tests << new PerfProfilerTraceFileTest; // FIXME these tests have to get rewritten - tests << new PerfResourceCounterTest; -#endif // WITH_TESTS - return tests; -} - } // PerfProfiler::Internal diff --git a/src/plugins/perfprofiler/perfprofilerplugin.h b/src/plugins/perfprofiler/perfprofilerplugin.h index d65281189d6..afb6ea0936d 100644 --- a/src/plugins/perfprofiler/perfprofilerplugin.h +++ b/src/plugins/perfprofiler/perfprofilerplugin.h @@ -18,7 +18,6 @@ public: ~PerfProfilerPlugin(); void initialize() final; - QVector createTestObjects() const final; static PerfSettings *globalSettings(); diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp index 1d2fd90629d..d14bfb87cde 100644 --- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp +++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp @@ -5,6 +5,7 @@ #include "perfdatareader.h" #include "perfprofilertool.h" +#include "perfprofilertr.h" #include "perfrunconfigurationaspect.h" #include "perfsettings.h" diff --git a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp index fbe0d84e8fa..5765afb135d 100644 --- a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp +++ b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp @@ -12,19 +12,19 @@ namespace PerfProfiler { namespace Internal { static const char *headerLabels[] = { - QT_TRANSLATE_NOOP("PerfProfiler", "Address"), - QT_TRANSLATE_NOOP("PerfProfiler", "Function"), - QT_TRANSLATE_NOOP("PerfProfiler", "Source Location"), - QT_TRANSLATE_NOOP("PerfProfiler", "Binary Location"), - QT_TRANSLATE_NOOP("PerfProfiler", "Caller"), - QT_TRANSLATE_NOOP("PerfProfiler", "Callee"), - QT_TRANSLATE_NOOP("PerfProfiler", "Occurrences"), - QT_TRANSLATE_NOOP("PerfProfiler", "Occurrences in Percent"), - QT_TRANSLATE_NOOP("PerfProfiler", "Recursion in Percent"), - QT_TRANSLATE_NOOP("PerfProfiler", "Samples"), - QT_TRANSLATE_NOOP("PerfProfiler", "Samples in Percent"), - QT_TRANSLATE_NOOP("PerfProfiler", "Self Samples"), - QT_TRANSLATE_NOOP("PerfProfiler", "Self in Percent") + QT_TRANSLATE_NOOP("::PerfProfiler", "Address"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Function"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Source Location"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Binary Location"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Caller"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Callee"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Occurrences"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Occurrences in Percent"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Recursion in Percent"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Samples"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Samples in Percent"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Self Samples"), + QT_TRANSLATE_NOOP("::PerfProfiler", "Self in Percent") }; Q_STATIC_ASSERT(sizeof(headerLabels) == diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 4a215e9099b..d4515f79b85 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -1,10 +1,12 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +#include "perfprofilertool.h" + #include "perfconfigwidget.h" #include "perfloaddialog.h" #include "perfprofilerplugin.h" -#include "perfprofilertool.h" +#include "perfprofilertr.h" #include "perfsettings.h" #include "perftracepointdialog.h" diff --git a/src/plugins/perfprofiler/perfprofilertool.h b/src/plugins/perfprofiler/perfprofilertool.h index 4a0e258da98..0f158083a18 100644 --- a/src/plugins/perfprofiler/perfprofilertool.h +++ b/src/plugins/perfprofiler/perfprofilertool.h @@ -6,7 +6,6 @@ #include "perfprofilerconstants.h" #include "perfprofilerflamegraphview.h" #include "perfprofilerstatisticsview.h" -#include "perfprofilertr.h" #include "perfprofilertraceview.h" #include "perftimelinemodelmanager.h" @@ -84,7 +83,8 @@ private: void finalize(); Utils::Perspective m_perspective{Constants::PerfProfilerPerspectiveId, - ::PerfProfiler::Tr::tr("Performance Analyzer")}; + QCoreApplication::translate("::PerfProfiler", + "Performance Analyzer")}; QAction *m_startAction = nullptr; QAction *m_stopAction = nullptr; diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 0cb06abaee3..518d2842c8b 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -51,7 +51,6 @@ add_qtc_plugin(ProjectExplorer devicesupport/desktopprocesssignaloperation.cpp devicesupport/desktopprocesssignaloperation.h devicesupport/devicecheckbuildstep.cpp devicesupport/devicecheckbuildstep.h devicesupport/devicefactoryselectiondialog.cpp devicesupport/devicefactoryselectiondialog.h - devicesupport/devicefilesystemmodel.cpp devicesupport/devicefilesystemmodel.h devicesupport/devicemanager.cpp devicesupport/devicemanager.h devicesupport/devicemanagermodel.cpp devicesupport/devicemanagermodel.h devicesupport/deviceprocessesdialog.cpp devicesupport/deviceprocessesdialog.h diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 4a78ccfd0f4..d04af1516a0 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -15,6 +15,7 @@ #include "projectexplorer.h" #include "projectexplorerconstants.h" #include "projectexplorersettings.h" +#include "projectexplorertr.h" #include "runcontrol.h" #include "session.h" #include "target.h" diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index ae711e15ee6..6efd41a34ff 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -6,11 +6,11 @@ #include "buildstep.h" #include "projectexplorersettings.h" -#include "projectexplorertr.h" #include #include +#include QT_BEGIN_NAMESPACE class QToolButton; @@ -36,7 +36,8 @@ public: QWidget *outputWidget(QWidget *) override; QList toolBarWidgets() const override; - QString displayName() const override { return Tr::tr("Compile Output"); } + QString displayName() const override { + return QCoreApplication::translate("::ProjectExplorer","Compile Output"); } int priorityInStatusBar() const override; void clearContents() override; bool canFocus() const override; diff --git a/src/plugins/projectexplorer/deploymentdata.cpp b/src/plugins/projectexplorer/deploymentdata.cpp index 07894b2a249..28626babab0 100644 --- a/src/plugins/projectexplorer/deploymentdata.cpp +++ b/src/plugins/projectexplorer/deploymentdata.cpp @@ -48,11 +48,12 @@ bool DeploymentData::operator==(const DeploymentData &other) const && m_localInstallRoot == other.m_localInstallRoot; } -QString DeploymentData::addFilesFromDeploymentFile(const QString &deploymentFilePath, - const QString &sourceDir) +QString DeploymentData::addFilesFromDeploymentFile(const FilePath &deploymentFilePath, + const FilePath &sourceDir_) { + const QString sourceDir = sourceDir_.toString(); const QString sourcePrefix = sourceDir.endsWith('/') ? sourceDir : sourceDir + '/'; - QFile deploymentFile(deploymentFilePath); + QFile deploymentFile(deploymentFilePath.toString()); QTextStream deploymentStream; QString deploymentPrefix; diff --git a/src/plugins/projectexplorer/deploymentdata.h b/src/plugins/projectexplorer/deploymentdata.h index 522b40d153b..9ffffb0885b 100644 --- a/src/plugins/projectexplorer/deploymentdata.h +++ b/src/plugins/projectexplorer/deploymentdata.h @@ -34,7 +34,7 @@ public: void addFile(const DeployableFile &file); void addFile(const Utils::FilePath &localFilePath, const QString &remoteDirectory, DeployableFile::Type type = DeployableFile::TypeNormal); - QString addFilesFromDeploymentFile(const QString &deploymentFilePath, const QString &sourceDir); + QString addFilesFromDeploymentFile(const Utils::FilePath &deploymentFilePath, const Utils::FilePath &sourceDir); int fileCount() const { return m_files.count(); } DeployableFile fileAt(int index) const { return m_files.at(index); } diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp index 57984a6b11c..a09c8bac76d 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp @@ -77,7 +77,7 @@ static void startTerminalEmulator(const QString &workingDir, const Environment & #else const TerminalCommand term = TerminalCommand::terminalEmulator(); QProcess process; - process.setProgram(term.command); + process.setProgram(term.command.nativePath()); process.setArguments(ProcessArgs::splitArgs(term.openArgs)); process.setProcessEnvironment(env.toProcessEnvironment()); process.setWorkingDirectory(workingDir); diff --git a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp deleted file mode 100644 index abf52223b14..00000000000 --- a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp +++ /dev/null @@ -1,300 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "devicefilesystemmodel.h" - -#include "idevice.h" -#include "../projectexplorertr.h" - -#include -#include -#include -#include - -#include -#include -#include -#include - -using namespace Utils; - -namespace ProjectExplorer { -namespace Internal { - -enum class FileType { - File, - Dir, -// Link, - Other -}; - - -class RemoteDirNode; -class RemoteFileNode -{ -public: - virtual ~RemoteFileNode() = default; - - FilePath m_filePath; - FileType m_fileType = FileType::File; - RemoteDirNode *m_parent = nullptr; -}; - -class RemoteDirNode : public RemoteFileNode -{ -public: - RemoteDirNode() { m_fileType = FileType::Dir; } - ~RemoteDirNode() { qDeleteAll(m_children); } - - enum { Initial, Fetching, Finished } m_state = Initial; - QList m_children; -}; - -static RemoteFileNode *indexToFileNode(const QModelIndex &index) -{ - return static_cast(index.internalPointer()); -} - -static RemoteDirNode *indexToDirNode(const QModelIndex &index) -{ - RemoteFileNode * const fileNode = indexToFileNode(index); - QTC_CHECK(fileNode); - return dynamic_cast(fileNode); -} - -using ResultType = QList>; - -class DeviceFileSystemModelPrivate -{ -public: - IDevice::ConstPtr m_device; - std::unique_ptr m_rootNode; - QSet *> m_watchers; - FutureSynchronizer m_futureSynchronizer; -}; - -} // namespace Internal - -using namespace Internal; - -DeviceFileSystemModel::DeviceFileSystemModel(QObject *parent) - : QAbstractItemModel(parent), d(new DeviceFileSystemModelPrivate) -{ - d->m_futureSynchronizer.setCancelOnWait(true); -} - -DeviceFileSystemModel::~DeviceFileSystemModel() -{ - qDeleteAll(d->m_watchers); - delete d; -} - -void DeviceFileSystemModel::setDevice(const IDevice::ConstPtr &device) -{ - d->m_device = device; -} - -bool DeviceFileSystemModel::canFetchMore(const QModelIndex &parent) const -{ - if (!parent.isValid()) { - return !d->m_rootNode.get(); - } - - RemoteDirNode * const dirNode = indexToDirNode(parent); - if (!dirNode) - return false; - if (dirNode->m_state == RemoteDirNode::Initial) - return true; - return false; -} - -void DeviceFileSystemModel::fetchMore(const QModelIndex &parent) -{ - if (!parent.isValid()) { - beginInsertRows(QModelIndex(), 0, 0); - QTC_CHECK(!d->m_rootNode); - d->m_rootNode.reset(new RemoteDirNode); - d->m_rootNode->m_filePath = d->m_device->rootPath(); - endInsertRows(); - return; - } - RemoteDirNode * const dirNode = indexToDirNode(parent); - if (!dirNode) - return; - if (dirNode->m_state != RemoteDirNode::Initial) - return; - collectEntries(dirNode->m_filePath, dirNode); - dirNode->m_state = RemoteDirNode::Fetching; -} - -bool DeviceFileSystemModel::hasChildren(const QModelIndex &parent) const -{ - if (!parent.isValid()) - return true; - - RemoteDirNode * const dirNode = indexToDirNode(parent); - if (!dirNode) - return false; - if (dirNode->m_state == RemoteDirNode::Initial) - return true; - return dirNode->m_children.size(); -} - -int DeviceFileSystemModel::columnCount(const QModelIndex &parent) const -{ - Q_UNUSED(parent) - return 2; // type + name -} - -QVariant DeviceFileSystemModel::data(const QModelIndex &index, int role) const -{ - const RemoteFileNode * const node = indexToFileNode(index); - QTC_ASSERT(node, return QVariant()); - if (index.column() == 0 && role == Qt::DecorationRole) { - if (node->m_fileType == FileType::File) - return Utils::Icons::UNKNOWN_FILE.icon(); - if (node->m_fileType == FileType::Dir) - return Utils::Icons::DIR.icon(); - return Utils::Icons::HELP.icon(); // Shows a question mark. - } - if (index.column() == 1) { - if (role == Qt::DisplayRole) { - if (node->m_filePath == d->m_device->rootPath()) - return QString("/"); - return node->m_filePath.fileName(); - } - if (role == PathRole) - return node->m_filePath.toVariant(); - } - return QVariant(); -} - -Qt::ItemFlags DeviceFileSystemModel::flags(const QModelIndex &index) const -{ - if (!index.isValid()) - return Qt::NoItemFlags; - return Qt::ItemIsSelectable | Qt::ItemIsEnabled; -} - -QVariant DeviceFileSystemModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (orientation != Qt::Horizontal) - return QVariant(); - if (role != Qt::DisplayRole) - return QVariant(); - if (section == 0) - return Tr::tr("File Type"); - if (section == 1) - return Tr::tr("File Name"); - return QVariant(); -} - -QModelIndex DeviceFileSystemModel::index(int row, int column, const QModelIndex &parent) const -{ - if (row < 0 || row >= rowCount(parent) || column < 0 || column >= columnCount(parent)) - return QModelIndex(); - if (!d->m_rootNode) - return QModelIndex(); - if (!parent.isValid()) - return createIndex(row, column, d->m_rootNode.get()); - const RemoteDirNode * const parentNode = indexToDirNode(parent); - QTC_ASSERT(parentNode, return QModelIndex()); - QTC_ASSERT(row < parentNode->m_children.count(), return QModelIndex()); - RemoteFileNode * const childNode = parentNode->m_children.at(row); - return createIndex(row, column, childNode); -} - -QModelIndex DeviceFileSystemModel::parent(const QModelIndex &child) const -{ - if (!child.isValid()) // Don't assert on this, since the model tester tries it. - return QModelIndex(); - - const RemoteFileNode * const childNode = indexToFileNode(child); - QTC_ASSERT(childNode, return QModelIndex()); - if (childNode == d->m_rootNode.get()) - return QModelIndex(); - RemoteDirNode * const parentNode = childNode->m_parent; - if (parentNode == d->m_rootNode.get()) - return createIndex(0, 0, d->m_rootNode.get()); - const RemoteDirNode * const grandParentNode = parentNode->m_parent; - QTC_ASSERT(grandParentNode, return QModelIndex()); - return createIndex(grandParentNode->m_children.indexOf(parentNode), 0, parentNode); -} - -static FileType fileType(const FilePath &path) -{ - if (path.isDir()) - return FileType::Dir; - if (path.isFile()) - return FileType::File; - return FileType::Other; -} - -static void dirEntries(QFutureInterface &futureInterface, const FilePath &dir) -{ - const FilePaths entries = dir.dirEntries(QDir::NoFilter); - ResultType result; - for (const FilePath &entry : entries) { - if (futureInterface.isCanceled()) - return; - result.push_back({entry, fileType(entry)}); - } - futureInterface.reportResult(result); -} - -int DeviceFileSystemModel::rowCount(const QModelIndex &parent) const -{ - if (!d->m_rootNode) - return 0; - if (!parent.isValid()) - return 1; - if (parent.column() != 0) - return 0; - RemoteDirNode * const dirNode = indexToDirNode(parent); - if (!dirNode) - return 0; - return dirNode->m_children.count(); -} - -void DeviceFileSystemModel::collectEntries(const FilePath &filePath, RemoteDirNode *parentNode) -{ - // Destructor of this will delete working watchers, as they are children of this. - QFutureWatcher *watcher = new QFutureWatcher(this); - auto future = runAsync(dirEntries, filePath); - d->m_futureSynchronizer.addFuture(future); - connect(watcher, &QFutureWatcher::finished, this, [this, watcher, parentNode] { - auto cleanup = qScopeGuard([watcher, this] { - d->m_watchers.remove(watcher); - watcher->deleteLater(); - }); - - QTC_ASSERT(parentNode->m_state == RemoteDirNode::Fetching, return); - parentNode->m_state = RemoteDirNode::Finished; - - const ResultType entries = watcher->result(); - if (entries.isEmpty()) - return; - - const int row = parentNode->m_parent - ? parentNode->m_parent->m_children.indexOf(parentNode) : 0; - const QModelIndex parentIndex = createIndex(row, 0, parentNode); - beginInsertRows(parentIndex, 0, entries.count() - 1); - - for (const QPair &entry : entries) { - RemoteFileNode *childNode = nullptr; - if (entry.second == FileType::Dir) - childNode = new RemoteDirNode; - else - childNode = new RemoteFileNode; - childNode->m_filePath = entry.first; - childNode->m_fileType = entry.second; - childNode->m_parent = parentNode; - parentNode->m_children.append(childNode); - } - endInsertRows(); - }); - d->m_watchers.insert(watcher); - watcher->setFuture(future); -} - -} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h deleted file mode 100644 index a972aa971f5..00000000000 --- a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include "../projectexplorer_export.h" -#include "idevicefwd.h" - -#include - -namespace Utils { class FilePath; } - -namespace ProjectExplorer { - -namespace Internal { -class DeviceFileSystemModelPrivate; -class RemoteDirNode; -} - -// Very simple read-only model. Symbolic links are not followed. -class PROJECTEXPLORER_EXPORT DeviceFileSystemModel : public QAbstractItemModel -{ - Q_OBJECT -public: - explicit DeviceFileSystemModel(QObject *parent = nullptr); - ~DeviceFileSystemModel(); - - void setDevice(const IDeviceConstPtr &device); - - // Use this to get the full path of a file or directory. - static const int PathRole = Qt::UserRole; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - -private: - bool canFetchMore(const QModelIndex &parent) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; - void fetchMore(const QModelIndex &parent) override; - Qt::ItemFlags flags(const QModelIndex &index) const override; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - QModelIndex parent(const QModelIndex &child) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - - void collectEntries(const Utils::FilePath &filePath, Internal::RemoteDirNode *parentNode); - - Internal::DeviceFileSystemModelPrivate * const d; -}; - -} // namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/extraabi.cpp b/src/plugins/projectexplorer/extraabi.cpp index f4505d10019..24a28611033 100644 --- a/src/plugins/projectexplorer/extraabi.cpp +++ b/src/plugins/projectexplorer/extraabi.cpp @@ -4,6 +4,7 @@ #include "extraabi.h" #include "abi.h" +#include "projectexplorertr.h" #include @@ -39,8 +40,7 @@ public: }; AbiFlavorAccessor::AbiFlavorAccessor() : - UpgradingSettingsAccessor("QtCreatorExtraAbi", - QCoreApplication::translate("ProjectExplorer::ToolChainManager", "ABI"), + UpgradingSettingsAccessor("QtCreatorExtraAbi", Tr::tr("ABI"), Core::Constants::IDE_DISPLAY_NAME) { setBaseFilePath(Core::ICore::installerResourcePath("abi.xml")); diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 0afa0b399bb..e65cc1bdc3f 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -112,6 +112,7 @@ Project { "projectexplorericons.h", "projectexplorericons.cpp", "projectexplorersettings.h", "projectexplorersettingspage.cpp", "projectexplorersettingspage.h", + "projectexplorertr.h", "projectfilewizardextension.cpp", "projectfilewizardextension.h", "projectimporter.cpp", "projectimporter.h", "projectmacro.cpp", "projectmacro.h", @@ -211,7 +212,6 @@ Project { "desktopdevicefactory.cpp", "desktopdevicefactory.h", "devicecheckbuildstep.cpp", "devicecheckbuildstep.h", "devicefactoryselectiondialog.cpp", "devicefactoryselectiondialog.h", - "devicefilesystemmodel.cpp", "devicefilesystemmodel.h", "devicemanager.cpp", "devicemanager.h", "devicemanagermodel.cpp", "devicemanagermodel.h", "deviceprocessesdialog.cpp", "deviceprocessesdialog.h", diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h index 778c6af560a..a4e039f0706 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.h +++ b/src/plugins/projectexplorer/projectwelcomepage.h @@ -5,13 +5,12 @@ #include "projectexplorer.h" -#include "projectexplorertr.h" - #include #include #include +#include namespace ProjectExplorer { namespace Internal { @@ -44,7 +43,7 @@ class ProjectWelcomePage : public Core::IWelcomePage public: ProjectWelcomePage(); - QString title() const override { return Tr::tr("Projects"); } + QString title() const override { return QCoreApplication::translate("::ProjectExplorer", "Projects"); } int priority() const override { return 20; } Utils::Id id() const override; QWidget *createWidget() const override; diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index 841bfb5d4e9..da839e89f19 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -65,7 +65,7 @@ public: bool isClickable() const override; void clicked() override; - void updateFileName(const FilePath &fileName) override; + void updateFilePath(const FilePath &fileName) override; void updateLineNumber(int lineNumber) override; void removedFromEditor() override; private: @@ -78,10 +78,10 @@ void TaskMark::updateLineNumber(int lineNumber) TextMark::updateLineNumber(lineNumber); } -void TaskMark::updateFileName(const FilePath &fileName) +void TaskMark::updateFilePath(const FilePath &fileName) { TaskHub::updateTaskFileName(m_task, fileName.toString()); - TextMark::updateFileName(FilePath::fromString(fileName.toString())); + TextMark::updateFilePath(FilePath::fromString(fileName.toString())); } void TaskMark::removedFromEditor() diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs index 0f6de6c58e2..9f8288cb11a 100644 --- a/src/plugins/python/python.qbs +++ b/src/plugins/python/python.qbs @@ -46,6 +46,7 @@ QtcPlugin { "pythonscanner.h", "pythonsettings.cpp", "pythonsettings.h", + "pythontr.h", "pythonutils.cpp", "pythonutils.h", ] diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index 70c7b2e853b..124b4819400 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h @@ -71,7 +71,7 @@ const char XCODE_SDK[] = "xcode.sdk"; // Settings page const char QBS_SETTINGS_CATEGORY[] = "K.Qbs"; -const char QBS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("QbsProjectManager", "Qbs"); +const char QBS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("::QbsProjectManager", "Qbs"); const char QBS_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/build.png"; const char QBS_PROFILING_ENV[] = "QTC_QBS_PROFILING"; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index bc83a7fd57b..779d175b80f 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -689,7 +690,7 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath, if (type == BuildConfiguration::Release) { //: The name of the release build configuration created by default for a qmake project. - info.displayName = BuildConfigurationTr::tr("Release"); + info.displayName = ::ProjectExplorer::Tr::tr("Release"); //: Non-ASCII characters in directory suffix may cause build issues. suffix = Tr::tr("Release", "Shadow build directory suffix"); if (settings.qtQuickCompiler.value() == TriState::Default) { @@ -699,12 +700,12 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath, } else { if (type == BuildConfiguration::Debug) { //: The name of the debug build configuration created by default for a qmake project. - info.displayName = BuildConfigurationTr::tr("Debug"); + info.displayName = ::ProjectExplorer::Tr::tr("Debug"); //: Non-ASCII characters in directory suffix may cause build issues. suffix = Tr::tr("Debug", "Shadow build directory suffix"); } else if (type == BuildConfiguration::Profile) { //: The name of the profile build configuration created by default for a qmake project. - info.displayName = BuildConfigurationTr::tr("Profile"); + info.displayName = ::ProjectExplorer::Tr::tr("Profile"); //: Non-ASCII characters in directory suffix may cause build issues. suffix = Tr::tr("Profile", "Shadow build directory suffix"); if (settings.separateDebugInfo.value() == TriState::Default) diff --git a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp index 7d9eee58e3a..ab84b1ce37e 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp @@ -41,19 +41,19 @@ public: }; const FileTypeDataStorage fileTypeDataStorage[] = { - { FileType::Header, QT_TRANSLATE_NOOP("QmakeProjectManager", "Headers"), + { FileType::Header, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Headers"), ProjectExplorer::Constants::FILEOVERLAY_H, "*.h; *.hh; *.hpp; *.hxx;"}, - { FileType::Source, QT_TRANSLATE_NOOP("QmakeProjectManager", "Sources"), + { FileType::Source, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Sources"), ProjectExplorer::Constants::FILEOVERLAY_CPP, "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" }, - { FileType::Form, QT_TRANSLATE_NOOP("QmakeProjectManager", "Forms"), + { FileType::Form, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Forms"), ProjectExplorer::Constants::FILEOVERLAY_UI, "*.ui;" }, - { FileType::StateChart, QT_TRANSLATE_NOOP("QmakeProjectManager", "State charts"), + { FileType::StateChart, QT_TRANSLATE_NOOP("::QmakeProjectManager", "State charts"), ProjectExplorer::Constants::FILEOVERLAY_SCXML, "*.scxml;" }, - { FileType::Resource, QT_TRANSLATE_NOOP("QmakeProjectManager", "Resources"), + { FileType::Resource, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Resources"), ProjectExplorer::Constants::FILEOVERLAY_QRC, "*.qrc;" }, - { FileType::QML, QT_TRANSLATE_NOOP("QmakeProjectManager", "QML"), + { FileType::QML, QT_TRANSLATE_NOOP("::QmakeProjectManager", "QML"), ProjectExplorer::Constants::FILEOVERLAY_QML, "*.qml;" }, - { FileType::Unknown, QT_TRANSLATE_NOOP("QmakeProjectManager", "Other files"), + { FileType::Unknown, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Other files"), ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN, "*;" } }; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h index 3f1361e3b09..1eb7ca38fcf 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h @@ -12,9 +12,4 @@ struct Tr Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager) }; -struct BuildConfigurationTr -{ - Q_DECLARE_TR_FUNCTIONS(::BuildConfiguration) -}; - } // namespace QmakeProjectManager diff --git a/src/plugins/qmldesigner/components/componentcore/designericons.cpp b/src/plugins/qmldesigner/components/componentcore/designericons.cpp index c372c38d644..2af0709c3ae 100644 --- a/src/plugins/qmldesigner/components/componentcore/designericons.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designericons.cpp @@ -79,21 +79,6 @@ EType DesignerIconEnums::value(const QString &keyStr, bool *ok) return static_cast(metaEnum.keyToValue(keyStr.toLatin1(), ok)); } -Q_GLOBAL_STATIC(QStringList, _iconFontMandatoryKeys); - -const QStringList & iconFontMandatoryKeys() -{ - if (_iconFontMandatoryKeys->isEmpty()) { - *_iconFontMandatoryKeys - << DesignerIconEnums::keyName - << DesignerIconEnums::keyName - << DesignerIconEnums::keyName - << DesignerIconEnums::keyName - << "size"; - } - return *_iconFontMandatoryKeys; -} - QJsonObject mergeJsons(const QJsonObject &prior, const QJsonObject &joiner) { QJsonObject object = prior; diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp index 6ef9a21f992..98713d1a367 100644 --- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp +++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp @@ -58,24 +58,22 @@ public: setDescription(Tr::tr("Move Component into Separate File")); } - Operation(const QSharedPointer &interface, - UiObjectDefinition *objDef) - : QmlJSQuickFixOperation(interface, 0), - m_idName(idOfObject(objDef)), - m_firstSourceLocation(objDef->firstSourceLocation()), - m_lastSourceLocation(objDef->lastSourceLocation()), - m_initializer(objDef->initializer) + Operation(const Internal::QmlJSQuickFixAssistInterface *interface, UiObjectDefinition *objDef) + : QmlJSQuickFixOperation(interface, 0) + , m_idName(idOfObject(objDef)) + , m_firstSourceLocation(objDef->firstSourceLocation()) + , m_lastSourceLocation(objDef->lastSourceLocation()) + , m_initializer(objDef->initializer) { init(); } - Operation(const QSharedPointer &interface, - UiObjectBinding *objDef) - : QmlJSQuickFixOperation(interface, 0), - m_idName(idOfObject(objDef)), - m_firstSourceLocation(objDef->qualifiedTypeNameId->firstSourceLocation()), - m_lastSourceLocation(objDef->lastSourceLocation()), - m_initializer(objDef->initializer) + Operation(const Internal::QmlJSQuickFixAssistInterface *interface, UiObjectBinding *objDef) + : QmlJSQuickFixOperation(interface, 0) + , m_idName(idOfObject(objDef)) + , m_firstSourceLocation(objDef->qualifiedTypeNameId->firstSourceLocation()) + , m_lastSourceLocation(objDef->lastSourceLocation()) + , m_initializer(objDef->initializer) { init(); } @@ -223,7 +221,7 @@ public: } // end of anonymous namespace -void matchComponentFromObjectDefQuickFix(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) +void matchComponentFromObjectDefQuickFix(const QmlJSQuickFixAssistInterface *interface, QuickFixOperations &result) { const int pos = interface->currentFile()->cursor().position(); @@ -254,8 +252,7 @@ void performComponentFromObjectDef(const QString &fileName, QmlJS::AST::UiObject QmlJS::ModelManagerInterface::instance()->snapshot()); QmlJSRefactoringFilePtr current = refactoring.file(Utils::FilePath::fromString(fileName)); - QmlJSQuickFixInterface interface; - Operation operation(interface, objDef); + Operation operation(nullptr, objDef); operation.performChanges(current, refactoring); } diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h index c27fce2dc18..8ac708aed2e 100644 --- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h +++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h @@ -8,8 +8,8 @@ namespace QmlJSEditor { -QMLJSEDITOR_EXPORT void matchComponentFromObjectDefQuickFix - (const QmlJSQuickFixInterface &interface, QuickFixOperations &result); +QMLJSEDITOR_EXPORT void matchComponentFromObjectDefQuickFix( + const Internal::QmlJSQuickFixAssistInterface *interface, QuickFixOperations &result); QMLJSEDITOR_EXPORT void performComponentFromObjectDef (const QString &fileName, QmlJS::AST::UiObjectDefinition *objDef); diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 84f303ec188..884670c4faf 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -244,7 +244,7 @@ void QmlJSEditorPluginPrivate::reformatFile() QmlJsEditingSettings::get().formatCommandOptions()); const CommandLine commandLine(exe, args, CommandLine::Raw); TextEditor::Command command; - command.setExecutable(commandLine.executable().toString()); + command.setExecutable(commandLine.executable()); command.setProcessing(TextEditor::Command::FileProcessing); command.addOptions(commandLine.splitArguments()); command.addOption("--inplace"); diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h index 93804936417..9ebd457b57a 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.h +++ b/src/plugins/qmljseditor/qmljshoverhandler.h @@ -24,8 +24,6 @@ class QmlJSEditorWidget; class QMLJSEDITOR_EXPORT QmlJSHoverHandler : public TextEditor::BaseHoverHandler { - Q_DECLARE_TR_FUNCTIONS(QmlJSHoverHandler) - public: QmlJSHoverHandler(); diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp index 8c55f1e2908..65840389158 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.cpp +++ b/src/plugins/qmljseditor/qmljsquickfix.cpp @@ -2,8 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmljsquickfix.h" -#include "qmljscomponentfromobjectdef.h" -#include "qmljseditor.h" #include "qmljsquickfixassist.h" #include @@ -23,30 +21,29 @@ namespace QmlJSEditor { using namespace Internal; -QmlJSQuickFixOperation::QmlJSQuickFixOperation(const QmlJSQuickFixInterface &interface, +QmlJSQuickFixOperation::QmlJSQuickFixOperation(const QmlJSQuickFixAssistInterface *interface, int priority) : QuickFixOperation(priority) - , m_interface(interface) + , m_semanticInfo(interface->semanticInfo()) { } void QmlJSQuickFixOperation::perform() { - QmlJSRefactoringChanges refactoring(ModelManagerInterface::instance(), - m_interface->semanticInfo().snapshot); + QmlJSRefactoringChanges refactoring(ModelManagerInterface::instance(), semanticInfo().snapshot); QmlJSRefactoringFilePtr current = refactoring.file(fileName()); performChanges(current, refactoring); } -const QmlJSQuickFixAssistInterface *QmlJSQuickFixOperation::assistInterface() const +const QmlJSTools::SemanticInfo &QmlJSQuickFixOperation::semanticInfo() const { - return m_interface.data(); + return m_semanticInfo; } Utils::FilePath QmlJSQuickFixOperation::fileName() const { - return m_interface->semanticInfo().document->fileName(); + return semanticInfo().document->fileName(); } } // namespace QmlJSEditor diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h index 498d07499e0..643334a94c7 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.h +++ b/src/plugins/qmljseditor/qmljsquickfix.h @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -14,7 +15,6 @@ namespace QmlJSEditor { namespace Internal { class QmlJSQuickFixAssistInterface; } -using QmlJSQuickFixInterface = QSharedPointer; using TextEditor::QuickFixOperation; using TextEditor::QuickFixOperations; using TextEditor::QuickFixInterface; @@ -31,7 +31,8 @@ public: \param interface The interface on which the operation is performed. \param priority The priority for this operation. */ - explicit QmlJSQuickFixOperation(const QmlJSQuickFixInterface &interface, int priority = -1); + explicit QmlJSQuickFixOperation(const Internal::QmlJSQuickFixAssistInterface *interface, + int priority = -1); void perform() override; @@ -41,13 +42,13 @@ protected: virtual void performChanges(QmlJSTools::QmlJSRefactoringFilePtr currentFile, const QmlJSTools::QmlJSRefactoringChanges &refactoring) = 0; - const Internal::QmlJSQuickFixAssistInterface *assistInterface() const; + const QmlJSTools::SemanticInfo &semanticInfo() const; /// \returns The name of the file for for which this operation is invoked. Utils::FilePath fileName() const; private: - QmlJSQuickFixInterface m_interface; + const QmlJSTools::SemanticInfo m_semanticInfo; }; TextEditor::QuickFixOperations findQmlJSQuickFixes(const TextEditor::AssistInterface *interface); diff --git a/src/plugins/qmljseditor/qmljsquickfixes.cpp b/src/plugins/qmljseditor/qmljsquickfixes.cpp index fecee0d5bff..f6baa01509d 100644 --- a/src/plugins/qmljseditor/qmljsquickfixes.cpp +++ b/src/plugins/qmljseditor/qmljsquickfixes.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmljscomponentfromobjectdef.h" -#include "qmljseditor.h" #include "qmljseditortr.h" #include "qmljsquickfix.h" #include "qmljsquickfixassist.h" @@ -42,8 +41,8 @@ class SplitInitializerOperation: public QmlJSQuickFixOperation UiObjectInitializer *_objectInitializer; public: - SplitInitializerOperation(const QSharedPointer &interface, - UiObjectInitializer *objectInitializer) + SplitInitializerOperation(const Internal::QmlJSQuickFixAssistInterface *interface, + UiObjectInitializer *objectInitializer) : QmlJSQuickFixOperation(interface, 0) , _objectInitializer(objectInitializer) { @@ -77,7 +76,8 @@ public: } }; -void matchSplitInitializerQuickFix(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) +void matchSplitInitializerQuickFix(const Internal::QmlJSQuickFixAssistInterface *interface, + QuickFixOperations &result) { UiObjectInitializer *objectInitializer = nullptr; @@ -105,10 +105,8 @@ class AnalysizeMessageSuppressionOperation: public QmlJSQuickFixOperation { StaticAnalysis::Message _message; - Q_DECLARE_TR_FUNCTIONS(AddAnalysisMessageSuppressionComment) - public: - AnalysizeMessageSuppressionOperation(const QSharedPointer &interface, + AnalysizeMessageSuppressionOperation(const Internal::QmlJSQuickFixAssistInterface *interface, const StaticAnalysis::Message &message) : QmlJSQuickFixOperation(interface, 0) , _message(message) @@ -128,7 +126,8 @@ public: } }; -void matchAddAnalysisMessageSuppressionCommentQuickFix(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) +void matchAddAnalysisMessageSuppressionCommentQuickFix( + const Internal::QmlJSQuickFixAssistInterface *interface, QuickFixOperations &result) { const QList &messages = interface->semanticInfo().staticAnalysisMessages; @@ -144,8 +143,7 @@ void matchAddAnalysisMessageSuppressionCommentQuickFix(const QmlJSQuickFixInterf QuickFixOperations findQmlJSQuickFixes(const AssistInterface *interface) { - QSharedPointer assistInterface(interface); - auto qmlJSInterface = assistInterface.staticCast(); + auto qmlJSInterface = static_cast(interface); QuickFixOperations quickFixes; diff --git a/src/plugins/qmljseditor/qmljswrapinloader.cpp b/src/plugins/qmljseditor/qmljswrapinloader.cpp index 9ad59516577..91a762191aa 100644 --- a/src/plugins/qmljseditor/qmljswrapinloader.cpp +++ b/src/plugins/qmljseditor/qmljswrapinloader.cpp @@ -62,13 +62,10 @@ protected: template class Operation: public QmlJSQuickFixOperation { - Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::Internal::Operation) - T *m_objDef; public: - Operation(const QSharedPointer &interface, - T *objDef) + Operation(const QmlJSQuickFixAssistInterface *interface, T *objDef) : QmlJSQuickFixOperation(interface, 0) , m_objDef(objDef) { @@ -82,7 +79,7 @@ public: QString tryName = base; int extraNumber = 1; const ObjectValue *found = nullptr; - const ScopeChain &scope = assistInterface()->semanticInfo().scopeChain(); + const ScopeChain &scope = semanticInfo().scopeChain(); forever { scope.lookup(tryName, &found); if (!found || extraNumber > 1000) @@ -157,7 +154,7 @@ public: } // end of anonymous namespace -void matchWrapInLoaderQuickFix(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) +void matchWrapInLoaderQuickFix(const QmlJSQuickFixAssistInterface *interface, QuickFixOperations &result) { const int pos = interface->currentFile()->cursor().position(); diff --git a/src/plugins/qmljseditor/qmljswrapinloader.h b/src/plugins/qmljseditor/qmljswrapinloader.h index 0d60c07a7ff..13a26a27d08 100644 --- a/src/plugins/qmljseditor/qmljswrapinloader.h +++ b/src/plugins/qmljseditor/qmljswrapinloader.h @@ -7,6 +7,7 @@ namespace QmlJSEditor { -void matchWrapInLoaderQuickFix(const QmlJSQuickFixInterface &interface, QuickFixOperations &result); +void matchWrapInLoaderQuickFix(const Internal::QmlJSQuickFixAssistInterface *interface, + QuickFixOperations &result); } // namespace QmlJSEditor diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index e5dc274640d..d6302e110a7 100644 --- a/src/plugins/qmljstools/qmljstoolsconstants.h +++ b/src/plugins/qmljstools/qmljstoolsconstants.h @@ -17,7 +17,7 @@ const char JS_MIMETYPE[] = "application/javascript"; const char JSON_MIMETYPE[] = "application/json"; const char QML_JS_CODE_STYLE_SETTINGS_ID[] = "A.Code Style"; -const char QML_JS_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Code Style"); +const char QML_JS_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("::QmlJSTools", "Code Style"); const char QML_JS_SETTINGS_ID[] = "QmlJS"; diff --git a/src/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofiler/debugmessagesmodel.cpp index 41bedb9b116..c4ef1ad2571 100644 --- a/src/plugins/qmlprofiler/debugmessagesmodel.cpp +++ b/src/plugins/qmlprofiler/debugmessagesmodel.cpp @@ -27,11 +27,11 @@ QRgb DebugMessagesModel::color(int index) const } static const char *messageTypes[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "Debug Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Warning Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Critical Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Fatal Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Info Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Debug Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Warning Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Critical Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Fatal Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Info Message"), }; QString DebugMessagesModel::messageType(uint i) diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 9817b84240e..af3134a69da 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -22,19 +22,19 @@ namespace QmlProfiler { static const char *ProfileFeatureNames[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "JavaScript"), - QT_TRANSLATE_NOOP("QmlProfiler", "Memory Usage"), - QT_TRANSLATE_NOOP("QmlProfiler", "Pixmap Cache"), - QT_TRANSLATE_NOOP("QmlProfiler", "Scene Graph"), - QT_TRANSLATE_NOOP("QmlProfiler", "Animations"), - QT_TRANSLATE_NOOP("QmlProfiler", "Painting"), - QT_TRANSLATE_NOOP("QmlProfiler", "Compiling"), - QT_TRANSLATE_NOOP("QmlProfiler", "Creating"), - QT_TRANSLATE_NOOP("QmlProfiler", "Binding"), - QT_TRANSLATE_NOOP("QmlProfiler", "Handling Signal"), - QT_TRANSLATE_NOOP("QmlProfiler", "Input Events"), - QT_TRANSLATE_NOOP("QmlProfiler", "Debug Messages"), - QT_TRANSLATE_NOOP("QmlProfiler", "Quick3D") + QT_TRANSLATE_NOOP("::QmlProfiler", "JavaScript"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Memory Usage"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Pixmap Cache"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Scene Graph"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Animations"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Painting"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Compiling"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Creating"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Binding"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Handling Signal"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Input Events"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Debug Messages"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Quick3D") }; Q_STATIC_ASSERT(sizeof(ProfileFeatureNames) == sizeof(char *) * MaximumProfileFeature); @@ -54,7 +54,6 @@ private: class QmlProfilerEventStorage : public Timeline::TraceEventStorage { - Q_DECLARE_TR_FUNCTIONS(QmlProfilerEventStorage) public: using ErrorHandler = std::function; diff --git a/src/plugins/qmlprofiler/quick3dmodel.cpp b/src/plugins/qmlprofiler/quick3dmodel.cpp index b96f125b1c7..03dfe17803c 100644 --- a/src/plugins/qmlprofiler/quick3dmodel.cpp +++ b/src/plugins/qmlprofiler/quick3dmodel.cpp @@ -30,27 +30,27 @@ QRgb Quick3DModel::color(int index) const } static const char *messageTypes[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "Render Frame"), - QT_TRANSLATE_NOOP("QmlProfiler", "Synchronize Frame"), - QT_TRANSLATE_NOOP("QmlProfiler", "Prepare Frame"), - QT_TRANSLATE_NOOP("QmlProfiler", "Mesh Load"), - QT_TRANSLATE_NOOP("QmlProfiler", "Custom Mesh Load"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Load"), - QT_TRANSLATE_NOOP("QmlProfiler", "Generate Shader"), - QT_TRANSLATE_NOOP("QmlProfiler", "Load Shader"), - QT_TRANSLATE_NOOP("QmlProfiler", "Particle Update"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Call"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Pass"), - QT_TRANSLATE_NOOP("QmlProfiler", "Event Data"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Frame"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Synchronize Frame"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Prepare Frame"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Mesh Load"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Custom Mesh Load"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Load"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Generate Shader"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Load Shader"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Particle Update"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Call"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Pass"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Event Data"), - QT_TRANSLATE_NOOP("QmlProfiler", "Mesh Memory consumption"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Memory consumption"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Mesh Memory consumption"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Memory consumption"), }; static const char *unloadMessageTypes[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "Mesh Unload"), - QT_TRANSLATE_NOOP("QmlProfiler", "Custom Mesh Unload"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Unload"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Mesh Unload"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Custom Mesh Unload"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Unload"), }; QString Quick3DModel::messageType(uint i) diff --git a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp index b06ec14745c..395e78cbf7e 100644 --- a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp +++ b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp @@ -15,32 +15,32 @@ namespace QmlProfiler { namespace Internal { static const char *ThreadLabels[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "GUI Thread"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Thread"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Thread Details") + QT_TRANSLATE_NOOP("::QmlProfiler", "GUI Thread"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Thread"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Thread Details") }; static const char *StageLabels[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "Polish"), - QT_TRANSLATE_NOOP("QmlProfiler", "Wait"), - QT_TRANSLATE_NOOP("QmlProfiler", "GUI Thread Sync"), - QT_TRANSLATE_NOOP("QmlProfiler", "Animations"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Thread Sync"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render"), - QT_TRANSLATE_NOOP("QmlProfiler", "Swap"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Preprocess"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Update"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Bind"), - QT_TRANSLATE_NOOP("QmlProfiler", "Render Render"), - QT_TRANSLATE_NOOP("QmlProfiler", "Material Compile"), - QT_TRANSLATE_NOOP("QmlProfiler", "Glyph Render"), - QT_TRANSLATE_NOOP("QmlProfiler", "Glyph Upload"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Bind"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Convert"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Swizzle"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Upload"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Mipmap"), - QT_TRANSLATE_NOOP("QmlProfiler", "Texture Delete") + QT_TRANSLATE_NOOP("::QmlProfiler", "Polish"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Wait"), + QT_TRANSLATE_NOOP("::QmlProfiler", "GUI Thread Sync"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Animations"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Thread Sync"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Swap"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Preprocess"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Update"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Bind"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Render Render"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Material Compile"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Glyph Render"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Glyph Upload"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Bind"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Convert"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Swizzle"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Upload"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Mipmap"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Delete") }; enum SceneGraphCategoryType { diff --git a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp index 7218f7e0b99..321cadc5eb0 100644 --- a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp @@ -50,11 +50,11 @@ void DebugMessagesModelTest::testColor() } static const char *messageTypes[] = { - QT_TRANSLATE_NOOP("QmlProfiler", "Debug Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Warning Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Critical Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Fatal Message"), - QT_TRANSLATE_NOOP("QmlProfiler", "Info Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Debug Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Warning Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Critical Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Fatal Message"), + QT_TRANSLATE_NOOP("::QmlProfiler", "Info Message"), }; void DebugMessagesModelTest::testLabels() diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index acad1ef2ccc..22cee3158b7 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -40,6 +40,7 @@ QtcPlugin { "qnxconfigurationmanager.h", "qnxsettingspage.cpp", "qnxsettingspage.h", + "qnxtr.h", "qnxversionnumber.cpp", "qnxversionnumber.h", "qnxplugin.cpp", diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp index 556a1256f84..6e8877566bf 100644 --- a/src/plugins/qtsupport/profilereader.cpp +++ b/src/plugins/qtsupport/profilereader.cpp @@ -3,6 +3,8 @@ #include "profilereader.h" +#include "qtsupporttr.h" + #include #include @@ -26,7 +28,7 @@ ProMessageHandler::ProMessageHandler(bool verbose, bool exact) : m_verbose(verbose) , m_exact(exact) //: Prefix used for output from the cumulative evaluation of project files. - , m_prefix(QCoreApplication::translate("ProMessageHandler", "[Inexact] ")) + , m_prefix(Tr::tr("[Inexact] ")) { } diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index 7a3418c88ef..fcff8efd44d 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -11,6 +11,7 @@ #include #include +#include #include using namespace ProjectExplorer; @@ -59,14 +60,11 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const IDevice::ConstPtr &de const bool succeeded = d->m_process.result() == ProcessResult::FinishedWithSuccess; QString finalMessage; if (!succeeded) { - QString errorMessage = d->m_process.errorString(); - if (errorMessage.isEmpty()) - errorMessage = d->m_process.cleanedStdErr(); - if (errorMessage.endsWith('\n')) - errorMessage.chop(1); - finalMessage = Tr::tr("Key deployment failed."); - if (!errorMessage.isEmpty()) - finalMessage += '\n' + errorMessage; + const QString errorString = d->m_process.errorString(); + const QString errorMessage = errorString.isEmpty() ? d->m_process.cleanedStdErr() + : errorString; + finalMessage = Utils::joinStrings({Tr::tr("Key deployment failed."), + Utils::trimBack(errorMessage, '\n')}, '\n'); } handleDeploymentDone(succeeded, finalMessage); }); diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 3dad98eb88c..7881cab47de 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -57,6 +57,7 @@ Project { "remotelinuxrunconfiguration.h", "remotelinuxsignaloperation.cpp", "remotelinuxsignaloperation.h", + "remotelinuxtr.h", "rsyncdeploystep.cpp", "rsyncdeploystep.h", "sshkeycreationdialog.cpp", diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index 920d5162043..73a30b27e3f 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -80,18 +80,13 @@ RemoteLinuxPlugin::~RemoteLinuxPlugin() delete dd; } -QVector RemoteLinuxPlugin::createTestObjects() const -{ - return { -#ifdef WITH_TESTS - new FileSystemAccessTest, -#endif - }; -} - void RemoteLinuxPlugin::initialize() { dd = new RemoteLinuxPluginPrivate; + +#ifdef WITH_TESTS + addTest(); +#endif } } // namespace Internal diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h index 6e4bdce341c..ef75c1a3da2 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.h +++ b/src/plugins/remotelinux/remotelinuxplugin.h @@ -17,8 +17,6 @@ public: RemoteLinuxPlugin(); ~RemoteLinuxPlugin() final; - QVector createTestObjects() const override; - private: void initialize() final; }; diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 85cea13c079..fa0e3b5e4a2 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "resourcenode.h" + #include "resourceeditorconstants.h" +#include "resourceeditortr.h" #include "qrceditor/resourcefile_p.h" #include @@ -433,9 +435,7 @@ bool ResourceTopLevelNode::removeNonExistingFiles() FolderNode::AddNewInformation ResourceTopLevelNode::addNewInformation(const FilePaths &files, Node *context) const { - QString name = QCoreApplication::translate("ResourceTopLevelNode", "%1 Prefix: %2") - .arg(filePath().fileName()) - .arg(QLatin1Char('/')); + const QString name = Tr::tr("%1 Prefix: %2").arg(filePath().fileName()).arg(QLatin1Char('/')); int p = getPriorityFromContextNode(this, context); if (p == -1 && hasPriority(files)) { // images/* and qml/js mimetypes @@ -574,8 +574,7 @@ bool ResourceFolderNode::renamePrefix(const QString &prefix, const QString &lang FolderNode::AddNewInformation ResourceFolderNode::addNewInformation(const FilePaths &files, Node *context) const { - QString name = QCoreApplication::translate("ResourceTopLevelNode", "%1 Prefix: %2") - .arg(m_topLevelNode->filePath().fileName()) + const QString name = Tr::tr("%1 Prefix: %2").arg(m_topLevelNode->filePath().fileName()) .arg(displayName()); int p = getPriorityFromContextNode(this, context); diff --git a/src/plugins/scxmleditor/common/search.h b/src/plugins/scxmleditor/common/search.h index 3ade6d357d8..6a25299d3e4 100644 --- a/src/plugins/scxmleditor/common/search.h +++ b/src/plugins/scxmleditor/common/search.h @@ -4,10 +4,10 @@ #pragma once #include "outputpane.h" -#include "scxmleditortr.h" #include +#include #include #include @@ -40,7 +40,7 @@ public: QString title() const override { - return Tr::tr("Search"); + return QCoreApplication::translate("::ScxmlEditor", "Search"); } QIcon icon() const override diff --git a/src/plugins/squish/deletesymbolicnamedialog.cpp b/src/plugins/squish/deletesymbolicnamedialog.cpp index 3b3d4e6d5b4..8b9f6eba096 100644 --- a/src/plugins/squish/deletesymbolicnamedialog.cpp +++ b/src/plugins/squish/deletesymbolicnamedialog.cpp @@ -104,7 +104,7 @@ DeleteSymbolicNameDialog::~DeleteSymbolicNameDialog() = default; void DeleteSymbolicNameDialog::updateDetailsLabel(const QString &nameToDelete) { - const char *detailsText = QT_TR_NOOP( + const char *detailsText = QT_TRANSLATE_NOOP("::Squish", "The Symbolic Name \"%1\" you " "want to remove is used in Multi Property Names. Select the action to " "apply to references in these Multi Property Names."); diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp index 58be2a78c30..bc09e2fa6cb 100644 --- a/src/plugins/squish/squishtools.cpp +++ b/src/plugins/squish/squishtools.cpp @@ -995,7 +995,7 @@ void SquishTools::updateLocationMarker(const Utils::FilePath &file, int line) if (QTC_GUARD(!m_locationMarker)) { m_locationMarker = new SquishLocationMark(file, line); } else { - m_locationMarker->updateFileName(file); + m_locationMarker->updateFilePath(file); m_locationMarker->move(line); } } diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs index 3c36fa8bcce..321e2bf6121 100644 --- a/src/plugins/subversion/subversion.qbs +++ b/src/plugins/subversion/subversion.qbs @@ -25,6 +25,7 @@ QtcPlugin { "subversionsettings.h", "subversionsubmiteditor.cpp", "subversionsubmiteditor.h", + "subversiontr.h", ] } diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index f9b458452b8..6e53b07cd37 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/src/plugins/texteditor/codestyleselectorwidget.cpp @@ -207,8 +207,10 @@ void CodeStyleSelectorWidget::slotImportClicked() if (importedStyle) m_codeStyle->setCurrentDelegate(importedStyle); else - QMessageBox::warning(this, Tr::tr("Import Code Style"), - Tr::tr("Cannot import code style from %1"), fileName.toUserOutput()); + QMessageBox::warning(this, + Tr::tr("Import Code Style"), + Tr::tr("Cannot import code style from %1") + .arg(fileName.toUserOutput())); } } diff --git a/src/plugins/texteditor/command.cpp b/src/plugins/texteditor/command.cpp index 6da71ccfff4..ca5cdfb02d9 100644 --- a/src/plugins/texteditor/command.cpp +++ b/src/plugins/texteditor/command.cpp @@ -10,12 +10,12 @@ bool Command::isValid() const return !m_executable.isEmpty(); } -QString Command::executable() const +Utils::FilePath Command::executable() const { return m_executable; } -void Command::setExecutable(const QString &executable) +void Command::setExecutable(const Utils::FilePath &executable) { m_executable = executable; } diff --git a/src/plugins/texteditor/command.h b/src/plugins/texteditor/command.h index 5196fc72e1d..7efe32788a8 100644 --- a/src/plugins/texteditor/command.h +++ b/src/plugins/texteditor/command.h @@ -5,8 +5,7 @@ #include "texteditor_global.h" -#include -#include +#include namespace TextEditor { @@ -20,8 +19,8 @@ public: bool isValid() const; - QString executable() const; - void setExecutable(const QString &executable); + Utils::FilePath executable() const; + void setExecutable(const Utils::FilePath &executable); QStringList options() const; void addOption(const QString &option); @@ -37,7 +36,7 @@ public: void setReturnsCRLF(bool returnsCRLF); private: - QString m_executable; + Utils::FilePath m_executable; QStringList m_options; Processing m_processing = FileProcessing; bool m_pipeAddsNewline = false; diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index 5265cc02886..8f2fc358441 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -43,7 +43,7 @@ static FormatTask format(FormatTask task) task.error.clear(); task.formattedData.clear(); - const QString executable = task.command.executable(); + const FilePath executable = task.command.executable(); if (executable.isEmpty()) return task; @@ -66,7 +66,7 @@ static FormatTask format(FormatTask task) options.replaceInStrings(QLatin1String("%file"), sourceFile.filePath().toString()); QtcProcess process; process.setTimeoutS(5); - process.setCommand({FilePath::fromString(executable), options}); + process.setCommand({executable, options}); process.runBlocking(); if (process.result() != ProcessResult::FinishedWithSuccess) { task.error = Tr::tr("TextEditor", "Failed to format: %1.") @@ -75,7 +75,7 @@ static FormatTask format(FormatTask task) } const QString output = process.cleanedStdErr(); if (!output.isEmpty()) - task.error = executable + QLatin1String(": ") + output; + task.error = executable.toUserOutput() + ": " + output; // Read text back Utils::FileReader reader; @@ -93,18 +93,18 @@ static FormatTask format(FormatTask task) QStringList options = task.command.options(); options.replaceInStrings("%filename", task.filePath.fileName()); options.replaceInStrings("%file", task.filePath.toString()); - process.setCommand({FilePath::fromString(executable), options}); + process.setCommand({executable, options}); process.setWriteData(task.sourceData.toUtf8()); process.start(); if (!process.waitForFinished(5000)) { task.error = Tr::tr("Cannot call %1 or some other error occurred. Timeout " "reached while formatting file %2.") - .arg(executable, task.filePath.displayName()); + .arg(executable.toUserOutput(), task.filePath.displayName()); return task; } const QString errorText = process.readAllStandardError(); if (!errorText.isEmpty()) { - task.error = QString::fromLatin1("%1: %2").arg(executable, errorText); + task.error = QString("%1: %2").arg(executable.toUserOutput(), errorText); return task; } diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index fcf11ecb090..db2f0de9c9e 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -775,7 +775,7 @@ public: QList m_autoCompleteHighlightPos; void updateAutoCompleteHighlight(); - QList m_cursorBlockNumbers; + QSet m_cursorBlockNumbers; int m_blockCount = 0; QPoint m_markDragStart; @@ -5450,21 +5450,18 @@ void TextEditorWidgetPrivate::updateCurrentLineHighlight() q->viewport()->update(updateRect); } }; - QList cursorBlockNumbers; - for (const QTextCursor &c : m_cursors) { - int cursorBlockNumber = c.blockNumber(); - if (!m_cursorBlockNumbers.contains(cursorBlockNumber)) - updateBlock(c.block()); - if (!cursorBlockNumbers.contains(c.blockNumber())) - cursorBlockNumbers << c.blockNumber(); - } - if (m_cursorBlockNumbers != cursorBlockNumbers) { - for (int oldBlock : m_cursorBlockNumbers) { - if (!cursorBlockNumbers.contains(oldBlock)) - updateBlock(m_document->document()->findBlockByNumber(oldBlock)); - } - m_cursorBlockNumbers = cursorBlockNumbers; - } + + QSet cursorBlockNumbers; + for (const QTextCursor &c : m_cursors) + cursorBlockNumbers.insert(c.blockNumber()); + + const QSet updateBlockNumbers = (cursorBlockNumbers - m_cursorBlockNumbers) + + (m_cursorBlockNumbers - cursorBlockNumbers); + + for (const int blockNumber : updateBlockNumbers) + updateBlock(m_document->document()->findBlockByNumber(blockNumber)); + + m_cursorBlockNumbers = cursorBlockNumbers; } void TextEditorWidget::slotCursorPositionChanged() diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp index cf391fa1060..19ab3d1d346 100644 --- a/src/plugins/texteditor/textmark.cpp +++ b/src/plugins/texteditor/textmark.cpp @@ -63,8 +63,8 @@ private: TextMarkRegistry *m_instance = nullptr; -TextMark::TextMark(const FilePath &fileName, int lineNumber, TextMarkCategory category) - : m_fileName(fileName) +TextMark::TextMark(const FilePath &filePath, int lineNumber, TextMarkCategory category) + : m_fileName(filePath) , m_lineNumber(lineNumber) , m_visible(true) , m_category(category) @@ -82,18 +82,18 @@ TextMark::~TextMark() m_baseTextDocument = nullptr; } -FilePath TextMark::fileName() const +FilePath TextMark::filePath() const { return m_fileName; } -void TextMark::updateFileName(const FilePath &fileName) +void TextMark::updateFilePath(const FilePath &filePath) { - if (fileName == m_fileName) + if (filePath == m_fileName) return; if (!m_fileName.isEmpty()) TextMarkRegistry::remove(this); - m_fileName = fileName; + m_fileName = filePath; if (!m_fileName.isEmpty()) TextMarkRegistry::add(this); } @@ -451,14 +451,14 @@ TextMarkRegistry::TextMarkRegistry(QObject *parent) void TextMarkRegistry::add(TextMark *mark) { - instance()->m_marks[mark->fileName()].insert(mark); - if (TextDocument *document = TextDocument::textDocumentForFilePath(mark->fileName())) + instance()->m_marks[mark->filePath()].insert(mark); + if (TextDocument *document = TextDocument::textDocumentForFilePath(mark->filePath())) document->addMark(mark); } bool TextMarkRegistry::remove(TextMark *mark) { - return instance()->m_marks[mark->fileName()].remove(mark); + return instance()->m_marks[mark->filePath()].remove(mark); } TextMarkRegistry *TextMarkRegistry::instance() @@ -500,7 +500,7 @@ void TextMarkRegistry::documentRenamed(IDocument *document, m_marks[newPath].unite(toBeMoved); for (TextMark *mark : std::as_const(toBeMoved)) - mark->updateFileName(newPath); + mark->updateFilePath(newPath); } void TextMarkRegistry::allDocumentsRenamed(const FilePath &oldPath, const FilePath &newPath) @@ -514,7 +514,7 @@ void TextMarkRegistry::allDocumentsRenamed(const FilePath &oldPath, const FilePa m_marks[oldPath].clear(); for (TextMark *mark : oldFileNameMarks) - mark->updateFileName(newPath); + mark->updateFilePath(newPath); } QHash AnnotationColors::m_colorCache; diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h index 0a34139ec55..72712557058 100644 --- a/src/plugins/texteditor/textmark.h +++ b/src/plugins/texteditor/textmark.h @@ -38,10 +38,8 @@ public: class TEXTEDITOR_EXPORT TextMark { public: - TextMark(const Utils::FilePath &fileName, - int lineNumber, - TextMarkCategory category); TextMark() = delete; + TextMark(const Utils::FilePath &filePath, int lineNumber, TextMarkCategory category); virtual ~TextMark(); // determine order on markers on the same line. @@ -52,7 +50,7 @@ public: HighPriority // shown on top. }; - Utils::FilePath fileName() const; + Utils::FilePath filePath() const; int lineNumber() const; virtual void paintIcon(QPainter *painter, const QRect &rect) const; @@ -74,7 +72,7 @@ public: AnnotationRects annotationRects(const QRectF &boundingRect, const QFontMetrics &fm, const qreal fadeInOffset, const qreal fadeOutOffset) const; /// called if the filename of the document changed - virtual void updateFileName(const Utils::FilePath &fileName); + virtual void updateFilePath(const Utils::FilePath &filePath); virtual void updateLineNumber(int lineNumber); virtual void updateBlock(const QTextBlock &block); virtual void move(int line); diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs index 47e0222cc8c..bbd3ed74cbe 100644 --- a/src/plugins/todo/todo.qbs +++ b/src/plugins/todo/todo.qbs @@ -48,5 +48,6 @@ QtcPlugin { "todoplugin.cpp", "todoplugin.h", "todoplugin.qrc", + "todotr.h", ] } diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 851b89f10cb..76edbbbbb3f 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -833,7 +833,7 @@ void CallgrindToolPrivate::requestContextMenu(TextEditorWidget *widget, int line { // Find callgrind text mark that corresponds to this editor's file and line number for (CallgrindTextMark *textMark : std::as_const(m_textMarks)) { - if (textMark->fileName() == widget->textDocument()->filePath() && textMark->lineNumber() == line) { + if (textMark->filePath() == widget->textDocument()->filePath() && textMark->lineNumber() == line) { const Function *func = textMark->function(); QAction *action = menu->addAction(Tr::tr("Select This Function in the Analyzer Output")); connect(action, &QAction::triggered, this, [this, func] { selectFunction(func); }); diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index 8830ba2b8b3..e28b42fec0d 100644 --- a/src/plugins/valgrind/valgrind.qbs +++ b/src/plugins/valgrind/valgrind.qbs @@ -35,6 +35,7 @@ QtcPlugin { "valgrindplugin.cpp", "valgrindplugin.h", "valgrindrunner.cpp", "valgrindrunner.h", "valgrindsettings.cpp", "valgrindsettings.h", + "valgrindtr.h", ] } diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs index 05e81bfc0cf..95acd8fe216 100644 --- a/src/plugins/welcome/welcome.qbs +++ b/src/plugins/welcome/welcome.qbs @@ -14,5 +14,6 @@ QtcPlugin { "introductionwidget.h", "welcome.qrc", "welcomeplugin.cpp", + "welcometr.h", ] } diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index e1f1dcb2663..ff57ac8d0eb 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -31,32 +31,6 @@ macro(qtc_auto_setup_conan) option(QT_CREATOR_SKIP_CONAN_SETUP "Skip Qt Creator's conan package manager auto-setup" OFF) set(QT_CREATOR_CONAN_BUILD_POLICY "missing" CACHE STRING "Qt Creator's conan package manager auto-setup build policy. This is used for the BUILD property of cmake_conan_run") - # Get conan from Qt SDK - set(qt_creator_ini "${CMAKE_CURRENT_LIST_DIR}/../QtProject/QtCreator.ini") - if (EXISTS ${qt_creator_ini}) - file(STRINGS ${qt_creator_ini} install_settings REGEX "^InstallSettings=.*$") - if (install_settings) - string(REPLACE "InstallSettings=" "" install_settings "${install_settings}") - set(qt_creator_ini "${install_settings}/QtProject/QtCreator.ini") - file(TO_CMAKE_PATH "${qt_creator_ini}" qt_creator_ini) - endif() - - file(STRINGS ${qt_creator_ini} conan_executable REGEX "^ConanFilePath=.*$") - if (conan_executable) - string(REPLACE "ConanFilePath=" "" conan_executable "${conan_executable}") - file(TO_CMAKE_PATH "${conan_executable}" conan_executable) - get_filename_component(conan_path "${conan_executable}" DIRECTORY) - endif() - endif() - - set(path_sepparator ":") - if (WIN32) - set(path_sepparator ";") - endif() - if (conan_path) - set(ENV{PATH} "${conan_path}${path_sepparator}$ENV{PATH}") - endif() - find_program(conan_program conan) if (NOT conan_program) message(WARNING "Qt Creator: conan executable not found. " @@ -64,6 +38,13 @@ macro(qtc_auto_setup_conan) "To disable this warning set QT_CREATOR_SKIP_CONAN_SETUP to ON.") return() endif() + execute_process(COMMAND ${conan_program} --version + RESULT_VARIABLE result_code + OUTPUT_VARIABLE conan_version_output + ERROR_VARIABLE conan_version_output) + if (NOT result_code EQUAL 0) + message(FATAL_ERROR "conan --version failed='${result_code}: ${conan_version_output}") + endif() set(conanfile_timestamp_file "${CMAKE_BINARY_DIR}/conan-dependencies/conanfile.timestamp") file(TIMESTAMP "${conanfile_txt}" conanfile_timestamp) @@ -147,7 +128,17 @@ macro(qtc_auto_setup_vcpkg) "To disable this warning set QT_CREATOR_SKIP_VCPKG_SETUP to ON.") return() endif() - get_filename_component(vpkg_root ${vcpkg_program} DIRECTORY) + execute_process(COMMAND ${vcpkg_program} version + RESULT_VARIABLE result_code + OUTPUT_VARIABLE vcpkg_version_output + ERROR_VARIABLE vcpkg_version_output) + if (NOT result_code EQUAL 0) + message(FATAL_ERROR "vcpkg version failed='${result_code}: ${vcpkg_version_output}") + endif() + + # Resolve any symlinks + get_filename_component(vpkg_program_real_path ${vcpkg_program} REALPATH) + get_filename_component(vpkg_root ${vpkg_program_real_path} DIRECTORY) if (NOT EXISTS "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake") message(STATUS "Qt Creator: vcpkg package manager auto-setup. " @@ -168,8 +159,8 @@ macro(qtc_auto_setup_vcpkg) else() if (WIN32) set(vcpkg_triplet x64-mingw-static) - if (CMAKE_CXX_COMPILER MATCHES "cl.exe") - set(vcpkg_triplet x64-windows) + if (CMAKE_CXX_COMPILER MATCHES ".*/(.*)/cl.exe") + set(vcpkg_triplet ${CMAKE_MATCH_1}-windows) endif() elseif(APPLE) set(vcpkg_triplet x64-osx) diff --git a/src/shared/qbs b/src/shared/qbs index 03b0537a79b..087c22e1772 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 03b0537a79b3050dc0e70b6f4086f513f9b87e6d +Subproject commit 087c22e17721f37490dd2048a567b6a58065d939 diff --git a/src/src.qbs b/src/src.qbs index 8d50dafdc10..b59d8843236 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -30,6 +30,7 @@ Project { qbsBaseDir + "/src/lib/libs.qbs", qbsBaseDir + "/src/libexec/libexec.qbs", qbsBaseDir + "/src/plugins/plugins.qbs", + qbsBaseDir + "/src/shared/quickjs/quickjs.qbs", qbsBaseDir + "/share/share.qbs", qbsBaseDir + "/src/app/apps.qbs", qbsBaseDir + "/src/shared/bundledqt/bundledqt.qbs", diff --git a/tests/auto/cplusplus/translationunit/CMakeLists.txt b/tests/auto/cplusplus/translationunit/CMakeLists.txt index 68e8eb69f36..c26d8477dda 100644 --- a/tests/auto/cplusplus/translationunit/CMakeLists.txt +++ b/tests/auto/cplusplus/translationunit/CMakeLists.txt @@ -1,4 +1,4 @@ add_qtc_test(tst_cplusplus_translationunit - DEPENDS CppEditor + DEPENDS CppEditor Utils SOURCES tst_translationunit.cpp ) diff --git a/tests/auto/runextensions/tst_runextensions.cpp b/tests/auto/runextensions/tst_runextensions.cpp index 2ddea333302..50a3f8a40d6 100644 --- a/tests/auto/runextensions/tst_runextensions.cpp +++ b/tests/auto/runextensions/tst_runextensions.cpp @@ -20,8 +20,6 @@ private slots: void moveOnlyType(); #endif void threadPriority(); - void threadSize(); - void threadSizeAndPriority(); void runAsyncNoFutureInterface(); void crefFunction(); void onResultReady(); @@ -379,19 +377,6 @@ void tst_RunExtensions::threadPriority() QList({0, 2, 1})); } -void tst_RunExtensions::threadSize() -{ - QCOMPARE(Utils::runAsync(Utils::StackSizeInBytes(1024 * 1024), report3).results(), - QList({0, 2, 1})); -} - -void tst_RunExtensions::threadSizeAndPriority() -{ - QCOMPARE(Utils::runAsync(Utils::StackSizeInBytes(1024 * 1024), QThread::LowestPriority, report3) - .results(), - QList({0, 2, 1})); -} - void tst_RunExtensions::runAsyncNoFutureInterface() { // free function pointer diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp index e636f812159..a7272e490b1 100644 --- a/tests/auto/utils/fileutils/tst_fileutils.cpp +++ b/tests/auto/utils/fileutils/tst_fileutils.cpp @@ -115,6 +115,9 @@ private slots: void hostSpecialChars_data(); void hostSpecialChars(); + void tmp_data(); + void tmp(); + private: QTemporaryDir tempDir; QString rootPath; @@ -1325,6 +1328,36 @@ void tst_fileutils::hostSpecialChars() QCOMPARE(toFromExpected, expected); } +void tst_fileutils::tmp_data() +{ + QTest::addColumn("templatepath"); + QTest::addColumn("expected"); + + QTest::addRow("empty") << "" << true; + QTest::addRow("no-template") << "foo" << true; + QTest::addRow("realtive-template") << "my-file-XXXXXXXX" << true; + QTest::addRow("absolute-template") << QDir::tempPath() + "/my-file-XXXXXXXX" << true; + QTest::addRow("non-existing-dir") << "/this/path/does/not/exist/my-file-XXXXXXXX" << false; + + QTest::addRow("on-device") << "device://test/./my-file-XXXXXXXX" << true; +} + +void tst_fileutils::tmp() +{ + QFETCH(QString, templatepath); + QFETCH(bool, expected); + + FilePath fp = FilePath::fromString(templatepath); + + const auto result = fp.createTempFile(); + QCOMPARE(result.has_value(), expected); + + if (result.has_value()) { + QVERIFY(result->exists()); + QVERIFY(result->removeFile()); + } +} + QTEST_GUILESS_MAIN(tst_fileutils) #include "tst_fileutils.moc" diff --git a/tests/system/objects.map b/tests/system/objects.map index 09ef2505423..591b671e539 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -90,7 +90,6 @@ :JsonWizard_ProjectExplorer::JsonFieldPage {type='ProjectExplorer::JsonFieldPage' unnamed='1' visible='1' window=':New_ProjectExplorer::JsonWizard'} :Kits_QtVersion_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':QtVersionLabel_KitPage' type='QComboBox' unnamed='1' visible='1'} :Locals and Expressions_Debugger::Internal::WatchTreeView {container=':Debugger.Docks.LocalsAndWatchersDockWidget.Inspector_QFrame' name='WatchWindow' type='Debugger::Internal::WatchTreeView' visible='1'} -:Minimal required Qt version:_QLabel {text='Minimum required Qt version:' type='QLabel' unnamed='1' visible='1' window=':New_ProjectExplorer::JsonWizard'} :New Text File.Add to project:_QLabel {name='projectLabel' text='Add to project:' type='QLabel' visible='1' window=':New_ProjectExplorer::JsonWizard'} :New Text File.nameLineEdit_Utils::FileNameValidatingLineEdit {name='nameLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1' window=':New_ProjectExplorer::JsonWizard'} :New.comboBox_QComboBox {type='QComboBox' unnamed='1' visible='1' window=':New_Core::Internal::NewDialog'} diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index 6957d6dbbe4..2e96dd9ba5d 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -56,7 +56,7 @@ def waitForCompile(timeout=60000): def dumpBuildIssues(listModel): issueDump = [] for index in dumpIndices(listModel): - issueDump.extend([[index.data(role).toString() for role + issueDump.extend([[str(index.data(role).toString()) for role in range(Qt.UserRole, Qt.UserRole + 6)]]) return issueDump diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 9fe97cf9c9c..b0ee23450dc 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -125,8 +125,8 @@ def __handleBuildSystem__(buildSystem): return buildSystem def __createProjectHandleQtQuickSelection__(minimumQtVersion): - comboBox = waitForObject("{leftWidget=':Minimal required Qt version:_QLabel' name='QtVersion' " - "type='QComboBox' visible='1'}") + comboBox = waitForObject("{name='MinimumSupportedQtVersion' type='QComboBox' " + "visible='1' window=':New_ProjectExplorer::JsonWizard'}") try: selectFromCombo(comboBox, "Qt %s" % minimumQtVersion) except: @@ -272,7 +272,7 @@ def createProject_Qt_Console(path, projectName, checks = True, buildSystem = Non def createNewQtQuickApplication(workingDir, projectName=None, - targets=Targets.desktopTargetClasses(), minimumQtVersion="5.12", + targets=Targets.desktopTargetClasses(), minimumQtVersion="6.2", template="Qt Quick Application", fromWelcome=False, buildSystem=None): available = __createProjectOrFileSelectType__(" Application (Qt)", template, fromWelcome) diff --git a/tests/system/suite_editors/tst_modify_readonly/test.py b/tests/system/suite_editors/tst_modify_readonly/test.py index 446ca3569bb..cf348bbed2c 100644 --- a/tests/system/suite_editors/tst_modify_readonly/test.py +++ b/tests/system/suite_editors/tst_modify_readonly/test.py @@ -85,6 +85,13 @@ def testSaveChangesAndMakeWritable(modifiedFiles, readOnlyFiles): except: test.fatal("Missing dialog regarding missing permission on read only files.") exitCanceled = False + + # workaround crashing test + # (AUT stopped responding / AUT '' did not respond to network communication) + __shutdownDone__ = lambda : not currentApplicationContext().isRunning + if test.verify(waitFor(__shutdownDone__, 1000), "Clean exit of Qt Creator."): + return + try: mBoxStr = "{type='QMessageBox' unnamed='1' visible='1' text?='*Could not save the files.'}" msgBox = waitForObject(mBoxStr, 3000)