Merge remote-tracking branch 'origin/9.0'

Change-Id: I0d38595a5a4451f707972507b55729563e5ea87e

doc/qtcreator/src/editors/creator-code-indentation.qdoc

@@ -64,13 +64,18 @@
 
     To visualize whitespace in the editor, select \uicontrol Edit >
     \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Display >
-    \uicontrol {Visualize whitespace}.
+    \uicontrol {Visualize whitespace}. To visualize indentation, select
+    \uicontrol {Visualize Indent}.
 
     \image qtcreator-options-text-editor-display.png "Text Editor Display preferences"
 
     To help you keep line length at a particular number of characters, set the
     number of characters in the \uicontrol {Display right margin at column}
-    field. To use a context-specific margin when available, select the
+    field. To use a different color for the margin area, select the
+    \uicontrol {Tint whole margin area} check box. Deselect the check box to show
+    the margin as a vertical line.
+
+    To use a context-specific margin when available, select the
     \uicontrol {Use context-specific margin} check box.
     \if defined(qtcreator)
     For example, the margin could be set by the \c ColumnLimit option of the

doc/qtcreator/src/editors/creator-locator.qdoc

@@ -8,7 +8,9 @@
 
     \title Searching with the Locator
 
-    You can find the locator in the bottom left of the \QC window.
+    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}.
 
     \image qtcreator-locator.png "List of locator filters"
 
@@ -57,8 +59,8 @@
 
     It is also possible to enter only a part of a search string. As you type,
     the locator shows the occurrences of that string regardless of where in the
-    name of an component it appears. Some locator filters, such as colon and
+    name of an component it appears. Some locator filters, such as colon, \c m,
-    \c m, support \e fuzzy matching, which means that you can enter the
+    and \c t, support \e fuzzy matching, which means that you can enter the
     uppercase letters to locate a symbol when using camel case or the letters
     after the underscore when using snake case.
 
@@ -125,7 +127,7 @@
             (\c {git}). For more information, see \l{Using Git}.
             \endif
 
-        \li Triggering menu items from the main menu (\c {t})
+        \li Triggering actions (\c {t})
 
         \li Searching for issues from the \l{https://bugreports.qt.io/}
             {Qt Project Bug Tracker} (\c bug).

doc/qtcreator/src/overview/creator-acknowledgements.qdoc

@@ -15,9 +15,9 @@
 
     \section1 Credits
 
-    We would like to thank our contributors, who are listed in the \QC
+    We would like to thank our contributors, who are listed in the \QC change
-    \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist}{change logs}
+    logs for each release. To view the change logs, select \uicontrol Help >
-    for each release.
+    \uicontrol {Change Log}.
 
     \section1 Qbs
 

doc/qtcreator/src/user-interface/creator-ui.qdoc

@@ -86,6 +86,11 @@
     QML code by debugging or profiling it.
     \endif
 
+    \section1 What's New?
+
+    For information about new features and bug fixes in each \QC release,
+    select \uicontrol Help > \uicontrol {Change Log}.
+
     \section1 For \macos Users
 
     \QC uses standard names and locations for standard features, such as

doc/qtdesignstudio/examples/doc/animationTutorial.qdoc

@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Design Studio documentation.
+**
+** 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 Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+**
+****************************************************************************/
+
+/*!
+    \page animation-tutorial.html
+    \ingroup gstutorials
+    \sa {Creating Timeline Animations}
+
+    \title Timeline Animation Tutorial
+    \brief Illustrates how to create timeline animations and bind them to
+    properties in \QDS.
+
+    \image animation-tutorial.gif
+
+    The \e{Timeline Animation} tutorial illustrates how to create timeline animations
+    and bind them to properties in \QDS. First you create a keyframe animation
+    which you control the running state of with a switch in the UI. Next, you
+    create another keyframe animation where you use a slider in the UI to
+    control the position of the playhead.
+
+    The starting point of this tutorial is the Animation Tutorial project,
+    you can download it from
+    \l{https://git.qt.io/public-demos/qtdesign-studio/-/tree/master/tutorial%20projects/animation-tutorial/AnimationTutorial/Start}
+    {here}.
+
+    You can download the completed project from
+    \l{https://git.qt.io/public-demos/qtdesign-studio/-/tree/master/tutorial%20projects/animation-tutorial/AnimationTutorial/Completed}
+    {here}.
+
+    This tutorial requires that you know the basics of \QDS, see
+    \l{Getting Started}.
+
+    \section1 Creating a Timeline Animation
+
+    First, you create an animation where the ball bearing continuously rotates
+    around its Y axis.
+
+    \section2 Adding a Timeline and an Animation
+
+    To add a timeline to your project:
+
+    \list 1
+      \li In the \uicontrol Timeline view, select
+      \inlineimage icons/plus.png
+      .
+      This creates a timeline and one animation.
+      \li On the \uicontrol {Animation Settings} tab in the
+      \uicontrol {Timeline Settings} dialog:
+          \list
+            \li Set \uicontrol Duration to 7500.
+                This sets the duration of the animation in milliseconds.
+            \li Select \uicontrol {Contiunous}.
+                This sets the animation to start over again when it reaches the
+                end.
+          \endlist
+      \image animation-tutorial-timeline-1.png
+      \li Select \uicontrol {Close}.
+    \endlist
+
+    You can see the timeline in the \uicontrol Timeline and
+    \uicontrol Navigator views.
+
+    \section2 Adding Keyframes
+
+    Next, you add keyframes to animate the rotation of the ball bearing:
+
+    \list 1
+      \li In the \uicontrol Navigator view, select \e {ballbearing1}.
+      \li In the \uicontrol Properties view, select
+      \inlineimage icons/action-icon.png (Actions)
+      next to \uicontrol Rotation > \uicontrol {Y}.
+      \li Select \uicontrol {Insert Keyframe}.
+      \image animation-tutorial-insert-keyframe.png
+      \li In the \uicontrol Timeline view, select the
+      \uicontrol {Per Property Recording} button to start recording property
+      changes.
+      \image animation-tutorial-per-property-recording.png
+      \li In the \uicontrol Timeline view, move the playhead to the end of the
+      animation (frame 1000).
+      \li In the \uicontrol Properties view, set \uicontrol Rotation >
+      \uicontrol Z to 360.
+      This creates a second keyframe.
+      \li Select the \uicontrol {Per Property Recording} button to end the per
+      property recording. To preview the animation, drag the playhead along the
+      timeline.
+    \endlist
+
+    \section2 Controlling the Running State of the Animation
+
+    There is a toggle switch in the UI of this project. To use this switch to
+    control the running state of the animation:
+
+    \list 1
+      \li In the \uicontrol Navigator view, select \e {timelineAnimation}.
+      \li In the \uicontrol Connections view, go to the \uicontrol Bindings tab.
+      \li Select \inlineimage icons/plus.png
+      to create a binding.
+      \li For the binding you created, set:
+        \list
+          \li \uicontrol Property to \e {paused}.
+          \li \uicontrol {Source Item} to \e {switch1}.
+          \li \uicontrol {Source Property} to \e {checked}.
+        \endlist
+      \image animation-tutorial-binding.png
+    \endlist
+
+    You can preview the animation and try the toggle switch in the live preview.
+    To run the live preview, select \key Alt + \key{P}.
+
+    \section1 Creating a Timeline and Binding it to a Property
+
+    Next, you create the exploded view animation of the ball bearing. You don't
+    want this animation to run automatically but instead you want to control it
+    with a slider in the UI.
+
+    \section2 Adding a Timeline Inside a Component
+
+    You create this animation inside the ball bearing component, to do this:
+
+    \list 1
+      \li In the \uicontrol Navigator view, select \e {ballBearing1}.
+      \li Select \key {F2} to go into the component.
+      \li In the \uicontrol Timeline view, select
+      \inlineimage icons/plus.png
+      to add a timeline and open the \uicontrol {Timeline Settings} dialog.
+      \li Select \inlineimage icons/minus.png
+      next to the \uicontrol {Animation Settings} tab to remove the animation
+      in this timeline.
+      You do not need an animation when you bind the timeline to a property.
+      \li Select \uicontrol {Close}.
+    \endlist
+
+    \image animation-tutorial-timeline-2.png
+
+    \section2 Adding Keyframes
+
+    Now, you add keyframes for the different parts of the ball bearing:
+
+    \list 1
+      \li In the \uicontrol{Navigator} view, select \e{inner_race}.
+      \li In the \uicontrol Properties view, select
+      \inlineimage icons/action-icon.png (Actions)
+      next to \uicontrol Translation > \uicontrol Y.
+      \li Select \uicontrol {Insert Keyframe}.
+      \li In the \uicontrol Timeline view, select the
+      \uicontrol {Per Property Recording} button to start recording property
+      changes.
+      \li In the \uicontrol Timeline view, move the playhead to the end of the
+      animation (frame 1000).
+      \li In the \uicontrol Properties view, set \uicontrol Translation >
+      \uicontrol Y to 0,50.
+      \li Select the \uicontrol {Per Property Recording} button to end the per
+      property recording.
+      \li Next, you set the keyframe values for the other parts of the ball
+      bearing. For the following parts, set the \uicontrol Translation >
+      \uicontrol Y value for frame 1000:
+        \list
+          \li \e balls to 1,00.
+          \li \e retainer to 1,50.
+          \li \e shield_left to 1,80.
+          \li \e shield_right to -0,30.
+        \endlist
+      \image animation-tutorial-ballbearing-animation.png
+    \endlist
+
+    You can preview the animation by dragging the playhead in the
+    \uicontrol Timeline view.
+
+    \section2 Controlling the Animation with a Slider
+
+    Now, you use the slider on the main screen to control the exploded
+    view animation that you created.
+
+    To do this, you first need to define a property for the slider:
+
+    \list 1
+      \li In the \uicontrol Navigator view, select \e Node.
+      \li On the \uicontrol Properties tab in the \uicontrol Connections view,
+      select \inlineimage icons/plus.png
+      .
+      \li In the \uicontrol {Property Type} field, enter \e {Item}.
+      This field is a drop-down list, but you can also type text.
+      \li In the \uicontrol {Property Value} field, enter \e {null}.
+    \endlist
+    \image animation-tutorial-property.png
+
+    Next, you set the property you just created to control the timeline
+    animation:
+
+    \list 1
+      \li In the \uicontrol {Timeline} view, select
+      \inlineimage icons/animation.png
+      .
+      \li In the \uicontrol {Expression binding field}, enter
+      \c {property0.value}.
+      \li Select \uicontrol {Close}.
+    \endlist
+
+    Next, you go out from the component back to the main project and bind the
+    property to the slider:
+
+    \list 1
+      \li In the toolbar, select the \e {Screen01.ui.qml} breadcrumb.
+      \image animation-tutorial-breadcrumb.png
+      \li In the \uicontrol {Navigator} view, select \e {ballbearing1}.
+      \li In the \uicontrol {Connections} view, go to the
+      \uicontrol {Bindings} tab.
+      \li Select \inlineimage icons/plus.png
+      .
+      \li For the binding you just created:
+        \list
+          \li Set \uicontrol {Source Item} to \e {slider}.
+          \li Remove the value from \uicontrol {Source Property}.
+        \endlist
+      \image animation-tutorial-binding-2.png
+    \endlist
+
+    \section1 Previewing
+
+    Now, the animations are done. To preview and test your application,
+    select \key Alt + \key{P}.
+
+*/

doc/qtdesignstudio/src/components/qtquick-component-instances.qdoc

@@ -29,7 +29,7 @@
             custom properties on the \uicontrol {Properties} tab in the
             \l {Connections} view.
             \image qmldesigner-dynamicprops.png "Connections View Properties tab"
-            For more information, see \l{Specifying Dynamic Properties}.
+            For more information, see \l{Specifying Custom Properties}.
         \li To enable users to interact with the component instances, connect
             the instances to signals on the \uicontrol Connections tab in the
             \uicontrol {Connections} view. For example, you can specify what

doc/qtdesignstudio/src/components/qtquick-components-custom.qdoc

@@ -41,7 +41,7 @@
             \uicontrol Navigator or the \uicontrol {2D} view.
         \li Edit component properties in the \uicontrol Properties view.
             The available properties depend on the component type. You can
-            \l{Specifying Dynamic Properties}{add properties for
+            \l{Specifying Custom Properties}{add properties for
             components} on the \uicontrol {Properties} tab in the
             \uicontrol Connections view.
         \li To change the appearance and behavior of the component instances

doc/qtdesignstudio/src/components/qtquick-data-models.qdoc

@@ -139,7 +139,7 @@
     When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or
     \l{PathView}{Path View}, the ListModel and the delegate component that
     creates an instance for each item in the model are added automatically.
-    For grid and list views, you can edit the list model in \QC.
+    For grid and list views, you can edit the list model in \QDS.
 
     \image qtquick-designer-listview-preview.png "Preview of a list view"
 

doc/qtdesignstudio/src/components/qtquick-images.qdoc

@@ -28,7 +28,7 @@
     \image qtquick-designer-image-type.png "Image component in different views"
 
     When you drag-and-drop an image file from \uicontrol Assets to \l Navigator
-    or the \l {2D} view, \QC automatically
+    or the \l {2D} view, \QDS automatically
     creates an instance of the Image component for you with the path to the
     image file set as the value of the \uicontrol Source field in
     \uicontrol Properties.

doc/qtdesignstudio/src/components/qtquick-positioning.qdoc

@@ -73,7 +73,7 @@
     For more information on the JavaScript environment provided, see
     \l{Integrating QML and JavaScript}.
 
-    Bindings are a black box for \QC and using them might have a
+    Bindings are a black box for \QDS and using them might have a
     negative impact on performance, so consider setting anchors and margins for
     components, instead. For example, instead of setting \c {parent.width} for a
     component, you could anchor the component to its sibling components on the
@@ -342,7 +342,7 @@
     to right and top to bottom. Each component is positioned at the top-left
     corner of its cell with position (0, 0).
 
-    \QC generates the grid based on the positions of the child components in
+    \QDS generates the grid based on the positions of the child components in
     the \l {2D} view. You can modify the number of rows and columns in the
     \uicontrol Rows and \uicontrol Columns fields.
 

doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc

@@ -27,7 +27,7 @@
     working Qt 6 application that you can build and run in Qt Creator using
     CMake. Therefore, you can open, build, and run the projects with Qt Creator.
 
-    \QDS continues to use the \e .qmlproject file format, while \QC uses a
+    \QDS continues to use the \e .qmlproject file format, while Qt Creator uses a
     \e CMakeLists.txt file as the project file. This enables you to share
     your project as a fully working C++ application with developers.
 
@@ -46,9 +46,10 @@
 
     \section1 Converting Project Structure for CMake
 
-    \QDS can generate \e CMakeLists.txt and other related files to use with \QC and to compile into
+    \QDS can generate \e CMakeLists.txt and other related files to use with
-    an executable application but only if the project has a certain folder structure. If you have a
+    Qt Creator and to compile into an executable application but only if the
-    \QDS QML project that doesn't have the CMake configuration, follow these steps to convert its
+    project has a certain folder structure. If you have a \QDS QML project that
+    doesn't have the CMake configuration, follow these steps to convert its
     file structure to the correct format.
 
     \list 1

doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc

@@ -46,7 +46,7 @@
 
     \section2 Timeline and Keyframe Based Animation
 
-    Timeline animation is based on \e keyframes. In \QC, keyframes determine the
+    Timeline animation is based on \e keyframes. In \QDS, keyframes determine the
     value of the property of a \l{glossary_component}{component} at a certain
     time. Animating properties enables their values to move through intermediate
     values instead of immediately changing to the target value.

doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc

@@ -114,7 +114,7 @@
     \endif
     \row
         \li Adding custom properties for a particular component type
-        \li \l{Specifying Dynamic Properties}
+        \li \l{Specifying Custom Properties}
     \omit
     \row
         \li Adding properties for controlling states

doc/qtdesignstudio/src/overviews/qtquick-production-quality-animation.qdoc

@@ -48,7 +48,7 @@
     \section1 Profiling UI Code
 
     You can use \l{Profiling QML Applications}{QML Profiler} that is integrated
-    into \QC to find causes for typical performance problems in your UI. For
+    into \QDS to find causes for typical performance problems in your UI. For
     example, your UI might be slow, unresponsive, or stuttering. Typically, such
     problems are caused by executing too much JavaScript in too few frames. All
     JavaScript must return before the GUI thread can proceed, and frames are

doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc

@@ -73,7 +73,7 @@
 
         \li \l {Importing 3D Assets}
 
-            You can import exported assets into \QC. For a list of formats
+            You can import exported assets into \QDS. For a list of formats
             supported by each \l{Qt Quick 3D} version, see the module
             documentation.
 

doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc

@@ -20,14 +20,14 @@
                 components, and states, you need. Create a descriptive wireframe
                 and acquire a detailed UI specification before you start to make
                 the process of creating the UI more efficient.
-                \QC enables you to turn your UI concept into a wireframe with
+                \QDS enables you to turn your UI concept into a wireframe with
                 a scalable layout where all your screens and controls are in
                 place. You can present your wireframe to developers and other
                 stakeholders for discussion, review, and approval before
                 continuing into the prototyping phase.
     \endtable
 
-    In \QC, you build UIs around the behavior of \l{glossary-component}
+    In \QDS, you build UIs around the behavior of \l{glossary-component}
     {components} and how they connect with one another. You can use preset
     components available in the \l Components view or combine them to create
     your own components. You can specify values for the \e properties of a

doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc

@@ -49,7 +49,7 @@
         \li Edit component properties in the \l Properties view.
 
             The available properties depend on the component type. You can
-            \l{Specifying Dynamic Properties}{add properties for components} on
+            \l{Specifying Custom Properties}{add properties for components} on
             the \uicontrol Properties tab in the {Connections} view.
     \endlist
 

doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc

@@ -26,7 +26,7 @@
        \li \l{Converting UI Projects to Applications}
 
             \QDS projects are useful for creating UIs. To use them for
-            application development in \QC, you have to convert
+            application development in Qt Creator, you have to convert
             them to Qt Quick Application projects that contain .pro,
             .cpp, and .qrc files.
         \li \l{Using External Tools}

doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc

@@ -19,7 +19,7 @@
         \li \l {FAQ - Assets}{Assets}
         \li \l {FAQ - Components}{Components}
         \li \l {FAQ - Views}{Views}
-        \li \l {FAQ - Integration Between \QDS and \QC}{Integration Between \QDS and \QC}
+        \li \l {FAQ - Integration Between \QDS and Qt Creator}{Integration Between \QDS and Qt Creator}
         \li \l {FAQ - Performance}{Performance}
         \li \l {FAQ - Data Simulation}{Data Simulation}
     \endlist
@@ -67,7 +67,7 @@
 
     \section1 FAQ - Components
 
-    \section2 Can custom components be used?
+    \section2 Can I use custom components?
 
     Yes, you can create custom components and controls by using wizard templates
     or move component instances into separate files to turn them into new
@@ -81,7 +81,7 @@
 
     For more information, see \l {Importing 3D Assets}.
 
-    \section2 How to integrate custom C++ components into QDS?
+    \section2 How can I integrate custom C++ components into QDS?
 
     You must create your own QML module that contains the components and
     provides additional information about your components. For more information,
@@ -99,21 +99,21 @@
 
     For more information, see the \l {3D} view.
 
-    \section1 FAQ - Integration Between \QDS and \QC
+    \section1 FAQ - Integration Between \QDS and Qt Creator
 
-    \section2 Is there a way to automatically propagate name changes between \QDS and \QC?
+    \section2 Can I automatically propagate name changes between \QDS and Qt Creator?
 
     Unfortunately we do not automate renaming files between tools at the moment.
     If you decide to change the name of a property, alias, or signal in \QDS,
-    you need to manually change the name in \QC to maintain the connection.
+    you need to manually change the name in Qt Creator to maintain the connection.
     However, you can rename symbols in all files within a project. To rename a
     QML type in a project, select \uicontrol Tools > \uicontrol QML/JS >
     \uicontrol {Rename Symbol Under Cursor} or press \key Ctrl+Shift+R. For more
     information, see \l {Renaming Symbols}.
 
-    \section2 When turning your \QDS project into application in \QC, what is the best way to add .qml files?
+    \section2 How can I add .qml files to my project in Qt Creator?
 
-    Use the project wizard templates to create an application in \QC and copy
+    Use the project wizard templates to create an application in \QDS and copy
     your .qml files to the project folder. Then make some changes to the project
     configuration and source files, as instructed in
     \l {Converting UI Projects to Applications}.

doc/qtdesignstudio/src/qtdesignstudio-simulink.qdoc

@@ -143,7 +143,7 @@
     Navigator to add the properties on the \uicontrol Properties tab in the
     \l Connections view.
 
-    See \l {Specifying Dynamic Properties} for a detailed description of how
+    See \l {Specifying Custom Properties} for a detailed description of how
     to add a custom property. The name of the property and the data type
     need to match those of the send or receive property of the Simulink model.
 

doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc

@@ -197,7 +197,7 @@
         \li \l{Preset Components}
         \li \l{Specifying Component Properties}
         \li \l{Adding Bindings Between Properties}
-        \li \l{Specifying Dynamic Properties}
+        \li \l{Specifying Custom Properties}
     \endlist
 
     \section1 Signal
@@ -294,7 +294,7 @@
     deploys it to the \l{glossary-device}{device} specified in the
     selected \l{glossary-buildandrun-kit}{kit}, and runs it there. However,
     if you have not made any changes to the project since you last deployed
-    it, \QC simply runs it again.
+    it, \QDS simply runs it again.
 
     \endomit
 */

doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc

@@ -122,7 +122,7 @@
                             \list
                                 \li\l{Connecting Components to Signals}
                                 \li\l{Adding Bindings Between Properties}
-                                \li\l{Specifying Dynamic Properties}
+                                \li\l{Specifying Custom Properties}
                             \endlist
                         \li \l{Adding States}
                     \endlist

doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc

@@ -193,5 +193,5 @@
     \image studio-custom-material-uniform-properties.png "Uniforms as properties in Connections view Properties tab"
 
     For more information about adding properties, see
-    \l{Specifying Dynamic Properties}.
+    \l{Specifying Custom Properties}.
 */

doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc

@@ -12,7 +12,7 @@
 
     \title Creating Optimized 3D Scenes
 
-    In \QC, you can use various means to create a 3D scene. Your choice of
+    In \QDS, you can use various means to create a 3D scene. Your choice of
     strategy should always depend on the target platform of your scene.
     The way the content of your scene is authored can have dramatic effects on
     the runtime performance of your UI. The Optimal 3D Scene described
@@ -88,7 +88,7 @@
     The scene graph is the hierarchy of nodes that describe the scene to be
     rendered.
 
-    In \QC, the scene graph is represented by the tree-like view in
+    In \QDS, the scene graph is represented by the tree-like view in
     \uicontrol Navigator. You can also view the hierarchy of nodes in the
     \l {Code} view. By minimizing the size of the scene graph,
     you can minimize the effort needed when running the scene. In terms of

doc/qtdesignstudio/src/views/qtquick-connection-editor-properties.qdoc

@@ -9,10 +9,10 @@
     \else
     \nextpage quick-connections-backend.html
     \endif
+    \sa {Specifying Component Properties}
+    \title Specifying Custom Properties
 
-    \title Specifying Dynamic Properties
+    Each \l{Preset Components}{preset component }has a set of preset properties
-
-    Each preset \l{glossary-component}{component} has a set of preset properties
     that you can specify values for. You can add custom properties that would
     not otherwise exist for a particular \l{Component Types}{component type}.
     You bind the properties to dynamic expressions to define global properties
@@ -33,50 +33,36 @@
     should have an \e int or \e real property for speed to which the UI is
     bound.
 
-    You can add properties for components on the \uicontrol Properties tab in
+    \section1 Adding Properties for a Component
-    in the \l {Connections} view.
 
-    \image qmldesigner-dynamicprops.png "Custom properties in the Connections view Custom Properties tab"
+    To add a custom property for a component:
-
-    To add properties for a component:
 
     \list 1
-        \li Go to the \uicontrol Properties tab in the \l Connections view.
+        \li Go to the \uicontrol {Local Custom Properties} section in the
+        \uicontrol Properties view.
         \li Select the \inlineimage icons/plus.png
-            (\uicontrol Add) button to add a dynamic property for the currently
+            (\uicontrol Add) button to add a custom property for the currently
-            selected component. The component ID is displayed in the \uicontrol Item
+            selected component.
-            column.
+            \image add-local-custom-property.png
-        \li Double-click the value in the \uicontrol Property column to give a
+        \li Set the \uicontrol Name and \uicontrol Type for the property.
-            name to the property. Property names must begin with a lower case
+            \image add-new-property-dialog.png
-            letter and can only contain letters, numbers, and underscores.
+    \endlist
-            JavaScript \e {reserved words} are not valid property names.
+
-        \li Double-click the value in the \uicontrol {Property Type} column to
+    \section1 Binding a Property Value
-            specify the \l{Supported Property Types}{type of the property}.
+
-        \li Double-click the value in the \uicontrol {Property Value} column
+    To bind the value of the property to that of another one or to data
-            to specify the value of the property.
+    accessible in the application.
+
+    \list 1
+      \li In the \uicontrol Properties view, select
+        \inlineimage icons/action-icon.png
+        next to the property.
+      \li Select \uicontrol {Set Binding}.
+        \image qmldesigner-binding-editor.png "Binding Editor"
     \endlist
 
-    Right-click a property and select \uicontrol {Open Binding Editor} in
-    the context menu to bind the value of the property to that of another one
-    or to data accessible in the application in \uicontrol {Binding Editor}.
     For more information, see \l{Setting Bindings}.
 
-    \image qmldesigner-binding-editor.png "Binding Editor"
-
-    The properties you add for a component are displayed in the \l Properties
-    view when you select a component of that type in the \l Navigator or
-    \l {2D} view.
-
-    \image qtquick-custom-properties.png "Custom properties in Properties view"
-
-    For more information about setting property values in the
-    \l Properties view, see \l{Specifying Component Properties}.
-
-    \if defined(qtcreator)
-    For an example of using custom properties in an application, see
-    \l{Creating a Mobile Application}.
-    \endif
-
     \section1 Supported Property Types
 
     The following table describes the supported property types:
@@ -112,6 +98,9 @@
     \row
         \li string
         \li Free form text string
+    \row
+        \li TextureInput
+        \li Specifies a texture exposed to the shaders of a CustomMaterial or Effect.
     \row
         \li url
         \li Resource locator, such as a file name. It can be either  absolute,
@@ -122,5 +111,14 @@
         \li variant
         \li Generic property type. For example, variant properties can store
             numbers, strings, objects, arrays, and functions.
+    \row
+        \li vector2d
+        \li Refers to a value with x and y attributes.
+    \row
+        \li vector3d
+        \li Refers to a value with x, y, and z attributes.
+    \row
+        \li vector4d
+        \li Refers to a value with x, y, z, and w attributes.
     \endtable
 */

doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc

@@ -26,7 +26,7 @@
             the value of a property changes, the values of any properties that
             are bound to it are automatically updated accordingly.
 
-        \li \l{Specifying Dynamic Properties}
+        \li \l{Specifying Custom Properties}
 
             Each preset component has a set of preset properties that you
             can specify values for. You can add custom properties that would

doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc

@@ -63,7 +63,7 @@
         \li \uicontrol Properties
         \li Add custom properties that would not otherwise exist for a
             particular preset component or your own custom component.
-        \li \l{Specifying Dynamic Properties}
+        \li \l{Specifying Custom Properties}
     \if defined(qtcreator)
     \row
         \li \uicontrol Backends

doc/qtdesignstudio/src/views/qtquick-navigator.qdoc

@@ -107,7 +107,7 @@
     \section1 Locking Components
 
     When designing complex applications, it is easy to accidentally modify
-    the properties of a component in one of the \QC views in ways that lead to
+    the properties of a component in one of the \QDS views in ways that lead to
     surprising results. For example, the \uicontrol {2D} view can become
     crowded and other components can get in the way when you are trying to
     select or transform a particular component, so that you end up transforming
@@ -115,7 +115,7 @@
 
     To lock components that you are not currently editing and their children,
     click \inlineimage icons/lockon.png
-    in \uicontrol Navigator. Locked components cannot be handled in any \QC
+    in \uicontrol Navigator. Locked components cannot be handled in any \QDS
     views. You can unlock the components when you want to edit them again.
 
     \image qtquick-designer-navigator-lock.gif "Locking components in Navigator"

doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc

@@ -22,6 +22,26 @@
 
     \image qmldesigner-element-properties.png "Rectangle and Text properties"
 
+    \section1 Custom Properties
+
+    Custom Properties are properties that the user has added to the component.
+
+    There are two types of custom properties:
+
+    \table
+      \header
+        \li Custom Property Type
+        \li Description
+      \row
+        \li Local Custom Property
+        \li A property that has been added for a \l{Preset Components}{preset component}.
+      \row
+        \li Exposed Custom Property
+        \li A property that has been added inside a component.
+    \endtable
+
+    \image custom-properties.png
+
     \section1 Summary of Properties View Buttons
 
     The following table lists the \uicontrol Properties view buttons:

doc/qtdesignstudio/src/views/qtquick-properties.qdoc

@@ -29,7 +29,7 @@
     another preset component in the field.
 
     If you have specified values for properties that are not supported by the
-    new component type, \QC offers to remove them for you. If you'd rather do
+    new component type, \QDS offers to remove them for you. If you'd rather do
     this yourself, you can select the \inlineimage icons/action-icon.png
     (\uicontrol Actions) menu next to the property name, and then select
     \uicontrol Reset to remove the property values before trying again.

doc/qtdesignstudio/src/views/studio-workspaces.qdoc

@@ -8,7 +8,7 @@
 
     \title Managing Workspaces
 
-    In the \uicontrol Design mode, you can arrange a set of \QC
+    In the \uicontrol Design mode, you can arrange a set of \QDS
     views as a \e workspace on the screen.
 
     To detach views:
@@ -34,10 +34,10 @@
 
     \section1 Saving Workspaces
 
-    The changes you make to a workspace are saved when you exit \QC.
+    The changes you make to a workspace are saved when you exit \QDS.
     Select \uicontrol View > \uicontrol Workspaces >
     \uicontrol Manage > \uicontrol {Restore last workspace on startup}
-    to restore the current workspace the next time you start \QC.
+    to restore the current workspace the next time you start \QDS.
 
     \image qtcreator-workspace-manager.png "Workspace Manager"
 

share/qtcreator/debugger/creatortypes.py

@@ -198,14 +198,8 @@ def qdump__CPlusPlus__Internal__Value(d, value):
 
 
 def qdump__Utils__FilePath(d, value):
-    try:
+    data, path_len, scheme_len, host_len = d.split("{@QString}IHH", value)
-        # support FilePath before 4.15 as well
+    if False:
-        if not d.extractPointer(value["m_url"]):  # there is no valid URL
-            d.putStringValue(value["m_data"])
-        else:
-            d.putItem(value["m_url"])
-    except:
-        scheme, host, path = d.split("{@QString}{@QString}{@QString}", value)
         scheme_enc = d.encodeString(scheme)
         host_enc = d.encodeString(host)
         elided, path_enc = d.encodeStringHelper(path, d.displayStringLimit)
@@ -218,7 +212,10 @@ def qdump__Utils__FilePath(d, value):
             if not path_enc.startswith(slash):
                 val += slash + dot + slash
         val += path_enc
-        d.putValue(val, "utf16", elided=elided)
+    else:
+        elided, data_enc = d.encodeStringHelper(data, d.displayStringLimit)
+        val = data_enc
+    d.putValue(val, "utf16", elided=elided)
     d.putPlainChildren(value)
 
 

share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml

@@ -17,6 +17,7 @@ Item {
     property var currentMaterial: null
     property int currentMaterialIdx: 0
     property var currentBundleMaterial: null
+    property int copiedMaterialInternalId: -1
 
     property var matSectionsModel: []
 
@@ -125,15 +126,20 @@ Item {
                 StudioControls.MenuItem {
                     text: modelData
                     enabled: root.currentMaterial
-                    onTriggered: materialBrowserModel.copyMaterialProperties(root.currentMaterialIdx, modelData)
+                    onTriggered: {
+                        root.copiedMaterialInternalId = root.currentMaterial.materialInternalId
+                        materialBrowserModel.copyMaterialProperties(root.currentMaterialIdx, modelData)
+                    }
                 }
             }
         }
 
         StudioControls.MenuItem {
             text: qsTr("Paste properties")
-            enabled: root.currentMaterial && root.currentMaterial.materialType
+            enabled: root.currentMaterial
-                                             === materialBrowserModel.copiedMaterialType
+                     && root.copiedMaterialInternalId !== root.currentMaterial.materialInternalId
+                     && root.currentMaterial.materialType === materialBrowserModel.copiedMaterialType
+                     && materialBrowserModel.isCopiedMaterialValid()
             onTriggered: materialBrowserModel.pasteMaterialProperties(root.currentMaterialIdx)
         }
 
@@ -213,7 +219,22 @@ Item {
 
                 width: root.width - addMaterialButton.width
 
-                onSearchChanged: (searchText) => rootView.handleSearchFilterChanged(searchText)
+                onSearchChanged: (searchText) => {
+                    rootView.handleSearchFilterChanged(searchText)
+
+                    // make sure searched categories that have matches are expanded
+                    if (!materialBrowserModel.isEmpty && !userMaterialsSection.expanded)
+                        userMaterialsSection.expanded = true
+
+                    if (!materialBrowserBundleModel.isEmpty && !bundleMaterialsSection.expanded)
+                        bundleMaterialsSection.expanded = true
+
+                    for (let i = 0; i < bundleMaterialsSectionRepeater.count; ++i) {
+                        let sec = bundleMaterialsSectionRepeater.itemAt(i)
+                        if (sec.visible && !sec.expanded)
+                            sec.expanded = true
+                    }
+                }
             }
 
             IconButton {
@@ -282,10 +303,8 @@ Item {
                                 height: root.cellHeight
 
                                 onShowContextMenu: {
-                                    if (searchBox.isEmpty()) {
+                                    root.currentMaterial = model
-                                        root.currentMaterial = model
+                                    cxtMenu.popup()
-                                        cxtMenu.popup()
-                                    }
                                 }
                             }
                         }
@@ -312,6 +331,8 @@ Item {
                 }
 
                 Section {
+                    id: bundleMaterialsSection
+
                     width: root.width
                     caption: qsTr("Material Library")
                     addTopPadding: noMatchText.visible
@@ -319,6 +340,8 @@ Item {
 
                     Column {
                         Repeater {
+                            id: bundleMaterialsSectionRepeater
+
                             model: materialBrowserBundleModel
 
                             delegate: Section {
@@ -343,10 +366,8 @@ Item {
                                             height: root.cellHeight
 
                                             onShowContextMenu: {
-                                                if (searchBox.isEmpty()) {
+                                                root.currentBundleMaterial = modelData
-                                                    root.currentBundleMaterial = modelData
+                                                cxtMenuBundle.popup()
-                                                    cxtMenuBundle.popup()
-                                                }
                                             }
                                         }
                                     }

share/qtcreator/qmldesigner/newstateseditor/Main.qml

@@ -303,18 +303,50 @@ Rectangle {
 
         width: Math.min(300, root.width)
 
-        onApplied: {
+        function apply() {
             let renamed = statesEditorModel.renameActiveStateGroup(editTextField.text)
             if (renamed)
                 editDialog.close()
         }
 
+        onApplied: editDialog.accept()
+
         StudioControls.TextField {
             id: editTextField
-            text: statesEditorModel.activeStateGroup
             actionIndicatorVisible: false
             translationIndicatorVisible: false
             anchors.fill: parent
+
+            onTextChanged: {
+                let btn = editDialog.standardButton(Dialog.Apply)
+                if (!btn)
+                    return
+
+                if (editDialog.previousString !== editTextField.text) {
+                    btn.enabled = true
+                } else {
+                    btn.enabled = false
+                }
+            }
+
+            onAccepted: editDialog.accept()
+            onRejected: editDialog.reject()
+        }
+
+        onAccepted: {
+            let renamed = statesEditorModel.renameActiveStateGroup(editTextField.text)
+            if (renamed)
+                editDialog.close()
+        }
+
+        property string previousString
+
+        onAboutToShow: {
+            editTextField.text = statesEditorModel.activeStateGroup
+            editDialog.previousString = statesEditorModel.activeStateGroup
+
+            let btn = editDialog.standardButton(Dialog.Apply)
+            btn.enabled = false
         }
     }
 
@@ -747,8 +779,7 @@ Rectangle {
                                     height: extendGap.portraitOneColumn ? root.innerGridSpacing : Constants.thumbnailSize
                                                                           + 2 * root.extend
                                     color: StudioTheme.Values.themeStateHighlight
-                                    visible: extendBackground.radius !== 0
+                                    visible: extendBackground.visible
-                                             && extendBackground.visible
                                 }
 
                                 StateThumbnail {

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml

@@ -35,7 +35,7 @@ Section {
     id: root
     anchors.left: parent.left
     anchors.right: parent.right
-    caption: qsTr("User Added Properties")
+    caption: qsTr("Local Custom Properties")
 
     property DynamicPropertiesModel propertiesModel: null
 

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml

@@ -11,8 +11,6 @@ import StudioTheme 1.0 as StudioTheme
 StudioControls.TextField {
     id: textField
 
-    signal rejected
-
     translationIndicator.visible: false
     actionIndicator.visible: false
 
@@ -136,6 +134,11 @@ StudioControls.TextField {
 
     onPressed: listView.model = null
 
+    onRejected: {
+        if (textField.completionActive)
+            listView.model = null
+    }
+
     Keys.priority: Keys.BeforeItem
     Keys.onPressed: function(event) {
         var text = textField.text
@@ -222,15 +225,6 @@ StudioControls.TextField {
         }
     }
 
-    Keys.onEscapePressed: function(event) {
-        event.accepted = true
-        if (textField.completionActive) {
-            listView.model = null
-        } else {
-            textField.rejected()
-        }
-    }
-
     Keys.onUpPressed: function(event) {
         listView.decrementCurrentIndex()
         event.accepted = false

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/DialogButton.qml

@@ -60,7 +60,7 @@ T.Button {
     states: [
         State {
             name: "default"
-            when: !root.down && !root.hovered && !root.checked
+            when: root.enabled && !root.down && !root.hovered && !root.checked
 
             PropertyChanges {
                 target: background
@@ -75,7 +75,7 @@ T.Button {
         },
         State {
             name: "hover"
-            when: root.hovered && !root.checked && !root.down
+            when: root.enabled && root.hovered && !root.checked && !root.down
 
             PropertyChanges {
                 target: background
@@ -88,8 +88,8 @@ T.Button {
             }
         },
         State {
-            name: "pressed"
+            name: "press"
-            when: root.checked || root.down
+            when: root.enabled && (root.checked || root.down)
 
             PropertyChanges {
                 target: background
@@ -100,6 +100,19 @@ T.Button {
                 target: textItem
                 color: StudioTheme.Values.themeTextColor
             }
+        },
+        State {
+            name: "disable"
+            when: !root.enabled
+            PropertyChanges {
+                target: background
+                color: StudioTheme.Values.themeControlBackgroundDisabled
+                border.color: StudioTheme.Values.themeControlOutlineDisabled
+            }
+            PropertyChanges {
+                target: textItem
+                color: StudioTheme.Values.themeTextColorDisabled
+            }
         }
     ]
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextField.qml

@@ -30,6 +30,8 @@ T.TextField {
 
     property bool contextMenuAboutToShow: false
 
+    signal rejected
+
     horizontalAlignment: Qt.AlignLeft
     verticalAlignment: Qt.AlignVCenter
 
@@ -225,10 +227,10 @@ T.TextField {
         }
     ]
 
-    Keys.onPressed: function(event) {
+    Keys.onEscapePressed: function(event) {
-        if (event.key === Qt.Key_Escape) {
+        event.accepted = true
-            root.text = root.preFocusText
+        root.text = root.preFocusText
-            root.focus = false
+        root.rejected()
-        }
+        root.focus = false
     }
 }

share/qtcreator/translations/qtcreator_cs.ts

@@ -44,7 +44,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Přidat záložku</translation>
@@ -81,13 +81,6 @@
         <source>Add in folder:</source>
         <translation>Přidat do složky:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Záložky</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
@@ -100,21 +93,6 @@
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation type="obsolete">Chystáte se smazat složku, přičemž se smaže&lt;br&gt;i její obsah. Jste si jistý, že přesto chcete pokračovat?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nová složka</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Smazat složku</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Přejmenovat složku</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Ukázat záložku</translation>
@@ -143,17 +121,6 @@
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstranit</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Záložky</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Posunout nahoru</translation>
@@ -560,7 +527,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Vkládání kódu</translation>
@@ -609,25 +576,6 @@
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Přijat prázdný úryvek pro &quot;%1&quot;.</translation>
     </message>
-    <message>
-        <source>This protocol supports no listing</source>
-        <translation type="obsolete">Tento protokol nepodporuje výpisy</translation>
-    </message>
-    <message>
-        <source>Waiting for items</source>
-        <translation type="obsolete">Čeká se na data</translation>
-    </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
-    <message>
-        <source>Paste:</source>
-        <translation type="obsolete">Vložit:</translation>
-    </message>
-    <message>
-        <source>Protocol:</source>
-        <translation type="obsolete">Protokol:</translation>
-    </message>
     <message>
         <source>Refresh</source>
         <translation>Obnovit</translation>
@@ -640,13 +588,6 @@
         <source>This protocol does not support listing</source>
         <translation>Tento protokol nepodporuje výpisy</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">Uživatelské jméno:</translation>
-    </message>
     <message>
         <source>Copy Paste URL to clipboard</source>
         <translation type="obsolete">Kopírovat URL do schránky</translation>
@@ -659,38 +600,6 @@
         <source>General</source>
         <translation>Obecné</translation>
     </message>
-    <message>
-        <source>CodePaster</source>
-        <translation type="obsolete">CodePaster</translation>
-    </message>
-    <message>
-        <source>Default Protocol:</source>
-        <translation type="obsolete">Výchozí protokol:</translation>
-    </message>
-    <message>
-        <source>Pastebin.ca</source>
-        <translation type="obsolete">Pastebin.ca</translation>
-    </message>
-    <message>
-        <source>Pastebin.com</source>
-        <translation type="obsolete">Pastebin.com</translation>
-    </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation type="obsolete">Vkládání kódu</translation>
-    </message>
-    <message>
-        <source>Display Output pane after sending a post</source>
-        <translation type="obsolete">Po odeslání ukázat výstupní tabulku</translation>
-    </message>
-    <message>
-        <source>Copy-paste URL to clipboard</source>
-        <translation type="obsolete">Kopírovat URL do schránky</translation>
-    </message>
-    <message>
-        <source>Default protocol:</source>
-        <translation type="obsolete">Výchozí protokol:</translation>
-    </message>
 </context>
 <context>
     <name>CommonOptionsPage</name>
@@ -16766,7 +16675,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Prompt to submit</source>
         <translation type="obsolete">Potvrdit předložení</translation>
@@ -18464,7 +18373,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No Server defined in the CodePaster preferences.</source>
         <translation>V nastavení ke CodePaster nebyl stanoven žádný server.</translation>
@@ -18477,9 +18386,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>No such paste</source>
         <translation>Požadované vložení neexistuje</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation>CodePaster</translation>
@@ -18488,10 +18394,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>&lt;i&gt;Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).&lt;/i&gt;</source>
         <translation>&lt;i&gt;Poznámka: Zadejte název hostitelského počítače (serveru) pro službu CodePaster bez protokolové předpony (například: codepaster.mycompany.com).&lt;/i&gt;</translation>
     </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation type="obsolete">Vkládání kódu</translation>
-    </message>
     <message>
         <source>Server:</source>
         <translation>Server:</translation>
@@ -18635,7 +18537,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a project from a CVS repository.</source>
         <translation type="obsolete">Odhlásí projekt ze skladiště CVS.</translation>
@@ -18648,9 +18550,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>CVS Checkout</source>
         <translation>Získání (checkout) skladiště CVS</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Location</source>
         <translation>Umístění</translation>
@@ -18663,16 +18562,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>Repository:</source>
         <translation>Skladiště:</translation>
     </message>
-</context>
-<context>
-    <name>CvsPlugin</name>
-    <message>
-        <source>Cannot find repository for &apos;%1&apos;</source>
-        <translation type="obsolete">Nelze najít skladiště pro &apos;%1&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation>Nepodařilo se vyhodnotit výstup záznamu</translation>
@@ -18998,9 +18887,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation type="obsolete">Žádná odpověď od CVS v rámci časového omezení (%1 ms).</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Přidáno</translation>
@@ -19017,9 +18903,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>CVS Submit</source>
         <translation type="obsolete">Předložení CVS</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>Příkaz CVS</translation>
@@ -21205,25 +21088,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
         <translation type="obsolete">Nastavit znovu výchozí</translation>
     </message>
 </context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Formulář</translation>
-    </message>
-    <message>
-        <source>&amp;Display:</source>
-        <translation type="obsolete">&amp;Zobrazit:</translation>
-    </message>
-    <message>
-        <source>entries</source>
-        <translation type="obsolete">Záznamy</translation>
-    </message>
-    <message>
-        <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
-        <translation type="obsolete">Protokol vložení založený na sdílení souborů umožňuje sdílení kousků kódu pomocí jednoduchých souborů na sdílené síťové diskové jednotce. Soubory nejsou nikdy mazány.</translation>
-    </message>
-</context>
 <context>
     <name>Git::Internal::StashDialog</name>
     <message>
@@ -24270,9 +24134,6 @@ heslem, jež můžete zadat níže.</translation>
         <source>Code Pasting</source>
         <translation>Úryvky kódu</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Nelze otevřít soubor &apos;%1&apos;: %2</translation>
@@ -24297,23 +24158,10 @@ heslem, jež můžete zadat níže.</translation>
         <source>Pasted: %1</source>
         <translation>Vloženo: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Sdílení souboru</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteBinDotComSettings</name>
-    <message>
-        <source>Pastebin.com</source>
-        <translation type="obsolete">Pastebin.com</translation>
-    </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Poznámka&gt;</translation>
@@ -24322,9 +24170,6 @@ heslem, jež můžete zadat níže.</translation>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - Chyba v nastavení</translation>
@@ -24628,7 +24473,7 @@ heslem, jež můžete zadat níže.</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditor</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Opatřit anotacemi revizi &quot;%1&quot;</translation>
@@ -33605,15 +33450,12 @@ správy verzí (%2)</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteBinDotComProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>&lt;Unknown&gt;</source>
         <extracomment>Unknown user of paste.</extracomment>
         <translation type="obsolete">&lt;Neznámý&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Checking connection</source>
         <translation>Ověření spojení</translation>
@@ -33845,7 +33687,7 @@ Příznaky: %3</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>Nevšímat si bílých znaků</translation>
@@ -44421,7 +44263,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>Formulář</translation>
@@ -44442,13 +44284,6 @@ p, li { white-space: pre-wrap; }
         <source>entries</source>
         <translation>záznamů</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>Formulář</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; dovoluje posílání uživatelsky stanovených subdomén (například creator.pastebin.com). Zadejte požadovanou předponu.</translation>
@@ -44461,9 +44296,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Poznámka: Přídavný modul toto použije pro posílání a stejně tak natahování.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protokol:</translation>
@@ -44472,17 +44304,10 @@ p, li { white-space: pre-wrap; }
         <source>Paste:</source>
         <translation>Vložení:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Poslat na CodePaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Protokol:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Uživatelské jméno:</translation>
@@ -44531,9 +44356,6 @@ p, li { white-space: pre-wrap; }
         <source>&amp;Expires after:</source>
         <translation>&amp;Vyprší po:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Po odeslání ukázat výstupní tabulku</translation>
@@ -44550,14 +44372,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>Výchozí protokol:</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Vyprší po:</translation>
-    </message>
-    <message>
-        <source>Days</source>
-        <translation>dnech</translation>
-    </message>
 </context>
 <context>
     <name>CppTools::Internal::CppFileSettingsPage</name>
@@ -47485,15 +47299,12 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -47502,9 +47313,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Nastavení nezměněno. Přeskakuje se krok autogen.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>Argumenty:</translation>
@@ -47514,17 +47322,11 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -47533,21 +47335,11 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Nastavení nezměněno. Přeskakuje se krok autoreconf.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenty:</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -47565,9 +47357,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>New configuration name:</source>
         <translation>Název nového nastavení:</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Adresář pro sestavování:</translation>
@@ -47584,9 +47373,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>&lt;Invalid tool chain&gt;</source>
         <translation type="obsolete">&lt;Neplatná sada nástrojů&gt;</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsManager</name>
     <message>
         <source>Failed opening project &apos;%1&apos;: Project file does not exist</source>
         <translation type="obsolete">Projekt %1 se nepodařil otevřít: Soubor s projektem neexistuje</translation>
@@ -47599,54 +47385,32 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>Failed opening project &apos;%1&apos;: Project is not a file</source>
         <translation>Projekt &apos;%1&apos; se nepodařil otevřít: Daný projektový soubor není soubor</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Průvodce Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt.. Doporučuje se, nepoužívat pro vytvoření projektu zdrojový adresář. Tím se zajistí, že zdrojový adresář zůstane volný, a umožní různá sestavení s rozdílnými nastaveními.</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>Adresář pro sestavování:</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>Umístění sestavování</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsTarget</name>
     <message>
         <source>Desktop</source>
         <comment>Autotools Default target display name</comment>
         <translation type="obsolete">Stolní počítač</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsTargetFactory</name>
     <message>
         <source>Default Build</source>
         <translation type="obsolete">Výchozí sestavení</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>Configure</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>Configure</translation>
@@ -47655,21 +47419,11 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>Nastavení nezměněno, přeskakuje se krok nastavení.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenty:</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>Nastavit</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>Zpracovává se %1 v adresáři %2</translation>
@@ -47678,17 +47432,11 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>Parsing directory %1</source>
         <translation>Zpracovává se adresář %1</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
@@ -47701,13 +47449,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <source>Configuration is faulty. Check the Issues view for details.</source>
         <translation>Nastavení je chybné. Prověřte, prosím, pohled na potíže kvůli podrobnostem.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenty:</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>
@@ -56824,7 +56565,7 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsControl</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;Edit</source>
         <translation>Ú&amp;pravy</translation>

share/qtcreator/translations/qtcreator_da.ts

@@ -2406,7 +2406,7 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -2415,9 +2415,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Konfiguration uændret, springer autogen-trin over.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>Argumenter:</translation>
@@ -2427,17 +2424,11 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -2446,29 +2437,16 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Konfiguration uændret, springer autoreconf-trin over.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenter:</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -2478,9 +2456,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
         <source>Build</source>
         <translation>Byg</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Bygmappe:</translation>
@@ -2489,31 +2464,18 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
         <source>Autotools Manager</source>
         <translation>Autotools-håndtering</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Autotools-assistent</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. It is not recommended to use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Indtast venligst mappen hvor du vil bygge dit projekt. Det anbefaler ikke at bruge kildemappen til bygning. Dette sikre at kildemappen forbliver ren og muliggør flere bygninger med forskellige indstillinger.</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>Bygmappe:</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>Bygplacering</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>Konfigurer</translation>
@@ -2522,56 +2484,30 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>Konfiguration uændret, springer konfigurationstrin over.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenter:</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>Konfigurer</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>Konfigurer</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenter:</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>Parser %1 i mappen %2</translation>
@@ -3818,7 +3754,7 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
+    <name>BinEditor</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>Binær-redigeringen kan ikke åbne tomme filer.</translation>
@@ -3835,9 +3771,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Cannot open %1: %2</source>
         <translation>Kan ikke åbne %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorWidget</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>Hukommelse ved 0x%1</translation>
@@ -3940,14 +3873,14 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
     </message>
 </context>
 <context>
-    <name>BinEditorWidget::TextEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Zoom: %1%</source>
         <translation>Zoom: %1%</translation>
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Tilføj bogmærke</translation>
@@ -3980,13 +3913,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Rename Folder</source>
         <translation>Omdøb mappe</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bogmærker</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
@@ -3995,25 +3921,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Sletning af en mappe fjerner også alt dens indhold.&lt;br&gt;Vil du fortsætte?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Ny mappe</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Bogmærke</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Slet mappe</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Omdøb mappe</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Vis bogmærke</translation>
@@ -4030,9 +3941,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Rename Bookmark</source>
         <translation>Omdøb bogmærke</translation>
     </message>
-</context>
-<context>
-    <name>Bookmarks</name>
     <message>
         <source>Edit Bookmark</source>
         <translation>Rediger bogmærke</translation>
@@ -4045,10 +3953,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Line number:</source>
         <translation>Linjenummer:</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bogmærker</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Flyt op</translation>
@@ -5706,9 +5610,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>Code Pasting</source>
         <translation>Kodeindsætning</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::AuthenticationDialog</name>
     <message>
         <source>Username:</source>
         <translation>Brugernavn:</translation>
@@ -5717,9 +5618,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>Password:</source>
         <translation>Adgangskode:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodepasterPlugin</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Kodeindsætning</translation>
@@ -5764,9 +5662,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Tom snippet modtaget fra &quot;%1&quot;.</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Kan ikke åbne %1: %2</translation>
@@ -5787,16 +5682,10 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>Pasted: %1</source>
         <translation>Indsatte: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Fildeling</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
     <message>
         <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
         <translation>Den fildelingsbaseret indsætter-protokol giver mulighed for at dele kode-snippets ved brug af simple filer på et delt netværksdrev. Filer slettes aldrig.</translation>
@@ -5813,9 +5702,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>entries</source>
         <translation>poster</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; giver mulighed for at sende poster til brugerdefineret underdomæner (f.eks. creator.pastebin.com). Udfyld det ønsket præfiks.</translation>
@@ -5828,9 +5714,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Bemærk: pluginet bruger dette til både at sende og hente.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protokol:</translation>
@@ -5839,9 +5722,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>Paste:</source>
         <translation>Indsæt:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Copy-paste URL to clipboard</source>
         <translation>Kopiér-indsæt URL til udklipsholder</translation>
@@ -5858,25 +5738,14 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>Display Output pane after sending a post</source>
         <translation>Vis outputrude efter afsendelse af en post</translation>
     </message>
-    <message>
-        <source>Username:</source>
-        <translation>Brugernavn:</translation>
-    </message>
     <message>
         <source> Days</source>
         <translation> dag(e)</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Send til kodeindsætter</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Protokol:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Brugernavn:</translation>
@@ -5893,14 +5762,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
         <source>&lt;Description&gt;</source>
         <translation>&lt;beskrivelse&gt;</translation>
     </message>
-    <message>
-        <source> Days</source>
-        <translation> dag(e)</translation>
-    </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Udløber efter:</translation>
-    </message>
     <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -5925,9 +5786,6 @@ p, li { white-space: pre-wrap; }
         <source>Patch 2</source>
         <translation>Patch 2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::KdePasteProtocol</name>
     <message>
         <source>Pasting to KDE paster needs authentication.&lt;br/&gt;Enter your KDE Identity credentials to continue.</source>
         <translation>Indsætning til KDE-indsætter kræver autentifikation.&lt;br/&gt;Indtast din KDE-identitetslegitimationsoplysninger for at fortsætte.</translation>
@@ -5936,9 +5794,6 @@ p, li { white-space: pre-wrap; }
         <source>Login failed</source>
         <translation>Indlogning mislykkedes</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Pasting needs authentication.&lt;br/&gt;Enter your identity credentials to continue.</source>
         <translation>Indsætning kræver autentifikation.&lt;br/&gt;Indtast din identitetslegitimationsoplysninger for at fortsætte.</translation>
@@ -5955,9 +5810,6 @@ p, li { white-space: pre-wrap; }
         <source>Connecting to %1...</source>
         <translation>Opretter forbindelse til %1...</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>Genindlæs</translation>
@@ -5970,9 +5822,6 @@ p, li { white-space: pre-wrap; }
         <source>This protocol does not support listing</source>
         <translation>Denne protokol understøtter ikke visning</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;kommentar&gt;</translation>
@@ -5981,16 +5830,10 @@ p, li { white-space: pre-wrap; }
         <source>Paste</source>
         <translation>Indsæt</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - konfigurationsfejl</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Generelt</translation>
@@ -10278,7 +10121,7 @@ Flag: %3</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsControl</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Rediger</translation>
@@ -10287,9 +10130,6 @@ Flag: %3</translation>
         <source>CVS Checkout</source>
         <translation>CVS checkout</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsDiffConfig</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Ignorer blanktegn</translation>
@@ -10298,16 +10138,10 @@ Flag: %3</translation>
         <source>Ignore Blank Lines</source>
         <translation>Ignorer tomme linjer</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Annotate revision &quot;%1&quot;</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Cannot find repository for &quot;%1&quot;.</source>
         <translation>Kan ikke finde repository for &quot;%1&quot;.</translation>
@@ -10576,9 +10410,6 @@ Flag: %3</translation>
         <source>No CVS executable specified.</source>
         <translation>Ingen CVS-eksekverbar angivet.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Tilføjet</translation>
@@ -10591,9 +10422,6 @@ Flag: %3</translation>
         <source>Modified</source>
         <translation>Ændret</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
@@ -10638,9 +10466,6 @@ Flag: %3</translation>
         <source>CVS</source>
         <translation>CVS</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS-kommando</translation>
@@ -43009,7 +42834,7 @@ Spordataene er tabt.</translation>
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorPluginPrivate</name>
+    <name>BinEditor</name>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Fortryd</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -25,7 +25,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Lesezeichen hinzufügen</translation>
@@ -58,13 +58,6 @@
         <source>Add in folder:</source>
         <translation>Im Verzeichnis:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
@@ -73,25 +66,10 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Beim Löschen eines Verzeichnisses wird auch dessen Inhalt gelöscht.&lt;br&gt;Möchten Sie trotzdem fortsetzen?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Neues Verzeichnis</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Lesezeichen</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Verzeichnis löschen</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Verzeichnis umbenennen</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Lesezeichen anzeigen</translation>
@@ -108,13 +86,6 @@
         <source>Rename Bookmark</source>
         <translation>Lesezeichen umbenennen</translation>
     </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Nach oben</translation>
@@ -292,7 +263,7 @@
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsPlugin</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;CVS</source>
         <translation>&amp;CVS</translation>
@@ -553,9 +524,6 @@
         <source>The initial revision %1 cannot be described.</source>
         <translation>Die erste Version (%1) kann nicht weiter beschrieben werden.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Hinzugefügt</translation>
@@ -568,9 +536,6 @@
         <source>Modified</source>
         <translation>Geändert</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
@@ -611,9 +576,6 @@
         <source>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.</source>
         <translation>Wenn die Option aktiviert ist, werden beim Klick auf die Revisionsnummer in der Annotationsansicht alle Dateien angezeigt, die zu einem Commit gehören (mittels Commit-ID bestimmt). Ansonsten wird nur die betreffende Datei angezeigt.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS-Kommando</translation>
@@ -624,7 +586,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Code Pasting</translation>
@@ -669,9 +631,6 @@
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Leeren Text für &quot;%1&quot; erhalten.</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
@@ -684,9 +643,6 @@
         <source>This protocol does not support listing</source>
         <translation>Dieses Protokoll stellt keine Liste zur Verfügung</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
@@ -10613,7 +10569,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteView</name>
+    <name>CodePaster</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Kommentar&gt;</translation>
@@ -10771,7 +10727,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
     </message>
 </context>
 <context>
-    <name>CodePaster::FileShareProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Die Datei %1 kann nicht geöffnet werden: %2</translation>
@@ -10792,16 +10748,10 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
         <source>Pasted: %1</source>
         <translation>Ausschnitt: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Dateibasiert</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - Konfigurationsfehler</translation>
@@ -11432,7 +11382,7 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::NetworkProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Checking connection</source>
         <translation>Prüfe Verbindung</translation>
@@ -17150,7 +17100,7 @@ Außer: %3
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
         <translation>Das dateibasierte Paster-Protokoll dient zum Austausch von Textauschnitten mittels einfacher Dateien auf einem Netzlaufwerk. Die Dateien werden nicht gelöscht.</translation>
@@ -17167,9 +17117,6 @@ Außer: %3
         <source>entries</source>
         <translation>Einträge</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; erlaubt das Senden an benutzerdefinierte Subdomänen (zum Beispiel creator.pastebin.com). Geben Sie das gewünschte Präfix an.</translation>
@@ -17182,9 +17129,6 @@ Außer: %3
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Hinweis: Es wird sowohl zum Senden als auch zum Abholen verwendet.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protokoll:</translation>
@@ -17193,17 +17137,10 @@ Außer: %3
         <source>Paste:</source>
         <translation>Ausschnitt:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>An CodePaster senden</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Protokoll:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Nutzername:</translation>
@@ -17256,9 +17193,6 @@ p, li { white-space: pre-wrap; }
         <source>Make public:</source>
         <translation>Öffentlich machen:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Ausgabebereich nach Senden anzeigen</translation>
@@ -17275,14 +17209,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>Vorgabeprotokoll:</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Verfällt nach:</translation>
-    </message>
-    <message>
-        <source> Days</source>
-        <translation> Tagen</translation>
-    </message>
     <message>
         <source>Make pasted content public by default</source>
         <translation>Hochgeladene Inhalte standardmäßig öffentlich machen</translation>
@@ -18139,7 +18065,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
@@ -18157,9 +18083,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Unveränderte Konfiguration, autogen-Schritt wird übersprungen.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
@@ -18169,24 +18092,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumente:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Unveränderte Konfiguration, autoreconf-Schritt wird übersprungen.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Autotools-Assistent</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. It is not recommended to use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Bitte geben Sie das Verzeichnis ein, in dem das Projekt erstellt werden soll. Es wird empfohlen, nicht das Quellverzeichnis zum Erstellen zu verwenden. Das ermöglicht es, das Projekt mehrmals mit verschiedenen Einstellungen zu erstellen.</translation>
@@ -18199,9 +18112,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Build Location</source>
         <translation>Build-Verzeichnis</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
@@ -18211,17 +18121,10 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configure</source>
         <translation>Konfigurieren</translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumente:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>Unveränderte Konfiguration, configure-Schritt wird übersprungen.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>Werte %1 im Verzeichnis %2 aus</translation>
@@ -28198,7 +28101,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation>
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
+    <name>BinEditor</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>Der Binäreditor kann keine leeren Dateien öffnen.</translation>
@@ -28705,7 +28608,7 @@ Möchten Sie sie jetzt auschecken?</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Annotation für Revision &quot;%1&quot;</translation>
@@ -37503,7 +37406,7 @@ Fehler: %5</translation>
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>Speicher bei 0x%1</translation>
@@ -37614,7 +37517,7 @@ Fehler: %5</translation>
     </message>
 </context>
 <context>
-    <name>BinEditorWidget::TextEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Zoom: %1%</source>
         <translation>Vergrößerung: %1%</translation>
@@ -42534,7 +42437,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorPlugin</name>
+    <name>BinEditor</name>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Rückgängig</translation>
@@ -44782,7 +44685,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autotools Manager</source>
         <translation>Autotools-Verwaltung</translation>
@@ -48863,7 +48766,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>CodePaster::DPasteDotComProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>%1: %2</source>
         <translation>%1: %2</translation>

share/qtcreator/translations/qtcreator_es.ts

@@ -89,7 +89,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Agregar marcador</translation>
@@ -126,17 +126,10 @@
         <source>Rename Folder</source>
         <translation>Renombrar directorio</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
     <message>
         <source>Bookmark</source>
         <translation type="obsolete">Marcador</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marcadores</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Suprimir</translation>
@@ -149,17 +142,6 @@
         <source>New Folder</source>
         <translation>Nuevo directorio</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Suprimir directorio</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Renombrar directorio</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Mostrar marcador</translation>
@@ -184,17 +166,6 @@
         <source>Add</source>
         <translation>Agregar</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Suprimir</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marcadores</translation>
-    </message>
     <message>
         <source>&amp;Remove Bookmark</source>
         <translation>Sup&amp;rimir marcador</translation>
@@ -542,7 +513,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;CodePaster</source>
         <translation></translation>
@@ -571,9 +542,6 @@
         <source>Waiting for items</source>
         <translation>Esperando items</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CustomFetcher</name>
     <message>
         <source>CodePaster Error</source>
         <translation type="obsolete">Error de CodePaster</translation>
@@ -582,20 +550,10 @@
         <source>Could not fetch code</source>
         <translation type="obsolete">No se pudo obtener el código</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CustomPoster</name>
-    <message>
-        <source>CodePaster Error</source>
-        <translation type="obsolete">Error de CodePaster</translation>
-    </message>
     <message>
         <source>Some error occured while posting</source>
         <translation type="obsolete">Ocurrió algún error mientras se enviaba el código</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Paste:</source>
         <translation>Pegar:</translation>
@@ -605,9 +563,6 @@
         <source>Protocol:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>CodePaster Server:</source>
         <translation type="obsolete">Servidor CodePaster:</translation>
@@ -11246,7 +11201,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Prompt to submit</source>
         <translation type="unfinished">Preguntar antes de enviar</translation>
@@ -12157,14 +12112,11 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No such paste</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation type="unfinished"></translation>
@@ -12248,7 +12200,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a project from a CVS repository.</source>
         <translation type="unfinished"></translation>
@@ -12257,9 +12209,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS Checkout</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Specify repository and path.</source>
         <translation type="unfinished"></translation>
@@ -12268,16 +12217,10 @@ p, li { white-space: pre-wrap; }
         <source>Repository:</source>
         <translation type="unfinished">Repositorio:</translation>
     </message>
-</context>
-<context>
-    <name>CvsPlugin</name>
     <message>
         <source>Cannot find repository for &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation type="unfinished"></translation>
@@ -12468,9 +12411,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation type="unfinished"></translation>
@@ -12487,9 +12427,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS Submit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation type="unfinished"></translation>

share/qtcreator/translations/qtcreator_fr.ts

@@ -48,7 +48,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Ajouter un signet</translation>
@@ -85,17 +85,10 @@
         <source>Add in folder:</source>
         <translation>Ajouter dans le dossier :</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
     <message>
         <source>Bookmark</source>
         <translation type="obsolete">Signet</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Signets</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
@@ -108,21 +101,6 @@
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation type="obsolete">Vous allez supprimer un dossier et tout ce qu&apos;il contient.&lt;br&gt;Êtes vous sûr de vouloir continuer ?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nouveau dossier</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Supprimer le dossier</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Renommer le dossier</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Afficher le signet</translation>
@@ -151,17 +129,6 @@
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Signets</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Déplacer vers le haut</translation>
@@ -592,7 +559,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;CodePaster</source>
         <translation type="obsolete">&amp;CodePaster</translation>
@@ -650,13 +617,6 @@
         <source>This protocol supports no listing</source>
         <translation type="obsolete">Ce protocole ne prend en charge le listage</translation>
     </message>
-    <message>
-        <source>Waiting for items</source>
-        <translation type="obsolete">En attente des éléments</translation>
-    </message>
-</context>
-<context>
-    <name>CodePaster::CustomFetcher</name>
     <message>
         <source>CodePaster Error</source>
         <translation type="obsolete">Erreur dans CodePaster</translation>
@@ -665,29 +625,10 @@
         <source>Could not fetch code</source>
         <translation type="obsolete">Impossible de récuperer le code</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CustomPoster</name>
-    <message>
-        <source>CodePaster Error</source>
-        <translation type="obsolete">Erreur dans CodePaster</translation>
-    </message>
     <message>
         <source>Some error occured while posting</source>
         <translation type="obsolete">Une erreur s&apos;est produite lors de la publication</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
-    <message>
-        <source>Paste:</source>
-        <translatorcomment>quelque chose de plus français pour la référence de paste?</translatorcomment>
-        <translation type="obsolete">Collage :</translation>
-    </message>
-    <message>
-        <source>Protocol:</source>
-        <translation type="obsolete">Protocole :</translation>
-    </message>
     <message>
         <source>Refresh</source>
         <translation>Rafraîchir</translation>
@@ -700,61 +641,10 @@
         <source>This protocol does not support listing</source>
         <translation>Ce protocole ne prend en charge le listage</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
-    <message>
-        <source>CodePaster Server:</source>
-        <translation type="obsolete">Serveur CodePaster :</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">Nom d&apos;utilisateur :</translation>
-    </message>
-    <message>
-        <source>Copy Paste URL to clipboard</source>
-        <translation type="obsolete">Copier l&apos;URL dans le presse papier</translation>
-    </message>
-    <message>
-        <source>Display Output Pane after sending a post</source>
-        <translation type="obsolete">Afficher le résultat après publication</translation>
-    </message>
-    <message>
-        <source>CodePaster</source>
-        <translation type="obsolete">CodePaster</translation>
-    </message>
-    <message>
-        <source>Default Protocol:</source>
-        <translation type="obsolete">Protocole par défaut :</translation>
-    </message>
-    <message>
-        <source>Pastebin.ca</source>
-        <translation type="obsolete">Pastebin.ca</translation>
-    </message>
-    <message>
-        <source>Pastebin.com</source>
-        <translation type="obsolete">Pastebin.com</translation>
-    </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation type="obsolete">Collage de code</translation>
-    </message>
-    <message>
-        <source>Display Output pane after sending a post</source>
-        <translation type="obsolete">Afficher le résultat après publication</translation>
-    </message>
-    <message>
-        <source>Copy-paste URL to clipboard</source>
-        <translation type="obsolete">Copier l&apos;URL dans le presse papier</translation>
-    </message>
-    <message>
-        <source>Default protocol:</source>
-        <translation type="obsolete">Protocole par défaut :</translation>
-    </message>
 </context>
 <context>
     <name>CompletionSettingsPage</name>
@@ -17917,7 +17807,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Prompt to submit</source>
         <translation type="obsolete">Invite lors du submit</translation>
@@ -19121,7 +19011,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No Server defined in the CodePaster preferences!</source>
         <translation type="obsolete">Aucun serveur définit dans les préférences CodePaster !</translation>
@@ -19142,9 +19032,6 @@ p, li { white-space: pre-wrap; }
         <source>No such paste</source>
         <translation>Aucun collage de ce type</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation>CodePaster</translation>
@@ -19153,10 +19040,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;i&gt;Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).&lt;/i&gt;</source>
         <translation>&lt;i&gt;Note : spécifier le nom d&apos;hôte pour le service CodePaster sans aucun protocole (par exemple, codepaster.mycompany.com).&lt;/i&gt;</translation>
     </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation type="obsolete">Collage de code</translation>
-    </message>
     <message>
         <source>Server:</source>
         <translation>Serveur :</translation>
@@ -19227,7 +19110,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a project from a CVS repository.</source>
         <translation type="obsolete">Obtient un projet à partir d&apos;un dépôt CVS.</translation>
@@ -19240,9 +19123,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS Checkout</source>
         <translation>Import CVS</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Location</source>
         <translation>Emplacement</translation>
@@ -19255,16 +19135,6 @@ p, li { white-space: pre-wrap; }
         <source>Repository:</source>
         <translation>Dépôt :</translation>
     </message>
-</context>
-<context>
-    <name>CvsPlugin</name>
-    <message>
-        <source>Cannot find repository for &apos;%1&apos;</source>
-        <translation type="obsolete">Impossible de trouver le dépot de &quot;%1&quot;</translation>
-    </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation>Échec de l&apos;analyse de la sortie </translation>
@@ -19590,9 +19460,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation type="obsolete">CVS n&apos;a pas répondu dans le temps imparti (%1 ms).</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Ajouté</translation>
@@ -19609,9 +19476,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS Submit</source>
         <translation type="obsolete">CVS Submit</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS Command</translation>
@@ -21416,31 +21280,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
         <translation type="obsolete">Restaurer les paramètres par défaut</translation>
     </message>
 </context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Formulaire</translation>
-    </message>
-    <message>
-        <source>&amp;Path:</source>
-        <translation type="obsolete">Che&amp;min :</translation>
-    </message>
-    <message>
-        <source>&amp;Display:</source>
-        <translation type="obsolete">&amp;Afficher :</translation>
-    </message>
-    <message>
-        <source>entries</source>
-        <translation type="obsolete">Entrées</translation>
-    </message>
-    <message>
-        <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
-        <translatorcomment>J&apos;ai traduis &quot;fileshare&quot;. Mais la phrase me semble lourde...
-cédric : je pense qu&apos;il faut laisser comme ça moi ou alors carrément enlever &quot;basé sur le partage de fichiers&quot; mais du coup on en perd en route ... (j&apos;ai changé &quot;Les fichiers&quot; en &quot;Ces fichiers&quot;, je trouve que ça fait moins pompeux.</translatorcomment>
-        <translation type="obsolete">Le protocole de collage basé sur le partage de fichier permet de partager des fragments de code en utilisant de simples fichiers sur un disque réseau partagé. Ces fichiers ne sont jamais effacés.</translation>
-    </message>
-</context>
 <context>
     <name>Git::Internal::StashDialog</name>
     <message>
@@ -24395,9 +24234,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
         <source>Code Pasting</source>
         <translation>Collage de code</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Imposible d&apos;ouvrir %1 : %2</translation>
@@ -24422,23 +24258,10 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
         <source>Pasted: %1</source>
         <translation>Copié : %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Fileshare</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteBinDotComSettings</name>
-    <message>
-        <source>Pastebin.com</source>
-        <translation type="obsolete">Pastebin.com</translation>
-    </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Commentaire&gt;</translation>
@@ -24447,9 +24270,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - Erreur de configuration</translation>
@@ -24762,7 +24582,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditor</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Révision annotée &quot;%1&quot;</translation>
@@ -29220,7 +29040,7 @@ La liste du serveur était %2.</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::NetworkProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Checking connection</source>
         <translation>Vérification de la connexion</translation>
@@ -38822,7 +38642,7 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteBinDotComProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>&lt;Unknown&gt;</source>
         <extracomment>Unknown user of paste.</extracomment>
@@ -38862,7 +38682,7 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>Ignorer les espaces</translation>
@@ -43134,7 +42954,7 @@ Filtre : %2
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>Formulaire</translation>
@@ -43155,13 +42975,6 @@ Filtre : %2
         <source>entries</source>
         <translation>Entrées</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>Formulaire</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; permet d&apos;envoyer d&apos;envoyer des messages à des sous-domaines personnalisés (comme creator.pastebin.com). Remplissez le préfixe désiré. </translation>
@@ -43174,9 +42987,6 @@ Filtre : %2
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Note : le plug-in utilisera ceci pour poster et récupérer. &lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protocole :</translation>
@@ -43185,17 +42995,10 @@ Filtre : %2
         <source>Paste:</source>
         <translation>Collage :</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Envoyer sur Codepaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Protocole :</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Utilisateur :</translation>
@@ -43244,9 +43047,6 @@ p, li { white-space: pre-wrap; }
         <source>&amp;Expires after:</source>
         <translation>&amp;Expire après :</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Afficher le résultat après publication</translation>
@@ -43263,14 +43063,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>Protocole par défaut :</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Expire après :</translation>
-    </message>
-    <message>
-        <source>Days</source>
-        <translation>Jours</translation>
-    </message>
 </context>
 <context>
     <name>CppTools::Internal::CppFileSettingsPage</name>
@@ -45153,15 +44945,12 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -45170,9 +44959,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Configuration inchangée, étape autogen ignorée.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>Arguments :</translation>
@@ -45182,17 +44968,11 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -45201,21 +44981,11 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Configuration inchangée, étape autoreconf ignorée.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Arguments :</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -45233,9 +45003,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>New configuration name:</source>
         <translation>Nom de la nouvelle configuration :</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Répertoire de compilation :</translation>
@@ -45252,9 +45019,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>&lt;Invalid tool chain&gt;</source>
         <translation type="obsolete">&lt;Chaîne d&apos;outils invalide&gt;</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsManager</name>
     <message>
         <source>Failed opening project &apos;%1&apos;: Project file does not exist</source>
         <translation type="obsolete">Échec de l&apos;ouverture du projet &quot;%1&apos; : le fichier du projet n&quot;existe pas</translation>
@@ -45267,47 +45031,28 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>Failed opening project &apos;%1&apos;: Project is not a file</source>
         <translation>Échec de l&apos;ouverture du projet &quot;%1&quot; : le projet n&apos;est pas un fichier</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Assistant Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. Qt Creator recommande de ne pas utiliser le répertoire source pour la compilation. Cela garantit que le répertoire source reste propre et permet des compilations multiples avec différents paramètres.</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>Répertoire de compilation :</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>Emplacement de compilation</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsTarget</name>
     <message>
         <source>Desktop</source>
         <comment>Autotools Default target display name</comment>
         <translation type="obsolete">Desktop</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>Configurer</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
@@ -45317,21 +45062,11 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <translatorcomment>ignorée ?</translatorcomment>
         <translation>Configuration inchangée, étape de configuration sautée.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Arguments :</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>Configurer</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translatorcomment>Analyse, car c&apos;est une action en court</translatorcomment>
@@ -45341,17 +45076,11 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>Parsing directory %1</source>
         <translation>Analyse du répertoire %1</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
@@ -45364,13 +45093,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <source>Configuration is faulty. Check the Issues view for details.</source>
         <translation>La configuration est défectueuse, veuillez vérifier la vue des problèmes pour les détails.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Arguments :</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>
@@ -53656,7 +53378,7 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsControl</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>

share/qtcreator/translations/qtcreator_hr.ts

@@ -2939,7 +2939,7 @@ Za to upiši ovaj prečac i jedan razmak u polje za unos mjesta, a zatim riječ
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
         <translation>Protokol lijepljenja temeljen na programu za zajedničko korištenje datoteka, omogućuje dijeljenje isječaka kȏda pomoću jednostavnih datoteka na zajedničkom mrežnom pogonu. Datoteke se nikad ne brišu.</translation>
@@ -2956,9 +2956,6 @@ Za to upiši ovaj prečac i jedan razmak u polje za unos mjesta, a zatim riječ
         <source>entries</source>
         <translation>unosa</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; omogućuje slanje članaka na prilagođene poddomene (npr. creator.pastebin.com). Unesi željeni prefiks.</translation>
@@ -2971,9 +2968,6 @@ Za to upiši ovaj prečac i jedan razmak u polje za unos mjesta, a zatim riječ
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Napomena: Dodatak će koristiti prefiks za slanje i za dohvaćanje.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protokol:</translation>
@@ -2982,17 +2976,10 @@ Za to upiši ovaj prečac i jedan razmak u polje za unos mjesta, a zatim riječ
         <source>Paste:</source>
         <translation>Zalijepi:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Pošalji na Codepaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Protokol:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Korisničko ime:</translation>
@@ -3041,9 +3028,6 @@ p, li { white-space: pre-wrap; }
         <source>Patch 2</source>
         <translation>Zakrpa 2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Copy-paste URL to clipboard</source>
         <translation>Kopiraj-zalijepi URL u međuspremnik</translation>
@@ -3052,10 +3036,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>Zadani protokol:</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Isteći će nakon:</translation>
-    </message>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Pirkaži ploču izrade nakon slanja članka</translation>
@@ -3064,10 +3044,6 @@ p, li { white-space: pre-wrap; }
         <source>Username:</source>
         <translation>Korisničko ime:</translation>
     </message>
-    <message>
-        <source> Days</source>
-        <translation> dana</translation>
-    </message>
 </context>
 <context>
     <name>CppCodeModelInspectorDialog</name>
@@ -3609,7 +3585,7 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguracija</translation>
@@ -9383,7 +9359,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj knjižnu oznaku</translation>
@@ -15521,7 +15497,7 @@ Check the test environment.</source>
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
@@ -15539,9 +15515,6 @@ Check the test environment.</source>
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
@@ -15551,17 +15524,10 @@ Check the test environment.</source>
         <source>Autoreconf</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation type="unfinished">Argumenti:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -15571,27 +15537,14 @@ Check the test environment.</source>
         <source>Build</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
-    <message>
-        <source>Build directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Autotools Manager</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. It is not recommended to use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation type="unfinished"></translation>
@@ -15604,9 +15557,6 @@ Check the test environment.</source>
         <source>Build Location</source>
         <translation>Mjesto izgradnje</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
@@ -15616,17 +15566,10 @@ Check the test environment.</source>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation type="unfinished">Argumenti:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping configure step.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation type="unfinished"></translation>
@@ -16464,7 +16407,7 @@ Check the test environment.</source>
     </message>
 </context>
 <context>
-    <name>BinEditor::BinEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>Memorija pri 0x%1</translation>
@@ -16626,7 +16569,7 @@ Check the test environment.</source>
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
+    <name>BinEditor</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>Binarni uređivač ne može otvoriti prazne datoteke.</translation>
@@ -16643,9 +16586,6 @@ Check the test environment.</source>
         <source>Cannot open %1: %2</source>
         <translation>Nije moguće otvoriti %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorPlugin</name>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Poništi</translation>
@@ -16654,135 +16594,28 @@ Check the test environment.</source>
         <source>&amp;Redo</source>
         <translation>Po&amp;novi</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorWidget</name>
-    <message>
-        <source>Memory at 0x%1</source>
-        <translation>Memorija pri 0x%1</translation>
-    </message>
-    <message>
-        <source>Decimal&amp;nbsp;unsigned&amp;nbsp;value:</source>
-        <translation>Decimalna&amp;nbsp;nepotpisana&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Decimal&amp;nbsp;signed&amp;nbsp;value:</source>
-        <translation>Decimalna&amp;nbsp;potpisana&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;decimal&amp;nbsp;unsigned&amp;nbsp;value:</source>
-        <translation>Prethodna&amp;nbsp;decimalna&amp;nbsp;nepotpisana&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;decimal&amp;nbsp;signed&amp;nbsp;value:</source>
-        <translation>Prethodna&amp;nbsp;decimalna&amp;nbsp;potpisana&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>%1-bit&amp;nbsp;Integer&amp;nbsp;Type</source>
-        <translation>%1-bit&amp;nbsp;cjelobrojna&amp;nbsp;vrsta</translation>
-    </message>
-    <message>
-        <source>Little Endian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Big Endian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary&amp;nbsp;value:</source>
-        <translation>Binarna&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Octal&amp;nbsp;value:</source>
-        <translation>Oktalna&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;binary&amp;nbsp;value:</source>
-        <translation>Prethodna&amp;nbsp;binarna&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;octal&amp;nbsp;value:</source>
-        <translation>Prethodna&amp;nbsp;oktalna&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;double&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>&lt;i&gt;dupla&lt;/i&gt;&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Previous &lt;i&gt;double&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>Prethodna &lt;i&gt;dupla&lt;/i&gt;&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;float&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>&lt;i&gt;pomična&lt;/i&gt;&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Previous &lt;i&gt;float&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>Prethodna &lt;i&gt;pomična&lt;/i&gt;&amp;nbsp;vrijednost:</translation>
-    </message>
-    <message>
-        <source>Copying Failed</source>
-        <translation>Neuspjelo kopiranje</translation>
-    </message>
-    <message>
-        <source>You cannot copy more than 4 MB of binary data.</source>
-        <translation>Ne možeš kopirati više od 4 MB binarnih podataka.</translation>
-    </message>
-    <message>
-        <source>Copy Selection as ASCII Characters</source>
-        <translation>Kopiraj odabir kao ASCII znakove</translation>
-    </message>
-    <message>
-        <source>Copy Selection as Hex Values</source>
-        <translation>Kopiraj odabir kao heksadecimalne znakove</translation>
-    </message>
-    <message>
-        <source>Set Data Breakpoint on Selection</source>
-        <translation>Postavi točku prekida podataka na odabiru</translation>
-    </message>
     <message>
         <source>Copy 0x%1</source>
         <translation>Kopiraj 0x%1</translation>
     </message>
-    <message>
-        <source>Jump to Address in This Window</source>
-        <translation>Prijeđi na adresu u ovom prozoru</translation>
-    </message>
-    <message>
-        <source>Jump to Address in New Window</source>
-        <translation>Prijeđi na adresu u novom prozoru</translation>
-    </message>
     <message>
         <source>Copy Value</source>
         <translation>Kopiraj vrijednost</translation>
     </message>
-    <message>
-        <source>Jump to Address 0x%1 in This Window</source>
-        <translation>Prijeđi na adresu 0x%1 u ovom prozoru</translation>
-    </message>
-    <message>
-        <source>Jump to Address 0x%1 in New Window</source>
-        <translation>Prijeđi na adresu 0x%1 u novom prozoru</translation>
-    </message>
 </context>
 <context>
-    <name>BinEditorWidget::TextEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Zoom: %1%</source>
         <translation>Zumiranje: %1%</translation>
     </message>
 </context>
 <context>
-    <name>BookmarkManager</name>
+    <name>Bookmarks</name>
     <message>
         <source>Bookmark</source>
         <translation>Knjižna oznaka</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Knjižne oznake</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Ukloni</translation>
@@ -16791,17 +16624,6 @@ Check the test environment.</source>
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Brisanjem mape se uklanja i njen sadržaj.&lt;br&gt;Želiš li nastaviti?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nova mapa</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Knjižne oznake</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Premjesti prema gore</translation>
@@ -20608,18 +20430,11 @@ u kontrolu verzija (%2)
     </message>
 </context>
 <context>
-    <name>CodePaster::AuthenticationDialog</name>
+    <name>CodePaster</name>
-    <message>
-        <source>Username:</source>
-        <translation>Korisničko ime:</translation>
-    </message>
     <message>
         <source>Password:</source>
         <translation>Lozinka:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodepasterPlugin</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Lijepljenje kȏda</translation>
@@ -20664,9 +20479,6 @@ u kontrolu verzija (%2)
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Dobiven je prazan isječak za &quot;%1&quot;.</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Nije moguće otvoriti %1: %2</translation>
@@ -20687,16 +20499,10 @@ u kontrolu verzija (%2)
         <source>Pasted: %1</source>
         <translation>Zalijepljeno: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Dijeljenje datoteka</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::KdePasteProtocol</name>
     <message>
         <source>Pasting to KDE paster needs authentication.&lt;br/&gt;Enter your KDE Identity credentials to continue.</source>
         <translation>Za lijepljenje u KDE paster je potrebna autenticikacija.&lt;br/&gt;Upiši tvoje podatke za KDE identifikaciju za nastavljanje.</translation>
@@ -20705,16 +20511,10 @@ u kontrolu verzija (%2)
         <source>Login failed</source>
         <translation>Neuspjela prijava</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteCodeDotXyzProtocol</name>
     <message>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>Aktualiziraj</translation>
@@ -20727,9 +20527,6 @@ u kontrolu verzija (%2)
         <source>This protocol does not support listing</source>
         <translation>Ovaj protokol ne podržava popis</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Komentar&gt;</translation>
@@ -20738,16 +20535,10 @@ u kontrolu verzija (%2)
         <source>Paste</source>
         <translation>Zalijepi</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 – Greška u konfiguraciji</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Pasting needs authentication.&lt;br/&gt;Enter your identity credentials to continue.</source>
         <translation>Za lijepljenje je potrebna autenticikacija.&lt;br/&gt;Upiši tvoje podatke za identifikaciju za nastavljanje.</translation>
@@ -20764,16 +20555,10 @@ u kontrolu verzija (%2)
         <source>Connecting to %1...</source>
         <translation>Povezivanje na %1 …</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Opće</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster</name>
     <message>
         <source>Code Pasting</source>
         <translation>Lijepljenje kȏda</translation>
@@ -21807,7 +21592,7 @@ Oznake: %3</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffConfig</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation type="unfinished"></translation>
@@ -21816,9 +21601,6 @@ Oznake: %3</translation>
         <source>Ignore Blank Lines</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsControl</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Uredi</translation>
@@ -21827,16 +21609,10 @@ Oznake: %3</translation>
         <source>CVS Checkout</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Cannot find repository for &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
@@ -22081,9 +21857,6 @@ Oznake: %3</translation>
         <source>No CVS executable specified.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation type="unfinished"></translation>
@@ -22096,9 +21869,6 @@ Oznake: %3</translation>
         <source>Modified</source>
         <translation>Posljednja promjena</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation type="unfinished"></translation>
@@ -40894,15 +40664,7 @@ What do you want to do?</source>
     </message>
 </context>
 <context>
-    <name>BookmarkWidget</name>
+    <name>Bookmarks</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Ukloni mapu</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Preimenuj mapu</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Prikaži knjižnu oznaku</translation>

share/qtcreator/translations/qtcreator_hu.ts

@@ -77,7 +77,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Künyvjelző hozzáadása</translation>
@@ -110,13 +110,6 @@
         <source>Rename Folder</source>
         <translation>Dosszié átnevezése</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Könyvjelzők</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Eltávolítás</translation>
@@ -125,13 +118,6 @@
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation>Egy olyan irattárat fog törölni, mely &lt;br&gt;törölni fogja annak tartalmát is. Biztos benne, hogy folytatni szeretné?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Új dosszié</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
     <message>
         <source>Delete Folder</source>
         <translation>Irattár törlése</translation>
@@ -164,21 +150,10 @@
         <source>Add</source>
         <translation>Hozzáadás</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Eltávolítás</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
     <message>
         <source>&amp;Remove Bookmark</source>
         <translation type="obsolete">Könyvjelző &amp;eltávolítása</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Könyvjelzők</translation>
-    </message>
     <message>
         <source>Remove all Bookmarks</source>
         <translation>Az összes könyvjelző eltávolítása</translation>
@@ -540,7 +515,7 @@
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsPlugin</name>
+    <name>Cvs</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation>A log kimenet elemzése nem sikerült</translation>
@@ -731,9 +706,6 @@
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation>A CVS nem válaszolt az időtúllépési korláton belül (%1 ms).</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Hozzáadva</translation>
@@ -750,9 +722,6 @@
         <source>CVS Submit</source>
         <translation>CVS feltöltés</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizard</name>
     <message>
         <source>Checks out a project from a CVS repository.</source>
         <translation>Egy projekt megnézése egy CVS tárolóból.</translation>
@@ -761,9 +730,6 @@
         <source>CVS Checkout</source>
         <translation>CVS megnézés</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Specify repository and path.</source>
         <translation>Határozza meg a tárolót és az útvonalat.</translation>
@@ -772,9 +738,6 @@
         <source>Repository:</source>
         <translation>Tároló:</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPage</name>
     <message>
         <source>Prompt to submit</source>
         <translation>Feltöltési prompt</translation>
@@ -803,16 +766,10 @@
         <source>CVS</source>
         <translation>CVS</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS parancs</translation>
     </message>
-</context>
-<context>
-    <name>CvsPlugin</name>
     <message>
         <source>Cannot find repository for &apos;%1&apos;</source>
         <translation>&apos;%1&apos; tárolóra nem található</translation>
@@ -896,7 +853,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::0</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;CodePaster</source>
         <translation type="obsolete">&amp;KódBeillesztő</translation>
@@ -961,9 +918,6 @@
         <source>CodePaster</source>
         <translation type="obsolete">KódBeillesztés</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterProtocol</name>
     <message>
         <source>No Server defined in the CodePaster preferences.</source>
         <translation>Nincsen szerver definiálva a KódBeillesztő beállításokban.</translation>
@@ -976,9 +930,6 @@
         <source>No such paste</source>
         <translation>Nincs ilyen beillesztés</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation>KódBeillesztés</translation>
@@ -995,9 +946,6 @@
         <source>Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).</source>
         <translation>Megjegyzés: Határozza meg a hosz nevet a KódBeillesztő szolgáltatás számára. (például codepaster.mycompany.com).</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodepasterPlugin</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Kód beillesztés</translation>
@@ -1026,9 +974,6 @@
         <source>Waiting for items</source>
         <translation>Elemekre várakozás</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protokoll:</translation>
@@ -1037,9 +982,6 @@
         <source>Paste:</source>
         <translation>Beillesztés:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Általános</translation>
@@ -1048,10 +990,6 @@
         <source>Default Protocol:</source>
         <translation>Alapértelmezett protokoll:</translation>
     </message>
-    <message>
-        <source>CodePaster</source>
-        <translation>KódBeillesztés</translation>
-    </message>
     <message>
         <source>Pastebin.ca</source>
         <translation>Pastebin.ca</translation>
@@ -1072,10 +1010,6 @@
         <source>Display Output Pane after sending a post</source>
         <translation>Kimeneti panel kijelzése egy küldés után</translation>
     </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation>Kód beillesztés</translation>
-    </message>
 </context>
 <context>
     <name>CommonOptionsPage</name>

share/qtcreator/translations/qtcreator_it.ts

@@ -98,7 +98,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Aggiungi un Segnalibro</translation>
@@ -135,17 +135,10 @@
         <source>Rename Folder</source>
         <translation>Rinomina la Cartella</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
     <message>
         <source>Bookmark</source>
         <translation type="obsolete">Segnalibro</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Segnalibri</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
@@ -158,17 +151,6 @@
         <source>New Folder</source>
         <translation>Nuova Cartella</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Cancella la Cartella</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Rinomina la Cartella</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Mostra il Segnalibro</translation>
@@ -193,17 +175,6 @@
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Rimuovi</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Segnalibri</translation>
-    </message>
     <message>
         <source>&amp;Remove Bookmark</source>
         <translation>&amp;Rimuovi Segnalibro</translation>
@@ -560,7 +531,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;CodePaster</source>
         <translation>&amp;CodePaster</translation>
@@ -589,9 +560,6 @@
         <source>Waiting for items</source>
         <translation>Sto aspettando gli elementi</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CustomFetcher</name>
     <message>
         <source>CodePaster Error</source>
         <translation type="obsolete">Errore CodePaster</translation>
@@ -600,20 +568,10 @@
         <source>Could not fetch code</source>
         <translation type="obsolete">Non riesco a caricare il codice</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CustomPoster</name>
-    <message>
-        <source>CodePaster Error</source>
-        <translation type="obsolete">Errore CodePaster</translation>
-    </message>
     <message>
         <source>Some error occured while posting</source>
         <translation type="obsolete">C&apos;è stato un errore nella spedizione</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Paste:</source>
         <translation>Incolla:</translation>
@@ -623,9 +581,6 @@
         <source>Protocol:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>CodePaster Server:</source>
         <translation type="obsolete">Server CodePaster:</translation>
@@ -11144,7 +11099,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Prompt to submit</source>
         <translation type="unfinished">Prompt del submit</translation>
@@ -12010,14 +11965,11 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No such paste</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation type="unfinished">CodePaster</translation>
@@ -12108,7 +12060,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a project from a CVS repository.</source>
         <translation type="unfinished"></translation>
@@ -12117,9 +12069,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS Checkout</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Specify repository and path.</source>
         <translation type="unfinished"></translation>
@@ -12128,16 +12077,10 @@ p, li { white-space: pre-wrap; }
         <source>Repository:</source>
         <translation type="unfinished">Deposito:</translation>
     </message>
-</context>
-<context>
-    <name>CvsPlugin</name>
     <message>
         <source>Cannot find repository for &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation type="unfinished"></translation>
@@ -12328,9 +12271,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation type="unfinished"></translation>
@@ -12347,9 +12287,6 @@ p, li { white-space: pre-wrap; }
         <source>CVS Submit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation type="unfinished"></translation>

share/qtcreator/translations/qtcreator_ja.ts

@@ -1814,7 +1814,7 @@ Local pulls are not applied to the master branch.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>フォーム</translation>
@@ -1835,13 +1835,6 @@ Local pulls are not applied to the master branch.</source>
         <source>entries</source>
         <translation>エントリ</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>フォーム</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; は、独自のサブドメイン(例:creator.pastebin.com)に送信する事もできます。希望するプレフィックスを入力してください。</translation>
@@ -1854,9 +1847,6 @@ Local pulls are not applied to the master branch.</source>
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;注意: プラグインは受信時だけでなく送信時にも、この設定を使用します。&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>プロトコル:</translation>
@@ -1865,17 +1855,10 @@ Local pulls are not applied to the master branch.</source>
         <source>Paste:</source>
         <translation>貼り付け:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Codepaster に送る</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>プロトコル:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>ユーザー名(&amp;U):</translation>
@@ -1928,9 +1911,6 @@ p, li { white-space: pre-wrap; }
         <source>Make public:</source>
         <translation>公開する:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Copy-paste URL to clipboard</source>
         <translation>貼り付けた URL をクリップボードにコピーする</translation>
@@ -1939,10 +1919,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>既定のプロトコル:</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>有効期間(&amp;E):</translation>
-    </message>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>送信後にアウトプットペインを表示する</translation>
@@ -1951,10 +1927,6 @@ p, li { white-space: pre-wrap; }
         <source>Username:</source>
         <translation>ユーザー名:</translation>
     </message>
-    <message>
-        <source> Days</source>
-        <translation> 日</translation>
-    </message>
     <message>
         <source>Make pasted content public by default</source>
         <translation>貼り付けたコンテンツをデフォルトで公開</translation>
@@ -2535,7 +2507,7 @@ These prefixes are used in addition to current file name on Switch Header/Source
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Configuration</source>
         <translation>設定</translation>
@@ -7513,7 +7485,7 @@ SSH 認証が必要とされるリポジトリで使用されます(SSH の SSH_
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>ブックマークの追加</translation>
@@ -12297,15 +12269,12 @@ in the system&apos;s browser for manual download.</source>
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -12318,66 +12287,29 @@ in the system&apos;s browser for manual download.</source>
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>設定が変更されていない為、autogen ステップをスキップします。</translation>
     </message>
-    <message>
-        <source>Autogen</source>
-        <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
-        <translation>Autogen</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>引数:</translation>
-    </message>
     <message>
         <source>Autogen</source>
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation>引数:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>設定が変更されていない為、autoreconf ステップをスキップします。</translation>
     </message>
-    <message>
-        <source>Autoreconf</source>
-        <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
-        <translation>Autoreconf</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>引数:</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -12387,9 +12319,6 @@ in the system&apos;s browser for manual download.</source>
         <source>Build</source>
         <translation>ビルド</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>ビルドディレクトリ:</translation>
@@ -12398,23 +12327,14 @@ in the system&apos;s browser for manual download.</source>
         <source>Autotools Manager</source>
         <translation>Autotools マネージャ</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsManager</name>
     <message>
         <source>Failed opening project &quot;%1&quot;: Project is not a file</source>
         <translation>プロジェクト &quot;%1&quot; が開けません: プロジェクトがファイルではありません</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Autotools ウィザード</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>プロジェクトをビルドするディレクトリを指定してください。Qt Creator ではソースディレクトリ内でのビルドは推奨していません。ソースディレクトリとビルドディレクトリを分ける事でソースをきれいに保ち、異なる設定での複数のビルドを行う事ができます。</translation>
@@ -12423,57 +12343,28 @@ in the system&apos;s browser for manual download.</source>
         <source>Please enter the directory in which you want to build your project. It is not recommended to use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>プロジェクトをビルドするためのディレクトリを入力してください。ビルドにソースディレクトリを使用することはお勧めしません。これにより、ソース・ディレクトリがクリーンな状態に保たれ、異なる設定での複数回のビルドが可能になります。</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>ビルドディレクトリ:</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>ビルドパス</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>設定する</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>設定する</translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation>引数:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>設定が変更されていない為、configure ステップをスキップします。</translation>
     </message>
-    <message>
-        <source>Configure</source>
-        <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
-        <translation>設定する</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>引数:</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>設定する</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>ディレクトリ %2 の %1 を解析中</translation>
@@ -12482,28 +12373,15 @@ in the system&apos;s browser for manual download.</source>
         <source>Parsing directory %1</source>
         <translation>ディレクトリ %1 を解析中</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>引数:</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>
@@ -12971,10 +12849,6 @@ in the system&apos;s browser for manual download.</source>
 </context>
 <context>
     <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>ブックマーク</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>上に移動</translation>
@@ -14925,9 +14799,6 @@ to version control (%2)
         <source>Code Pasting</source>
         <translation>コード貼り付け</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodepasterPlugin</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>コード貼り付け(&amp;C)</translation>
@@ -14972,9 +14843,6 @@ to version control (%2)
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>&quot;%1&quot; から空のテンプレートを受信しました。</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>%1 を開けません: %2</translation>
@@ -14995,16 +14863,10 @@ to version control (%2)
         <source>Pasted: %1</source>
         <translation>貼り付け: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Fileshare</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>更新</translation>
@@ -15017,9 +14879,6 @@ to version control (%2)
         <source>This protocol does not support listing</source>
         <translation>このプロトコルは一覧表示をサポートしていません</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;コメント&gt;</translation>
@@ -15028,16 +14887,10 @@ to version control (%2)
         <source>Paste</source>
         <translation>貼り付け</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - 設定エラー</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Checking connection</source>
         <translation>接続の確認</translation>
@@ -15046,9 +14899,6 @@ to version control (%2)
         <source>Connecting to %1...</source>
         <translation>%1 に接続中...</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>一般</translation>
@@ -15935,7 +15785,7 @@ Flags: %3</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsControl</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
@@ -15944,9 +15794,6 @@ Flags: %3</source>
         <source>CVS Checkout</source>
         <translation>CVS チェックアウト</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Cannot find repository for &quot;%1&quot;.</source>
         <translation>&quot;%1&quot; にリポジトリが見つかりません。</translation>
@@ -15967,14 +15814,6 @@ Flags: %3</source>
         <source>Ignore Blank Lines</source>
         <translation>空行を無視</translation>
     </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>編集(&amp;E)</translation>
-    </message>
-    <message>
-        <source>CVS Checkout</source>
-        <translation>CVS チェックアウト</translation>
-    </message>
     <message>
         <source>Diff Current File</source>
         <translation>現在のファイルの差分表示</translation>
@@ -16235,20 +16074,6 @@ Flags: %3</source>
         <source>The initial revision %1 cannot be described.</source>
         <translation>初期リビジョン %1 に説明はありません。</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
-    <message>
-        <source>Ignore Whitespace</source>
-        <translation>空白を無視</translation>
-    </message>
-    <message>
-        <source>Ignore Blank Lines</source>
-        <translation>空行を無視</translation>
-    </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>追加</translation>
@@ -16261,17 +16086,10 @@ Flags: %3</source>
         <source>Modified</source>
         <translation>変更</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS コマンド</translation>
     </message>
-    <message>
-        <source>CVS</source>
-        <translation>CVS</translation>
-    </message>
 </context>
 <context>
     <name>Debugger</name>
@@ -33495,15 +33313,7 @@ When a problem is detected, the application is interrupted and can be debugged.<
     </message>
 </context>
 <context>
-    <name>BookmarkWidget</name>
+    <name>Bookmarks</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>フォルダを削除する</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>フォルダ名の変更</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>ブックマークを開く</translation>
@@ -33520,13 +33330,6 @@ When a problem is detected, the application is interrupted and can be debugged.<
         <source>Rename Bookmark</source>
         <translation>ブックマークの名前変更</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>ブックマーク</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>削除</translation>
@@ -33535,10 +33338,6 @@ When a problem is detected, the application is interrupted and can be debugged.<
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>フォルダを削除すると中身も削除されます。&lt;br&gt;続行しますか？</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>新しいフォルダ</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>ブックマーク</translation>
@@ -38791,7 +38590,7 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop
     </message>
 </context>
 <context>
-    <name>BinEditor::BinEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>0x%1 のメモリ</translation>
@@ -38892,9 +38691,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop
         <source>Jump to Address 0x%1 in New Window</source>
         <translation>新規ウィンドウでアドレス 0x%1 に移動</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>バイナリエディタでは空のファイルを開けません。</translation>
@@ -38911,9 +38707,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop
         <source>Cannot open %1: %2</source>
         <translation>%1 を開けません: %2</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorPlugin</name>
     <message>
         <source>&amp;Undo</source>
         <translation>元に戻す(&amp;U)</translation>
@@ -40116,7 +39909,7 @@ Do you want to check them out now?</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>リビジョン &quot;%1&quot; のアノテーション</translation>
@@ -48088,11 +47881,7 @@ Android パッケージソースディレクトリのファイルはビルドデ
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration</name>
+    <name>AutotoolsProjectManager</name>
-    <message>
-        <source>Autotools Manager</source>
-        <translation>Autotools マネージャ</translation>
-    </message>
 </context>
 <context>
     <name>BuildConfiguration</name>
@@ -49026,118 +48815,18 @@ The name of the release build configuration created by default for a qmake proje
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorWidget</name>
+    <name>BinEditor</name>
-    <message>
-        <source>Memory at 0x%1</source>
-        <translation>0x%1 のメモリ</translation>
-    </message>
-    <message>
-        <source>Decimal&amp;nbsp;unsigned&amp;nbsp;value:</source>
-        <translation>符号無し10進数:</translation>
-    </message>
-    <message>
-        <source>Decimal&amp;nbsp;signed&amp;nbsp;value:</source>
-        <translation>符号付き10進数:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;decimal&amp;nbsp;unsigned&amp;nbsp;value:</source>
-        <translation>直前の符号無し10進数:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;decimal&amp;nbsp;signed&amp;nbsp;value:</source>
-        <translation>直前の符号付き10進数:</translation>
-    </message>
-    <message>
-        <source>%1-bit&amp;nbsp;Integer&amp;nbsp;Type</source>
-        <translation>%1 ビット整数型</translation>
-    </message>
-    <message>
-        <source>Little Endian</source>
-        <translation>リトルエンディアン</translation>
-    </message>
-    <message>
-        <source>Big Endian</source>
-        <translation>ビッグエンディアン</translation>
-    </message>
-    <message>
-        <source>Binary&amp;nbsp;value:</source>
-        <translation>2進数:</translation>
-    </message>
-    <message>
-        <source>Octal&amp;nbsp;value:</source>
-        <translation>8進数:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;binary&amp;nbsp;value:</source>
-        <translation>直前の2進数:</translation>
-    </message>
-    <message>
-        <source>Previous&amp;nbsp;octal&amp;nbsp;value:</source>
-        <translation>直前の8進数:</translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;double&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>&lt;i&gt;倍精度浮動小数点&lt;/i&gt;数:</translation>
-    </message>
-    <message>
-        <source>Previous &lt;i&gt;double&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>直前の&lt;i&gt;倍精度浮動小数点&lt;/i&gt;数:</translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;float&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>&lt;i&gt;単精度浮動小数点&lt;/i&gt;数:</translation>
-    </message>
-    <message>
-        <source>Previous &lt;i&gt;float&lt;/i&gt;&amp;nbsp;value:</source>
-        <translation>直前の&lt;i&gt;単精度浮動小数点&lt;/i&gt;数:</translation>
-    </message>
-    <message>
-        <source>Copying Failed</source>
-        <translation>コピー失敗</translation>
-    </message>
-    <message>
-        <source>You cannot copy more than 4 MB of binary data.</source>
-        <translation>4MB より大きなバイナリデータはコピーできません。</translation>
-    </message>
-    <message>
-        <source>Copy Selection as ASCII Characters</source>
-        <translation>選択内容を ASCII 文字列としてコピーする</translation>
-    </message>
-    <message>
-        <source>Copy Selection as Hex Values</source>
-        <translation>選択内容を16進数の値としてコピーする</translation>
-    </message>
-    <message>
-        <source>Set Data Breakpoint on Selection</source>
-        <translation>選択した箇所にデータブレークポイントを設定</translation>
-    </message>
     <message>
         <source>Copy 0x%1</source>
         <translation>0x%1をコピー</translation>
     </message>
-    <message>
-        <source>Jump to Address in This Window</source>
-        <translation>ウィンドウ内でアドレスに移動</translation>
-    </message>
-    <message>
-        <source>Jump to Address in New Window</source>
-        <translation>新規ウィンドウでアドレスに移動</translation>
-    </message>
     <message>
         <source>Copy Value</source>
         <translation>値をコピー</translation>
     </message>
-    <message>
-        <source>Jump to Address 0x%1 in This Window</source>
-        <translation>ウィンドウ内でアドレス 0x%1 に移動</translation>
-    </message>
-    <message>
-        <source>Jump to Address 0x%1 in New Window</source>
-        <translation>新規ウィンドウでアドレス 0x%1 に移動</translation>
-    </message>
 </context>
 <context>
-    <name>BinEditorWidget::TextEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Zoom: %1%</source>
         <translation>拡大率: %1%</translation>

share/qtcreator/translations/qtcreator_pl.ts

@@ -317,7 +317,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteSelectDialog</name>
+    <name>CodePaster</name>
     <message>
         <source>Refresh</source>
         <translation>Odśwież</translation>
@@ -330,16 +330,13 @@
         <source>This protocol does not support listing</source>
         <translation>Ten protokół nie obsługuje wyświetlania zawartości</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>CVS</source>
         <translation>CVS</translation>
@@ -1378,7 +1375,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj zakładkę</translation>
@@ -1986,10 +1983,6 @@ Przyczyna: %3</translation>
 </context>
 <context>
     <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zakładki</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Przenieś do góry</translation>
@@ -2770,7 +2763,7 @@ Kontynuować?</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>Wklejanie &amp;kodu</translation>
@@ -2933,7 +2926,7 @@ Kontynuować?</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsPlugin</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;CVS</source>
         <translation>&amp;CVS</translation>
@@ -3206,9 +3199,6 @@ Kontynuować?</translation>
         <source>The initial revision %1 cannot be described.</source>
         <translation>Początkowa wersja %1 nie może być opisana.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Dodano</translation>
@@ -3221,9 +3211,6 @@ Kontynuować?</translation>
         <source>Modified</source>
         <translation>Zmodyfikowano</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>Komenda CVS</translation>
@@ -9958,15 +9945,7 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych
     </message>
 </context>
 <context>
-    <name>BookmarkWidget</name>
+    <name>Bookmarks</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Usuń katalog</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Zmień nazwę katalogu</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Pokaż zakładkę</translation>
@@ -9983,13 +9962,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych
         <source>Rename Bookmark</source>
         <translation>Zmień nazwę zakładki</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zakładki</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Usuń</translation>
@@ -9998,10 +9970,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Usunięcie katalogu usuwa również jego zawartość.&lt;br&gt;Czy kontynuować?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nowy katalog</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Zakładka</translation>
@@ -11018,9 +10986,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
         <source>Code Pasting</source>
         <translation>Wklejanie kodu</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Komentarz&gt;</translation>
@@ -12345,7 +12310,7 @@ które można ustawić poniżej.</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::FileShareProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Nie można otworzyć %1: %2</translation>
@@ -12366,16 +12331,10 @@ które można ustawić poniżej.</translation>
         <source>Pasted: %1</source>
         <translation>Wklejono: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Fileshare</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - Błąd konfiguracji</translation>
@@ -13156,7 +13115,7 @@ Lista serwera: %2.</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::NetworkProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Checking connection</source>
         <translation>Sprawdzanie połączenia</translation>
@@ -19427,7 +19386,7 @@ Wykluczenia: %3
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>Formularz</translation>
@@ -19448,13 +19407,6 @@ Wykluczenia: %3
         <source>entries</source>
         <translation>wpisów</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>Formularz</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; pozwala wysyłać fragmenty kodu do własnych poddomen (np. creator.pastebin.com). Podaj przedrostek serwera.</translation>
@@ -19467,9 +19419,6 @@ Wykluczenia: %3
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Uwaga: wtyczka użyje go zarówno do wysyłania jak i pobierania fragmentów kodu.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Protokół:</translation>
@@ -19478,17 +19427,10 @@ Wykluczenia: %3
         <source>Paste:</source>
         <translation>Wklej:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Wyślij do Codepaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Protokół:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>Nazwa &amp;użytkownika:</translation>
@@ -19537,9 +19479,6 @@ p, li { white-space: pre-wrap; }
         <source> Days</source>
         <translation> Dni</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Pokazuj panel z komunikatami po wysłaniu kodu</translation>
@@ -19556,14 +19495,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>Domyślny protokół:</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>Okr&amp;es ważności:</translation>
-    </message>
-    <message>
-        <source> Days</source>
-        <translation> Dni</translation>
-    </message>
 </context>
 <context>
     <name>CppTools::Internal::CppFileSettingsPage</name>
@@ -21249,15 +21180,12 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -21266,9 +21194,6 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Konfiguracja niezmieniona, krok autogen pominięty.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>Argumenty:</translation>
@@ -21278,17 +21203,11 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -21297,21 +21216,11 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Konfiguracja niezmieniona, krok autoreconf pominięty.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenty:</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -21321,9 +21230,6 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <source>Build</source>
         <translation>Wersja</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Katalog wersji:</translation>
@@ -21332,39 +21238,23 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <source>Autotools Manager</source>
         <translation>Menedżer Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Kreator Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Podaj katalog, w którym zbudować projekt. Zaleca się nie budować projektu w katalogu ze źródłami. Dzięki temu katalog ze źródłami pozostaje czysty i możliwe jest zbudowanie wielu wersji z różnymi ustawieniami, na podstawie tych samych źródeł.</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>Katalog wersji:</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>Położenie wersji</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>Konfiguracja</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>Konfiguracja</translation>
@@ -21373,21 +21263,11 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>Konfiguracja niezmieniona, krok konfiguracji pominięty.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenty:</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>Konfiguracja</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>Parsowanie %1 w katalogu %2</translation>
@@ -21396,28 +21276,15 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
         <source>Parsing directory %1</source>
         <translation>Parsowanie katalogu %1</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Argumenty:</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>
@@ -25398,7 +25265,7 @@ Więcej informacji w dokumentacji &quot;Checking Code Syntax&quot;.</translation
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsControl</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Edycja</translation>
@@ -30433,7 +30300,7 @@ Zainstaluj SDK o wersji %1 lub wyższej.</translation>
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
+    <name>BinEditor</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>Edytor plików binarnych nie może otwierać pustych plików.</translation>
@@ -30450,9 +30317,6 @@ Zainstaluj SDK o wersji %1 lub wyższej.</translation>
         <source>Cannot open %1: %2</source>
         <translation>Nie można otworzyć %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorPlugin</name>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Cofnij</translation>
@@ -30986,7 +30850,7 @@ Do you want to check them out now?</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Dołącz adnotację do wersji &quot;%1&quot;</translation>
@@ -39993,7 +39857,7 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>Pamięć w 0x%1</translation>
@@ -41705,7 +41569,7 @@ Błąd: %2</translation>
     </message>
 </context>
 <context>
-    <name>BinEditorWidget::TextEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Zoom: %1%</source>
         <translation>Powiększenie:%1%</translation>
@@ -41946,18 +41810,11 @@ Błąd: %2</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::AuthenticationDialog</name>
+    <name>CodePaster</name>
-    <message>
-        <source>Username:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
     <message>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::KdePasteProtocol</name>
     <message>
         <source>Pasting to KDE paster needs authentication.&lt;br/&gt;Enter your KDE Identity credentials to continue.</source>
         <translation type="unfinished"></translation>
@@ -42012,7 +41869,7 @@ Błąd: %2</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffConfig</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Ignoruj białe znaki</translation>

share/qtcreator/translations/qtcreator_ru.ts

@@ -3543,7 +3543,7 @@ Warning: this is an experimental feature and might lead to failing to execute th
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
@@ -3561,9 +3561,6 @@ Warning: this is an experimental feature and might lead to failing to execute th
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Конфигурация не изменилась, этап autogen пропускается.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
@@ -3573,31 +3570,18 @@ Warning: this is an experimental feature and might lead to failing to execute th
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation>Параметры:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Конфигурация не изменилась, этап autoreconf пропускается.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration</name>
     <message>
         <source>Autotools Manager</source>
         <translation>Управление Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Мастер Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. It is not recommended to use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Укажите каталог, в котором желаете собирать проект. Рекомендуется не использовать каталог с исходниками для сборки. Это позволит поддерживать каталог с исходниками в чистоте, а также даст возможность делать несколько сборок с различными настройками.</translation>
@@ -3610,9 +3594,6 @@ Warning: this is an experimental feature and might lead to failing to execute th
         <source>Build Location</source>
         <translation>Каталог сборки</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
@@ -3622,17 +3603,10 @@ Warning: this is an experimental feature and might lead to failing to execute th
         <source>Configure</source>
         <translation>Configure</translation>
     </message>
-    <message>
-        <source>Arguments:</source>
-        <translation>Параметры:</translation>
-    </message>
     <message>
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>Конфигурация не изменилась, этап configure пропускается.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>Обрабатывается %1 в каталоге %2</translation>
@@ -5455,7 +5429,7 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
     </message>
 </context>
 <context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
+    <name>BinEditor</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>Двоичный редактор не может открывать пустые файлы.</translation>
@@ -5472,9 +5446,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Cannot open %1: %2</source>
         <translation>Не удалось открыть %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorPlugin</name>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить</translation>
@@ -5483,9 +5454,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>&amp;Redo</source>
         <translation>&amp;Повторить</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorWidget</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>Память с 0x%1</translation>
@@ -5596,14 +5564,14 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
     </message>
 </context>
 <context>
-    <name>BinEditorWidget::TextEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Zoom: %1%</source>
         <translation>Масштаб: %1%</translation>
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
@@ -5636,13 +5604,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Add in folder:</source>
         <translation>Добавить в папку:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
@@ -5651,25 +5612,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Удаление папки приведёт к удалению её содержимого.&lt;br&gt;Желаете продолжить?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Новая папка</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Закладка</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Удалить папку</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Переименовать папку</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Показать закладку</translation>
@@ -5686,13 +5632,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Rename Bookmark</source>
         <translation>Переименовать закладку</translation>
     </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Edit Bookmark</source>
         <translation>Изменение закладки</translation>
@@ -8412,9 +8351,6 @@ Set a valid executable first.</source>
         <source>Code Pasting</source>
         <translation>Вставка кода</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodepasterPlugin</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>Вставка &amp;Кода</translation>
@@ -8459,16 +8395,10 @@ Set a valid executable first.</source>
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Для «%1» получен пустой фрагмент.</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::DPasteDotComProtocol</name>
     <message>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Не удалось открыть %1: %2</translation>
@@ -8489,16 +8419,10 @@ Set a valid executable first.</source>
         <source>Pasted: %1</source>
         <translation>Вставлен: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Общие файлы</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
     <message>
         <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
         <translation>Протокол на базе общих файлов позволяет публиковать фрагменты кода используя обычные файлы на общем сетевом диске. Файлы никогда не удаляются.</translation>
@@ -8515,9 +8439,6 @@ Set a valid executable first.</source>
         <source>entries</source>
         <translation> записей</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; позволяет отправлять данные на пользовательские субдомены (например, creator.pastebin.com). Поэтому укажите желаемый префикс.</translation>
@@ -8530,9 +8451,6 @@ Set a valid executable first.</source>
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Модуль будет использовать префикс, как для отправки, так и для получения.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Протокол:</translation>
@@ -8541,9 +8459,6 @@ Set a valid executable first.</source>
         <source>Paste:</source>
         <translation>Вставить:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Отправив данные, показать окно вывода</translation>
@@ -8572,17 +8487,10 @@ Set a valid executable first.</source>
         <source>Make pasted content public by default</source>
         <translation>По умолчанию публиковать вставляемую информацию</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Отправить в Codepaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Протокол:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Пользователь:</translation>
@@ -8621,21 +8529,10 @@ p, li { white-space: pre-wrap; }
         <source>Patch 2</source>
         <translation></translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Истекает через:</translation>
-    </message>
-    <message>
-        <source> Days</source>
-        <translation> дней</translation>
-    </message>
     <message>
         <source>Make public:</source>
         <translation>Публиковать:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Checking connection</source>
         <translation>Проверка соединения</translation>
@@ -8644,9 +8541,6 @@ p, li { white-space: pre-wrap; }
         <source>Connecting to %1...</source>
         <translation>Подключение к %1...</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>Обновить</translation>
@@ -8659,9 +8553,6 @@ p, li { white-space: pre-wrap; }
         <source>This protocol does not support listing</source>
         <translation>Данный протокол не поддерживает получение списка</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>Paste</source>
         <translation>Вставить</translation>
@@ -8670,16 +8561,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Комментарий&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - ошибка конфигурации</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Основное</translation>
@@ -13882,14 +13767,11 @@ Do you want to display them anyway?</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Аннотация ревизии «%1»</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>&amp;CVS</source>
         <translation>&amp;CVS</translation>
@@ -14150,9 +14032,6 @@ Do you want to display them anyway?</source>
         <source>The initial revision %1 cannot be described.</source>
         <translation>Невозможно описать начальную ревизию %1.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Добавлен</translation>
@@ -14165,9 +14044,6 @@ Do you want to display them anyway?</source>
         <source>Modified</source>
         <translation>Изменён</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>Настройка</translation>
@@ -14208,9 +14084,6 @@ Do you want to display them anyway?</source>
         <source>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.</source>
         <translation>Если включено, по щелчку на номере ревизии при просмотре аннотации (полученной по идентификатору фиксации) будут отображаться все зафиксированные файлы. В противном случае, только соответствующий файл.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>Команда CVS</translation>
@@ -52313,7 +52186,7 @@ What do you want to do?</source>
     </message>
 </context>
 <context>
-    <name>WebAssembly::Internal::EmrunRunConfigurationFactory</name>
+    <name>WebAssembly</name>
     <message>
         <source>Effective emrun call:</source>
         <translation>Команда запуска emrun:</translation>
@@ -52322,9 +52195,6 @@ What do you want to do?</source>
         <source>Launch with emrun</source>
         <translation>Запустить через emrun</translation>
     </message>
-</context>
-<context>
-    <name>WebAssembly::Internal::WebAssemblyDevice</name>
     <message>
         <source>Web Browser</source>
         <translation>Браузер</translation>
@@ -52333,9 +52203,6 @@ What do you want to do?</source>
         <source>WebAssembly Runtime</source>
         <translation>Среда WebAssembly</translation>
     </message>
-</context>
-<context>
-    <name>WebAssembly::Internal::WebAssemblyToolChain</name>
     <message>
         <source>Emscripten Compiler</source>
         <translation>Компилятор Emscripten</translation>
@@ -52344,9 +52211,6 @@ What do you want to do?</source>
         <source>WebAssembly</source>
         <translation>WebAssembly</translation>
     </message>
-</context>
-<context>
-    <name>WebAssembly::Internal::WebBrowserSelectionAspect</name>
     <message>
         <source>Web browser</source>
         <translation>Браузер</translation>
@@ -52355,9 +52219,6 @@ What do you want to do?</source>
         <source>Web browser:</source>
         <translation>Браузер:</translation>
     </message>
-</context>
-<context>
-    <name>WebAssemblyPlugin</name>
     <message>
         <source>WebAssembly</source>
         <comment>Qt Version is meant for WebAssembly</comment>

share/qtcreator/translations/qtcreator_sl.ts

@@ -109,7 +109,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj zaznamek</translation>
@@ -149,13 +149,6 @@
         <source>Add in Folder:</source>
         <translation type="obsolete">Dodaj v mapo:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zaznamki</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
@@ -164,25 +157,10 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Izbris mape odstrani tudi njeno vsebino.&lt;br&gt;Ali želite nadaljevati?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nova mapa</translation>
-    </message>
     <message>
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation type="obsolete">Nameravate izbrisati mapo, pri čemer bo zbrisana&lt;br&gt;tudi njena vsebina. Ali res želite nadaljevati?</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Izbriši mapo</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Preimenuj mapo</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Prikaži zaznamek</translation>
@@ -203,17 +181,6 @@
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstrani</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zaznamki</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Premakni gor</translation>
@@ -500,7 +467,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Lepljenje kode</translation>
@@ -529,9 +496,6 @@
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Za »%1« je bil prejet prazen izrezek.</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Paste:</source>
         <translation>Prilepi:</translation>
@@ -553,9 +517,6 @@
         <source>This protocol does not support listing</source>
         <translation>Protokol ne podpira izpisa seznama</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>Username:</source>
         <translation>Uporabniško ime:</translation>
@@ -11021,7 +10982,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>CVS</source>
         <translation>CVS</translation>
@@ -12286,7 +12247,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No Server defined in the CodePaster preferences.</source>
         <translation>V nastavitvah za CodePaster ni določenega nobenega strežnika.</translation>
@@ -12299,9 +12260,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <source>No such paste</source>
         <translation>Tak prilepek ne obstaja</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation>CodePaster</translation>
@@ -12383,7 +12341,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a CVS repository and tries to load the contained project.</source>
         <translation>Prevzame skladišče CVS in poskusi naložiti vsebovani projekt.</translation>
@@ -12392,9 +12350,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <source>CVS Checkout</source>
         <translation>Prevzem iz CVS</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Location</source>
         <translation>Mesto</translation>
@@ -12407,9 +12362,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <source>Repository:</source>
         <translation>Skladišče:</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation>Razčlenjevanje dnevnika ni uspelo.</translation>
@@ -12698,9 +12650,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation type="obsolete">CVS se v za to namenjenem času (%1 ms) ni odzval.</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Dodana</translation>
@@ -12713,9 +12662,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <source>Modified</source>
         <translation>Spremenjena</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>Ukaz CVS</translation>
@@ -13650,7 +13596,7 @@ Razlog: %2</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>Obrazec</translation>
@@ -15686,9 +15632,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
         <source>Code Pasting</source>
         <translation>Prilepljanje kode</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Ni moč odpreti %1: %2</translation>
@@ -15713,23 +15656,14 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
         <source>Unable to open a file for writing in %1: %2</source>
         <translation type="obsolete">Datoteke ni moč odpreti za pisanje v %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Fileshare</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteBinDotComSettings</name>
     <message>
         <source>Pastebin.com</source>
         <translation>Pastebin.com</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;komentar&gt;</translation>
@@ -15738,9 +15672,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - Napaka pri nastavitvi</translation>
@@ -15964,7 +15895,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditor</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>Dodaj opombo za revizijo »%1«</translation>
@@ -23090,16 +23021,13 @@ Vedite: to lahko odstrani krajevno datoteko.</translation>
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteBinDotComProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>&lt;Unknown&gt;</source>
         <extracomment>Unknown user of paste.
 </extracomment>
         <translation>&lt;neznano&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Checking connection</source>
         <translation>Preverjanje povezave</translation>
@@ -23242,7 +23170,7 @@ Vedite: to lahko odstrani krajevno datoteko.</translation>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>Prezri presledke</translation>

share/qtcreator/translations/qtcreator_uk.ts

@@ -806,7 +806,7 @@ Local pulls are not applied to the master branch.</source>
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Додати закладку</translation>
@@ -839,13 +839,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Add in folder:</source>
         <translation>Додати в теку:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Видалити</translation>
@@ -854,21 +847,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Видалення теки призводить до видалення її вмісту.&lt;br&gt;Бажаєте продовжити?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Нова тека</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Видалити теку</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Перейменувати теку</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Показати закладку</translation>
@@ -889,17 +867,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Add</source>
         <translation type="vanished">Додати</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation type="vanished">Видалити</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Пересунути вгору</translation>
@@ -1347,9 +1314,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Code Pasting</source>
         <translation>Вставка коду</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterProtocol</name>
     <message>
         <source>No Server defined in the CodePaster preferences.</source>
         <translation type="vanished">Не вказано сервер в налаштуваннях CodePaster.</translation>
@@ -1362,9 +1326,6 @@ Local pulls are not applied to the master branch.</source>
         <source>No such paste</source>
         <translation type="vanished">Немає такої вставки</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation type="vanished">CodePaster</translation>
@@ -1377,9 +1338,6 @@ Local pulls are not applied to the master branch.</source>
         <source>&lt;i&gt;Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).&lt;/i&gt;</source>
         <translation type="vanished">&lt;i&gt;Примітка: Задайте назву вузла сервісу, не вказуючи протокол (наприклад. codepaster.mycompany.com).&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodepasterPlugin</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>Вставка &amp;коду</translation>
@@ -1428,9 +1386,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>Отримано порожній фрагмент для &quot;%1&quot;.</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocol</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>Неможливо відкрити %1: %2</translation>
@@ -1451,16 +1406,10 @@ Local pulls are not applied to the master branch.</source>
         <source>Pasted: %1</source>
         <translation>Вставлено: %1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>Fileshare</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::NetworkProtocol</name>
     <message>
         <source>Checking connection</source>
         <translation>Перевірка підключення</translation>
@@ -1469,9 +1418,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Connecting to %1...</source>
         <translation>Підключення до %1...</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>Оновити</translation>
@@ -1484,9 +1430,6 @@ Local pulls are not applied to the master branch.</source>
         <source>This protocol does not support listing</source>
         <translation>Цей протокол не підтримує отримання списку</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;Коментар&gt;</translation>
@@ -1495,9 +1438,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Paste</source>
         <translation>Вставити</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - помилка конфігурації</translation>
@@ -1506,9 +1446,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Settings...</source>
         <translation type="vanished">Налаштування...</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>Загальне</translation>
@@ -24762,7 +24699,7 @@ With cache simulation, further event counters are enabled:
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>Форма</translation>
@@ -24783,13 +24720,6 @@ With cache simulation, further event counters are enabled:
         <source>entries</source>
         <translation> елементів</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; дозволяє надсилати дані до піддоменів користувача (наприклад. creator.pastebin.com). Вкажіть бажаний префікс.</translation>
@@ -24802,9 +24732,6 @@ With cache simulation, further event counters are enabled:
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;Примітка: Додаток буде використовувати цей префікс і для отримання даних.&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>Протокол:</translation>
@@ -24813,17 +24740,10 @@ With cache simulation, further event counters are enabled:
         <source>Paste:</source>
         <translation>Вставка:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>Надіслати до Codepaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>Протокол:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>&amp;Ім&apos;я користувача:</translation>
@@ -24876,9 +24796,6 @@ p, li { white-space: pre-wrap; }
         <source> Days</source>
         <translation> днів</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>Показати панель виведення після надсилання</translation>
@@ -24895,18 +24812,6 @@ p, li { white-space: pre-wrap; }
         <source>Default protocol:</source>
         <translation>Типовий протокол:</translation>
     </message>
-    <message>
-        <source>&amp;Expires after:</source>
-        <translation>&amp;Застаріє через:</translation>
-    </message>
-    <message>
-        <source>Days</source>
-        <translation type="vanished"> днів</translation>
-    </message>
-    <message>
-        <source> Days</source>
-        <translation> днів</translation>
-    </message>
 </context>
 <context>
     <name>CppTools::Internal::CppFileSettingsPage</name>
@@ -25008,7 +24913,7 @@ These prefixes are used in addition to current file name on Switch Header/Source
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>Configuration</source>
         <translation>Конфігурація</translation>
@@ -26355,19 +26260,12 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-    <message>
-        <source>Autogen</source>
-        <translation type="vanished">Autogen</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -26376,9 +26274,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>Конфігурація не змінилась, пропускаємо крок autogen.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>Аргументи:</translation>
@@ -26388,25 +26283,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-    <message>
-        <source>Autogen</source>
-        <translation type="vanished">Autogen</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-    <message>
-        <source>Autoreconf</source>
-        <translation type="vanished">Autoreconf</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -26415,25 +26296,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>Конфігурація не змінилась, пропускаємо крок autoreconf.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Аргументи:</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-    <message>
-        <source>Autoreconf</source>
-        <translation type="vanished">Autoreconf</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.</extracomment>
@@ -26451,9 +26318,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>New configuration name:</source>
         <translation type="vanished">Назва нової конфігурації:</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Тека збірки:</translation>
@@ -26462,9 +26326,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Autotools Manager</source>
         <translation>Управління Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsManager</name>
     <message>
         <source>Failed opening project &apos;%1&apos;: Project is not a file</source>
         <translation type="vanished">Збій відкриття проекту &apos;%1&apos;: Проект не є файлом</translation>
@@ -26473,43 +26334,23 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Failed opening project &quot;%1&quot;: Project is not a file</source>
         <translation>Збій відкриття проекту &quot;%1&quot;: Проект не є файлом</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Майстер Autotools</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. Qt Creator рекомендує не використовувати теку з кодом для збірки. Це гарантуватиме, що тека з кодом лишатиметься чистою, та дозволить здійснювати декілька збірок з різними налаштуваннями.</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>Тека збірки:</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>Розташування збірки</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>Configure</translation>
     </message>
-    <message>
-        <source>Configure</source>
-        <translation type="vanished">Configure</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>Configure</translation>
@@ -26518,25 +26359,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>Конфігурація не змінилась, пропускаємо крок configure.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Аргументи:</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>Configure</translation>
     </message>
-    <message>
-        <source>Configure</source>
-        <translation type="vanished">Configure</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>Розбір %1 в теці %2</translation>
@@ -26545,21 +26372,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Parsing directory %1</source>
         <translation>Розбір теки %1</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-    <message>
-        <source>Make</source>
-        <translation type="vanished">Make</translation>
-    </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
@@ -26572,22 +26389,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration is faulty. Check the Issues view for details.</source>
         <translation type="vanished">Конфігурація збійна. Перевірте вид &quot;Проблеми&quot; для деталей.</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>Аргументи:</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>
         <translation>Make</translation>
     </message>
-    <message>
-        <source>Make</source>
-        <translation type="vanished">Make</translation>
-    </message>
 </context>
 <context>
     <name>BinEditorDocument</name>
@@ -26697,7 +26503,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
+    <name>Cvs</name>
     <message>
         <source>Location</source>
         <translation type="vanished">Розташування</translation>
@@ -26710,9 +26516,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Repository:</source>
         <translation type="vanished">Сховище:</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Cannot find repository for &apos;%1&apos;</source>
         <translation type="vanished">Неможливо знайти сховище для &apos;%1&apos;</translation>
@@ -27001,9 +26804,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>No cvs executable specified!</source>
         <translation type="vanished">Виконуваний модуль cvs не вказано!</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
     <message>
         <source>Ignore whitespace</source>
         <translation type="vanished">Ігнорувати пропуски</translation>
@@ -27020,9 +26820,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Ignore Blank Lines</source>
         <translation>Ігнорувати порожні рядки</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>Додано</translation>
@@ -27035,9 +26832,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Modified</source>
         <translation>Змінено</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>Команда CVS</translation>
@@ -36186,7 +35980,7 @@ Partial names can be used if they are unambiguous.</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsControl</name>
+    <name>Cvs</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Редагувати</translation>
@@ -44036,7 +43830,7 @@ Deploying local Qt libraries is incompatible with Android 5.</source>
     </message>
 </context>
 <context>
-    <name>BinEditor::BinEditorWidget</name>
+    <name>BinEditor</name>
     <message>
         <source>Memory at 0x%1</source>
         <translation>Пам&apos;ять в  0x%1</translation>
@@ -44137,9 +43931,6 @@ Deploying local Qt libraries is incompatible with Android 5.</source>
         <source>Jump to Address 0x%1 in New Window</source>
         <translation>Перейти до адреси 0x%1 в новому вікні</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorDocument</name>
     <message>
         <source>The Binary Editor cannot open empty files.</source>
         <translation>Двійковий редактор не може відкривати порожні файли.</translation>
@@ -44156,9 +43947,6 @@ Deploying local Qt libraries is incompatible with Android 5.</source>
         <source>Cannot open %1: %2</source>
         <translation>Неможливо відкрити %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>BinEditor::Internal::BinEditorPlugin</name>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Повернути</translation>
@@ -44700,7 +44488,7 @@ The statements may not contain &apos;{&apos; nor &apos;}&apos; characters.</sour
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditorWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation type="unfinished"></translation>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -114,7 +114,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>添加书签</translation>
@@ -151,13 +151,6 @@
         <source>Add in folder:</source>
         <translation>添加到文件夹:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>书签</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>删除</translation>
@@ -166,21 +159,6 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>删除文件夹会同时删除文件夹下的文件。&lt;br&gt;您确定继续吗？</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>新文件夹</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>删除文件夹</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>重命名文件夹</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>显示书签</translation>
@@ -205,17 +183,6 @@
         <source>Add</source>
         <translation>添加</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>删除</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>书签</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>向上移动</translation>
@@ -655,7 +622,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>粘贴代码(&amp;C)</translation>
@@ -704,25 +671,6 @@
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>&quot;%1&quot;接收到空的片段。</translation>
     </message>
-    <message>
-        <source>This protocol supports no listing</source>
-        <translation type="obsolete">此协议不支持listing</translation>
-    </message>
-    <message>
-        <source>Waiting for items</source>
-        <translation type="obsolete">等待数据项</translation>
-    </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
-    <message>
-        <source>Paste:</source>
-        <translation type="obsolete">粘贴:</translation>
-    </message>
-    <message>
-        <source>Protocol:</source>
-        <translation type="obsolete">协议:</translation>
-    </message>
     <message>
         <source>Refresh</source>
         <translation>刷新</translation>
@@ -735,13 +683,6 @@
         <source>This protocol does not support listing</source>
         <translation>此协议不支持列表</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">用户名:</translation>
-    </message>
     <message>
         <source>Copy Paste URL to clipboard</source>
         <translation type="obsolete">复制URL到剪贴板</translation>
@@ -754,30 +695,6 @@
         <source>General</source>
         <translation>概要</translation>
     </message>
-    <message>
-        <source>CodePaster</source>
-        <translation type="obsolete">CodePaster</translation>
-    </message>
-    <message>
-        <source>Default Protocol:</source>
-        <translation type="obsolete">默认协议:</translation>
-    </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation type="obsolete">代码粘贴</translation>
-    </message>
-    <message>
-        <source>Default protocol:</source>
-        <translation type="obsolete">默认协议:</translation>
-    </message>
-    <message>
-        <source>Display Output pane after sending a post</source>
-        <translation type="obsolete">发送后显示输出对话框</translation>
-    </message>
-    <message>
-        <source>Copy-paste URL to clipboard</source>
-        <translation type="obsolete">复制/粘帖URL到剪贴板</translation>
-    </message>
 </context>
 <context>
     <name>CompletionSettingsPage</name>
@@ -16526,7 +16443,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>CVS Command:</source>
         <translation type="obsolete">CVS 命令:</translation>
@@ -17662,7 +17579,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No Server defined in the CodePaster preferences.</source>
         <translation>在CodePaster首选项中没有定义服务器。</translation>
@@ -17675,9 +17592,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>No such paste</source>
         <translation>没有相关粘贴</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation>CodePaster</translation>
@@ -17686,10 +17600,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>&lt;i&gt;Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).&lt;/i&gt;</source>
         <translation>&lt;i&gt;注意: 为CodePaster服务指定主机名，不包括任何协议前缀。(如 codepaster.mycompany.com).&lt;/i&gt;</translation>
     </message>
-    <message>
-        <source>Code Pasting</source>
-        <translation type="obsolete">代码粘贴</translation>
-    </message>
     <message>
         <source>Server:</source>
         <translation>服务器:</translation>
@@ -17806,7 +17716,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a project from a CVS repository.</source>
         <translation type="obsolete">从CVS仓库中检出项目。</translation>
@@ -17819,9 +17729,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>CVS Checkout</source>
         <translation>CVS Checkout</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Location</source>
         <translation>位置</translation>
@@ -17834,16 +17741,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>Repository:</source>
         <translation>代码仓库:</translation>
     </message>
-</context>
-<context>
-    <name>CvsPlugin</name>
-    <message>
-        <source>Cannot find repository for &apos;%1&apos;</source>
-        <translation type="obsolete">无法为&apos;%1&apos;找到仓库</translation>
-    </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation>解析日志输出失败</translation>
@@ -18165,9 +18062,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>CVS did not respond within timeout limit (%1 ms).</source>
         <translation type="obsolete">CVS 在超时时间 (%1 毫秒)内无响应。</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>已添加</translation>
@@ -18180,9 +18074,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>Modified</source>
         <translation>已更改</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS 命令</translation>
@@ -22314,14 +22205,11 @@ Previous decimal signed value (big endian): %4</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteBinDotComSettings</name>
+    <name>CodePaster</name>
     <message>
         <source>Pastebin.com</source>
         <translation type="obsolete">Pastebin.com</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteView</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;注释&gt;</translation>
@@ -22490,7 +22378,7 @@ Previous decimal signed value (big endian): %4</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditor</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>注释修订版本 &quot;%1&quot;</translation>
@@ -25545,30 +25433,6 @@ Preselects Qt for Simulator and mobile targets if available</source>
         <translation type="obsolete">关于Bauhaus</translation>
     </message>
 </context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">界面</translation>
-    </message>
-    <message>
-        <source>&amp;Path:</source>
-        <translation type="obsolete">路径(&amp;P):</translation>
-    </message>
-    <message>
-        <source>&amp;Display:</source>
-        <translation type="obsolete">显示(&amp;D):</translation>
-    </message>
-    <message>
-        <source>entries</source>
-        <translation type="obsolete">项</translation>
-    </message>
-    <message>
-        <source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
-        <translation type="obsolete">文件共享剪贴板允许在共享的驱动器上共享代码片段.
-文件永远不会被删除.</translation>
-    </message>
-</context>
 <context>
     <name>StartExternalQmlDialog</name>
     <message>
@@ -25809,7 +25673,7 @@ with a password, which you can enter below.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::FileShareProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>无法打开%1 : %2</translation>
@@ -25834,16 +25698,10 @@ with a password, which you can enter below.</source>
         <source>Pasted: %1</source>
         <translation>粘贴了 &quot;%1&quot;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>文件共享</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - 配置错误</translation>
@@ -27891,7 +27749,7 @@ Server list was %2.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::NetworkProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Checking connection</source>
         <translation>正在检查连接</translation>
@@ -36100,7 +35958,7 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>忽略空白</translation>
@@ -38796,7 +38654,7 @@ stderr was: %1</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteBinDotComProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>&lt;Unknown&gt;</source>
         <extracomment>Unknown user of paste.</extracomment>
@@ -41757,7 +41615,7 @@ This option is useful when you want to try your application on devices which don
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>界面</translation>
@@ -41778,13 +41636,6 @@ This option is useful when you want to try your application on devices which don
         <source>entries</source>
         <translation>项</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>界面</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; 允许发送主题到自定义子域名，(比如. creator.pastebin.com)，请输入您希望的前缀。</translation>
@@ -41797,9 +41648,6 @@ This option is useful when you want to try your application on devices which don
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;注意: 插件将会使用它来获取和发布。&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>协议:</translation>
@@ -41808,17 +41656,10 @@ This option is useful when you want to try your application on devices which don
         <source>Paste:</source>
         <translation>粘贴:</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>发送到CodePaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>协议:</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>用户名(&amp;U):</translation>
@@ -41859,9 +41700,6 @@ p, li { white-space: pre-wrap; }
         <source>Patch 2</source>
         <translation>Patch 2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>发送后显示输出对话框</translation>
@@ -44552,15 +44390,12 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -44569,9 +44404,6 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>配置未改变，跳过autogen步骤。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>参数:</translation>
@@ -44581,17 +44413,11 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -44600,21 +44426,11 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>配置未改变，跳过autoreconf步骤。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>参数:</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Build</source>
         <translation>构建</translation>
@@ -44627,16 +44443,10 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>New configuration name:</source>
         <translation>新配置名称:</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>构建目录:</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsManager</name>
     <message>
         <source>Failed opening project &apos;%1&apos;: Project file does not exist</source>
         <translation>打开项目 &apos;%1&apos;失败: 项目文件不存在</translation>
@@ -44645,39 +44455,23 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>Failed opening project &apos;%1&apos;: Project already open</source>
         <translation>打开项目 &apos;%1&apos;失败:项目已经被打开</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Autotool向导</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>请进入您想构建项目的目录。Qt Creator 建议不要使用源目录构建。这能确保源目录干净，并且可以针对不同设定多次构建。</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>构建目录:</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>构建路径</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>配置</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>配置</translation>
@@ -44686,21 +44480,11 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>配置未改变，跳过configure步骤。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>参数:</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>配置</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>正在目录 %2中分析 %1</translation>
@@ -44709,17 +44493,11 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>Parsing directory %1</source>
         <translation>正在分析目录 %1</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
@@ -44732,13 +44510,6 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <source>Configuration is faulty. Check the Issues view for details.</source>
         <translation>配置错误，请检查&quot;问题&quot;视图获得详细信息。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>参数:</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -32,7 +32,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>新增書籤</translation>
@@ -65,13 +65,6 @@
         <source>Add in folder:</source>
         <translation>新增到資料夾:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>書籤</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
@@ -80,21 +73,6 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>刪除資料夾會同時移除它的內容。&lt;br&gt;您確定要繼續嗎?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>新資料夾</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>刪除資料夾</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>重新命名資料夾</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>顯示書籤</translation>
@@ -115,17 +93,6 @@
         <source>Add</source>
         <translation>新增</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>移除</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>書籤</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>向上移動</translation>
@@ -379,7 +346,7 @@
     </message>
 </context>
 <context>
-    <name>CodePaster::CodepasterPlugin</name>
+    <name>CodePaster</name>
     <message>
         <source>&amp;Code Pasting</source>
         <translation>貼上代碼(&amp;C)</translation>
@@ -428,9 +395,6 @@
         <source>Empty snippet received for &quot;%1&quot;.</source>
         <translation>接收到 &quot;%1&quot; 的空片段。</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::PasteSelectDialog</name>
     <message>
         <source>Refresh</source>
         <translation>刷新</translation>
@@ -443,9 +407,6 @@
         <source>This protocol does not support listing</source>
         <translation>此協定不支援列表</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::SettingsPage</name>
     <message>
         <source>General</source>
         <translation>一般</translation>
@@ -10221,7 +10182,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::SettingsPage</name>
+    <name>Cvs</name>
     <message>
         <source>CVS</source>
         <translation>CVS</translation>
@@ -10742,7 +10703,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::CodePasterProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>No Server defined in the CodePaster preferences.</source>
         <translation>在 CodePaster 喜好設定中沒有定義伺服器。</translation>
@@ -10755,9 +10716,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>No such paste</source>
         <translation>沒有相關貼上內容</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <source>CodePaster</source>
         <translation>CodePaster</translation>
@@ -10821,7 +10779,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CheckoutWizard</name>
+    <name>Cvs</name>
     <message>
         <source>Checks out a CVS repository and tries to load the contained project.</source>
         <translation>從 CVS 主目錄中取出，並試著載入裡面包含的專案。</translation>
@@ -10830,9 +10788,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>CVS Checkout</source>
         <translation>CVS 取出</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CheckoutWizardPage</name>
     <message>
         <source>Location</source>
         <translation>位置</translation>
@@ -10845,9 +10800,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>Repository:</source>
         <translation>主目錄：</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsPlugin</name>
     <message>
         <source>Parsing of the log output failed</source>
         <translation>剖析紀錄輸出失敗</translation>
@@ -11108,9 +11060,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>No cvs executable specified!</source>
         <translation>未指定 cvs 的執行檔！</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::CvsSubmitEditor</name>
     <message>
         <source>Added</source>
         <translation>已新增</translation>
@@ -11123,9 +11072,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>Modified</source>
         <translation>已變更</translation>
     </message>
-</context>
-<context>
-    <name>Cvs::Internal::SettingsPageWidget</name>
     <message>
         <source>CVS Command</source>
         <translation>CVS 指令</translation>
@@ -13079,7 +13025,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
     </message>
 </context>
 <context>
-    <name>CodePaster::PasteView</name>
+    <name>CodePaster</name>
     <message>
         <source>&lt;Comment&gt;</source>
         <translation>&lt;註解&gt;</translation>
@@ -13240,7 +13186,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsEditor</name>
+    <name>Cvs</name>
     <message>
         <source>Annotate revision &quot;%1&quot;</source>
         <translation>註記版本 &quot;%1&quot;</translation>
@@ -14743,7 +14689,7 @@ with a password, which you can enter below.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::FileShareProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Cannot open %1: %2</source>
         <translation>無法開啟 %1：%2</translation>
@@ -14764,16 +14710,10 @@ with a password, which you can enter below.</source>
         <source>Pasted: %1</source>
         <translation>已貼上：%1</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::FileShareProtocolSettingsPage</name>
     <message>
         <source>Fileshare</source>
         <translation>檔案共享</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Protocol</name>
     <message>
         <source>%1 - Configuration Error</source>
         <translation>%1 - 設置錯誤</translation>
@@ -16107,7 +16047,7 @@ Server list was %2.</source>
     </message>
 </context>
 <context>
-    <name>CodePaster::NetworkProtocol</name>
+    <name>CodePaster</name>
     <message>
         <source>Checking connection</source>
         <translation>正在檢查連線</translation>
@@ -22371,7 +22311,7 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>Cvs::Internal::CvsDiffParameterWidget</name>
+    <name>Cvs</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>忽略空白</translation>
@@ -26350,7 +26290,7 @@ Filter: %2
     </message>
 </context>
 <context>
-    <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
+    <name>CodePaster</name>
     <message>
         <source>Form</source>
         <translation>表單</translation>
@@ -26372,13 +26312,6 @@ Filter: %2
         <source>entries</source>
         <translation>條目</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteBinComSettingsWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>表單</translation>
-    </message>
     <message>
         <source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
         <translation type="unfinished">&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; 允許傳送主題到自定義子域名，(比如. creator.pastebin.com). 輸入你希望的前綴.</translation>
@@ -26391,9 +26324,6 @@ Filter: %2
         <source>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</source>
         <translation>&lt;i&gt;注意：外掛程式將會使用此項來發佈與抓取。&lt;/i&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::PasteSelectDialog</name>
     <message>
         <source>Protocol:</source>
         <translation>協定：</translation>
@@ -26402,17 +26332,10 @@ Filter: %2
         <source>Paste:</source>
         <translation>貼上：</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::ViewDialog</name>
     <message>
         <source>Send to Codepaster</source>
         <translation>傳送至 CodePaster</translation>
     </message>
-    <message>
-        <source>Protocol:</source>
-        <translation>協定：</translation>
-    </message>
     <message>
         <source>&amp;Username:</source>
         <translation>使用者名稱(&amp;U)：</translation>
@@ -26453,9 +26376,6 @@ p, li { white-space: pre-wrap; }
         <source>Patch 2</source>
         <translation>Patch 2</translation>
     </message>
-</context>
-<context>
-    <name>CodePaster::Internal::SettingsPage</name>
     <message>
         <source>Display Output pane after sending a post</source>
         <translation>發送後顯示輸出窗格</translation>
@@ -28156,15 +28076,12 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepFactory</name>
+    <name>AutotoolsProjectManager</name>
     <message>
         <source>Autogen</source>
         <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStep</name>
     <message>
         <source>Autogen</source>
         <translation>Autogen</translation>
@@ -28173,9 +28090,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping autogen step.</source>
         <translation>設置未變更，跳過 autogen 步驟。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutogenStepConfigWidget</name>
     <message>
         <source>Arguments:</source>
         <translation>參數：</translation>
@@ -28185,17 +28099,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <comment>AutotoolsProjectManager::AutogenStepConfigWidget display name.</comment>
         <translation>Autogen</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepFactory</name>
     <message>
         <source>Autoreconf</source>
         <comment>Display name for AutotoolsProjectManager::AutoreconfStep id.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStep</name>
     <message>
         <source>Autoreconf</source>
         <translation>Autoreconf</translation>
@@ -28204,21 +28112,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping autoreconf step.</source>
         <translation>設置未變更，跳過 autoreconf 步驟。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutoreconfStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>參數：</translation>
-    </message>
     <message>
         <source>Autoreconf</source>
         <comment>AutotoolsProjectManager::AutoreconfStepConfigWidget display name.</comment>
         <translation>Autoreconf</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildConfigurationFactory</name>
     <message>
         <source>Build</source>
         <translation>建置</translation>
@@ -28231,9 +28129,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>New configuration name:</source>
         <translation>新設置名稱：</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsBuildSettingsWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>建置目錄：</translation>
@@ -28246,9 +28141,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>&lt;Invalid tool chain&gt;</source>
         <translation type="obsolete">&lt;無效的工具鍊&gt;</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsManager</name>
     <message>
         <source>Failed opening project &apos;%1&apos;: Project file does not exist</source>
         <translation>開啟專案 &apos;%1&apos; 失敗：專案檔不存在</translation>
@@ -28257,47 +28149,28 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Failed opening project &apos;%1&apos;: Project already open</source>
         <translation>開啟專案 &apos;%1&apos; 失敗：專案已經被開啟</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsOpenProjectWizard</name>
     <message>
         <source>Autotools Wizard</source>
         <translation>Autotools 精靈</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::BuildPathPage</name>
     <message>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
         <translation>請輸入您想建置專案的目錄。Qt Creator 建議您不要直接用源碼的目錄來做建置。這樣可以保持源碼目錄的乾淨，並且可以讓您用不同的設定進行多個建置。</translation>
     </message>
-    <message>
-        <source>Build directory:</source>
-        <translation>建置目錄：</translation>
-    </message>
     <message>
         <source>Build Location</source>
         <translation>建置位置</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::AutotoolsTarget</name>
     <message>
         <source>Desktop</source>
         <comment>Autotools Default target display name</comment>
         <translation type="obsolete">桌面</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepFactory</name>
     <message>
         <source>Configure</source>
         <comment>Display name for AutotoolsProjectManager::ConfigureStep id.</comment>
         <translation>設置</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStep</name>
     <message>
         <source>Configure</source>
         <translation>設置</translation>
@@ -28306,21 +28179,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration unchanged, skipping configure step.</source>
         <translation>設置未變更，跳過設置步驟。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::ConfigureStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>參數：</translation>
-    </message>
     <message>
         <source>Configure</source>
         <comment>AutotoolsProjectManager::ConfigureStepConfigWidget display name.</comment>
         <translation>設置</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakefileParser</name>
     <message>
         <source>Parsing %1 in directory %2</source>
         <translation>在目錄 %2 剖析 %1 中</translation>
@@ -28329,17 +28192,11 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Parsing directory %1</source>
         <translation>剖析目錄 %1 中</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepFactory</name>
     <message>
         <source>Make</source>
         <comment>Display name for AutotoolsProjectManager::MakeStep id.</comment>
         <translation>Make</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStep</name>
     <message>
         <source>Make</source>
         <translation>Make</translation>
@@ -28352,13 +28209,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Configuration is faulty. Check the Issues view for details.</source>
         <translation type="unfinished">設置錯誤。請在錯誤檢視中看詳情。</translation>
     </message>
-</context>
-<context>
-    <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name>
-    <message>
-        <source>Arguments:</source>
-        <translation>參數：</translation>
-    </message>
     <message>
         <source>Make</source>
         <comment>AutotoolsProjectManager::MakeStepConfigWidget display name.</comment>

src/libs/cplusplus/CppDocument.cpp

@@ -792,7 +792,7 @@ QList<Snapshot::IncludeLocation> Snapshot::includeLocationsOfDocument(const QStr
         const QList<Document::Include> includeFiles = doc->resolvedIncludes();
         for (const Document::Include &includeFile : includeFiles) {
             if (includeFile.resolvedFileName() == fileName)
-                result.append(qMakePair(doc, includeFile.line()));
+                result.push_back({doc, includeFile.line()});
         }
     }
     return result;

src/libs/cplusplus/CppRewriter.cpp

@@ -404,7 +404,7 @@ SubstitutionMap::~SubstitutionMap()
 
 void SubstitutionMap::bind(const Name *name, const FullySpecifiedType &ty)
 {
-    _map.append(qMakePair(name, ty));
+    _map.push_back({name, ty});
 }
 
 FullySpecifiedType SubstitutionMap::apply(const Name *name, Rewrite *) const

src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp

@@ -389,7 +389,7 @@ FullySpecifiedType DeprecatedGenTemplateInstance::instantiate(const Name *classN
 
                         if (templArgName && templArgName->identifier()) {
                             const Identifier *templArgId = templArgName->identifier();
-                            subst.append(qMakePair(templArgId, templArgTy));
+                            subst.push_back({templArgId, templArgTy});
                         }
                     }
                 }

src/libs/cplusplus/pp-engine.cpp

@@ -1420,7 +1420,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
                 trackedLine = tk.lineno;
                 trackedColumn = unsigned(computeDistance(tk, true));
             }
-            m_state.m_expandedTokensInfo.append(qMakePair(trackedLine, trackedColumn));
+            m_state.m_expandedTokensInfo.push_back({trackedLine, trackedColumn});
         } else if (m_state.m_expansionStatus == JustFinishedExpansion) {
             m_state.setExpansionStatus(NotExpanding);
             macroExpanded = true;

src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp

@@ -204,92 +204,88 @@ StereotypeDefinitionParser::~StereotypeDefinitionParser()
 void StereotypeDefinitionParser::parse(ITextSource *source)
 {
     TextScanner textScanner;
-    textScanner.setKeywords(
+    textScanner.setKeywords({{"icon", KEYWORD_ICON},
-                QList<QPair<QString, int> >()
+                             {"id", KEYWORD_ID},
-                << qMakePair(QString("icon"), KEYWORD_ICON)
+                             {"title", KEYWORD_TITLE},
-                << qMakePair(QString("id"), KEYWORD_ID)
+                             {"elements", KEYWORD_ELEMENTS},
-                << qMakePair(QString("title"), KEYWORD_TITLE)
+                             {"stereotype", KEYWORD_STEREOTYPE},
-                << qMakePair(QString("elements"), KEYWORD_ELEMENTS)
+                             {"width", KEYWORD_WIDTH},
-                << qMakePair(QString("stereotype"), KEYWORD_STEREOTYPE)
+                             {"height", KEYWORD_HEIGHT},
-                << qMakePair(QString("width"), KEYWORD_WIDTH)
+                             {"minwidth", KEYWORD_MINWIDTH},
-                << qMakePair(QString("height"), KEYWORD_HEIGHT)
+                             {"minheight", KEYWORD_MINHEIGHT},
-                << qMakePair(QString("minwidth"), KEYWORD_MINWIDTH)
+                             {"locksize", KEYWORD_LOCK_SIZE},
-                << qMakePair(QString("minheight"), KEYWORD_MINHEIGHT)
+                             {"display", KEYWORD_DISPLAY},
-                << qMakePair(QString("locksize"), KEYWORD_LOCK_SIZE)
+                             {"textalignment", KEYWORD_TEXTALIGN},
-                << qMakePair(QString("display"), KEYWORD_DISPLAY)
+                             {"basecolor", KEYWORD_BASECOLOR},
-                << qMakePair(QString("textalignment"), KEYWORD_TEXTALIGN)
+                             {"shape", KEYWORD_SHAPE},
-                << qMakePair(QString("basecolor"), KEYWORD_BASECOLOR)
+                             {"outline", KEYWORD_OUTLINE},
-                << qMakePair(QString("shape"), KEYWORD_SHAPE)
+                             {"circle", KEYWORD_CIRCLE},
-                << qMakePair(QString("outline"), KEYWORD_OUTLINE)
+                             {"ellipse", KEYWORD_ELLIPSE},
-                << qMakePair(QString("circle"), KEYWORD_CIRCLE)
+                             {"line", KEYWORD_LINE},
-                << qMakePair(QString("ellipse"), KEYWORD_ELLIPSE)
+                             {"rect", KEYWORD_RECT},
-                << qMakePair(QString("line"), KEYWORD_LINE)
+                             {"roundedrect", KEYWORD_ROUNDEDRECT},
-                << qMakePair(QString("rect"), KEYWORD_RECT)
+                             {"arc", KEYWORD_ARC},
-                << qMakePair(QString("roundedrect"), KEYWORD_ROUNDEDRECT)
+                             {"moveto", KEYWORD_MOVETO},
-                << qMakePair(QString("arc"), KEYWORD_ARC)
+                             {"lineto", KEYWORD_LINETO},
-                << qMakePair(QString("moveto"), KEYWORD_MOVETO)
+                             {"arcmoveto", KEYWORD_ARCMOVETO},
-                << qMakePair(QString("lineto"), KEYWORD_LINETO)
+                             {"arcto", KEYWORD_ARCTO},
-                << qMakePair(QString("arcmoveto"), KEYWORD_ARCMOVETO)
+                             {"close", KEYWORD_CLOSE},
-                << qMakePair(QString("arcto"), KEYWORD_ARCTO)
+                             {"x", KEYWORD_X},
-                << qMakePair(QString("close"), KEYWORD_CLOSE)
+                             {"y", KEYWORD_Y},
-                << qMakePair(QString("x"), KEYWORD_X)
+                             {"x0", KEYWORD_X0},
-                << qMakePair(QString("y"), KEYWORD_Y)
+                             {"y0", KEYWORD_Y0},
-                << qMakePair(QString("x0"), KEYWORD_X0)
+                             {"x1", KEYWORD_X1},
-                << qMakePair(QString("y0"), KEYWORD_Y0)
+                             {"y1", KEYWORD_Y1},
-                << qMakePair(QString("x1"), KEYWORD_X1)
+                             {"radius", KEYWORD_RADIUS},
-                << qMakePair(QString("y1"), KEYWORD_Y1)
+                             {"radiusx", KEYWORD_RADIUS_X},
-                << qMakePair(QString("radius"), KEYWORD_RADIUS)
+                             {"radiusy", KEYWORD_RADIUS_Y},
-                << qMakePair(QString("radiusx"), KEYWORD_RADIUS_X)
+                             {"start", KEYWORD_START},
-                << qMakePair(QString("radiusy"), KEYWORD_RADIUS_Y)
+                             {"span", KEYWORD_SPAN},
-                << qMakePair(QString("start"), KEYWORD_START)
+                             {"toolbar", KEYWORD_TOOLBAR},
-                << qMakePair(QString("span"), KEYWORD_SPAN)
+                             {"priority", KEYWORD_PRIORITY},
-                << qMakePair(QString("toolbar"), KEYWORD_TOOLBAR)
+                             {"tools", KEYWORD_TOOLS},
-                << qMakePair(QString("priority"), KEYWORD_PRIORITY)
+                             {"tool", KEYWORD_TOOL},
-                << qMakePair(QString("tools"), KEYWORD_TOOLS)
+                             {"element", KEYWORD_ELEMENT},
-                << qMakePair(QString("tool"), KEYWORD_TOOL)
+                             {"separator", KEYWORD_SEPARATOR},
-                << qMakePair(QString("element"), KEYWORD_ELEMENT)
+                             {"relation", KEYWORD_RELATION},
-                << qMakePair(QString("separator"), KEYWORD_SEPARATOR)
+                             {"dependency", KEYWORD_DEPENDENCY},
-                << qMakePair(QString("relation"), KEYWORD_RELATION)
+                             {"inheritance", KEYWORD_INHERITANCE},
-                << qMakePair(QString("dependency"), KEYWORD_DEPENDENCY)
+                             {"association", KEYWORD_ASSOCIATION},
-                << qMakePair(QString("inheritance"), KEYWORD_INHERITANCE)
+                             {"name", KEYWORD_NAME},
-                << qMakePair(QString("association"), KEYWORD_ASSOCIATION)
+                             {"direction", KEYWORD_DIRECTION},
-                << qMakePair(QString("name"), KEYWORD_NAME)
+                             {"atob", KEYWORD_ATOB},
-                << qMakePair(QString("direction"), KEYWORD_DIRECTION)
+                             {"btoa", KEYWORD_BTOA},
-                << qMakePair(QString("atob"), KEYWORD_ATOB)
+                             {"bi", KEYWORD_BI},
-                << qMakePair(QString("btoa"), KEYWORD_BTOA)
+                             {"end", KEYWORD_END},
-                << qMakePair(QString("bi"), KEYWORD_BI)
+                             {"a", KEYWORD_A},
-                << qMakePair(QString("end"), KEYWORD_END)
+                             {"b", KEYWORD_B},
-                << qMakePair(QString("a"), KEYWORD_A)
+                             {"role", KEYWORD_ROLE},
-                << qMakePair(QString("b"), KEYWORD_B)
+                             {"cardinality", KEYWORD_CARDINALITY},
-                << qMakePair(QString("role"), KEYWORD_ROLE)
+                             {"navigable", KEYWORD_NAVIGABLE},
-                << qMakePair(QString("cardinality"), KEYWORD_CARDINALITY)
+                             {"relationship", KEYWORD_RELATIONSHIP},
-                << qMakePair(QString("navigable"), KEYWORD_NAVIGABLE)
+                             {"aggregation", KEYWORD_AGGREGATION},
-                << qMakePair(QString("relationship"), KEYWORD_RELATIONSHIP)
+                             {"composition", KEYWORD_COMPOSITION},
-                << qMakePair(QString("aggregation"), KEYWORD_AGGREGATION)
+                             {"shaft", KEYWORD_SHAFT},
-                << qMakePair(QString("composition"), KEYWORD_COMPOSITION)
+                             {"head", KEYWORD_HEAD},
-                << qMakePair(QString("shaft"), KEYWORD_SHAFT)
+                             {"diamond", KEYWORD_DIAMOND},
-                << qMakePair(QString("head"), KEYWORD_HEAD)
+                             {"triangle", KEYWORD_TRIANGLE},
-                << qMakePair(QString("diamond"), KEYWORD_DIAMOND)
+                             {"filled", KEYWORD_FILLED},
-                << qMakePair(QString("triangle"), KEYWORD_TRIANGLE)
+                             {"pattern", KEYWORD_PATTERN},
-                << qMakePair(QString("filled"), KEYWORD_FILLED)
+                             {"solid", KEYWORD_SOLID},
-                << qMakePair(QString("pattern"), KEYWORD_PATTERN)
+                             {"dot", KEYWORD_DOT},
-                << qMakePair(QString("solid"), KEYWORD_SOLID)
+                             {"dash", KEYWORD_DASH},
-                << qMakePair(QString("dot"), KEYWORD_DOT)
+                             {"dashdot", KEYWORD_DASHDOT},
-                << qMakePair(QString("dash"), KEYWORD_DASH)
+                             {"dashdotdot", KEYWORD_DASHDOTDOT},
-                << qMakePair(QString("dashdot"), KEYWORD_DASHDOT)
+                             {"color", KEYWORD_COLOR}});
-                << qMakePair(QString("dashdotdot"), KEYWORD_DASHDOTDOT)
+
-                << qMakePair(QString("color"), KEYWORD_COLOR)
+    textScanner.setOperators({{";", OPERATOR_SEMICOLON},
-                );
+                              {"{", OPERATOR_BRACE_OPEN},
-    textScanner.setOperators(
+                              {"}", OPERATOR_BRACE_CLOSE},
-                QList<QPair<QString, int> >()
+                              {":", OPERATOR_COLON},
-                << qMakePair(QString(";"), OPERATOR_SEMICOLON)
+                              {",", OPERATOR_COMMA},
-                << qMakePair(QString("{"), OPERATOR_BRACE_OPEN)
+                              {".", OPERATOR_PERIOD},
-                << qMakePair(QString("}"), OPERATOR_BRACE_CLOSE)
+                              {"-", OPERATOR_MINUS}});
-                << qMakePair(QString(":"), OPERATOR_COLON)
+
-                << qMakePair(QString(","), OPERATOR_COMMA)
-                << qMakePair(QString("."), OPERATOR_PERIOD)
-                << qMakePair(QString("-"), OPERATOR_MINUS)
-                );
     textScanner.setSource(source);
 
     d->m_scanner = &textScanner;
@@ -342,12 +338,12 @@ void StereotypeDefinitionParser::parseIcon()
             break;
         case KEYWORD_ELEMENTS:
         {
-            const static QHash<QString, StereotypeIcon::Element> elementNames = QHash<QString, StereotypeIcon::Element>()
+            const static QHash<QString, StereotypeIcon::Element> elementNames
-                    << qMakePair(QString("package"), StereotypeIcon::ElementPackage)
+                    = {{"package", StereotypeIcon::ElementPackage},
-                    << qMakePair(QString("component"), StereotypeIcon::ElementComponent)
+                       {"component", StereotypeIcon::ElementComponent},
-                    << qMakePair(QString("class"), StereotypeIcon::ElementClass)
+                       {"class", StereotypeIcon::ElementClass},
-                    << qMakePair(QString("diagram"), StereotypeIcon::ElementDiagram)
+                       {"diagram", StereotypeIcon::ElementDiagram},
-                    << qMakePair(QString("item"), StereotypeIcon::ElementItem);
+                       {"item", StereotypeIcon::ElementItem}};
             parseEnums<StereotypeIcon::Element>(
                         parseIdentifierListProperty(), elementNames, token.sourcePos(),
                         [&](StereotypeIcon::Element element) { elements.insert(element); });
@@ -370,12 +366,12 @@ void StereotypeDefinitionParser::parseIcon()
             break;
         case KEYWORD_LOCK_SIZE:
         {
-            const static QHash<QString, StereotypeIcon::SizeLock> lockNames = QHash<QString, StereotypeIcon::SizeLock>()
+            const static QHash<QString, StereotypeIcon::SizeLock> lockNames
-                    << qMakePair(QString("none"), StereotypeIcon::LockNone)
+                    = {{"none", StereotypeIcon::LockNone},
-                    << qMakePair(QString("width"), StereotypeIcon::LockWidth)
+                       {"width", StereotypeIcon::LockWidth},
-                    << qMakePair(QString("height"), StereotypeIcon::LockHeight)
+                       {"height", StereotypeIcon::LockHeight},
-                    << qMakePair(QString("size"), StereotypeIcon::LockSize)
+                       {"size", StereotypeIcon::LockSize},
-                    << qMakePair(QString("ratio"), StereotypeIcon::LockRatio);
+                       {"ratio", StereotypeIcon::LockRatio}};
             parseEnum<StereotypeIcon::SizeLock>(
                         parseIdentifierProperty(), lockNames, token.sourcePos(),
                         [&](StereotypeIcon::SizeLock lock) { stereotypeIcon.setSizeLock(lock); });
@@ -383,12 +379,12 @@ void StereotypeDefinitionParser::parseIcon()
         }
         case KEYWORD_DISPLAY:
         {
-            const static QHash<QString, StereotypeIcon::Display> displayNames = QHash<QString, StereotypeIcon::Display>()
+            const static QHash<QString, StereotypeIcon::Display> displayNames
-                    << qMakePair(QString("none"), StereotypeIcon::DisplayNone)
+                    = {{"none", StereotypeIcon::DisplayNone},
-                    << qMakePair(QString("label"), StereotypeIcon::DisplayLabel)
+                       {"label", StereotypeIcon::DisplayLabel},
-                    << qMakePair(QString("decoration"), StereotypeIcon::DisplayDecoration)
+                       {"decoration", StereotypeIcon::DisplayDecoration},
-                    << qMakePair(QString("icon"), StereotypeIcon::DisplayIcon)
+                       {"icon", StereotypeIcon::DisplayIcon},
-                    << qMakePair(QString("smart"), StereotypeIcon::DisplaySmart);
+                       {"smart", StereotypeIcon::DisplaySmart}};
             parseEnum<StereotypeIcon::Display>(
                         parseIdentifierProperty(), displayNames, token.sourcePos(),
                         [&](StereotypeIcon::Display display) { stereotypeIcon.setDisplay(display); });
@@ -396,11 +392,11 @@ void StereotypeDefinitionParser::parseIcon()
         }
         case KEYWORD_TEXTALIGN:
         {
-            const static QHash<QString, StereotypeIcon::TextAlignment> alignNames = QHash<QString, StereotypeIcon::TextAlignment>()
+            const static QHash<QString, StereotypeIcon::TextAlignment> alignNames
-                    << qMakePair(QString("below"), StereotypeIcon::TextalignBelow)
+                    = {{"below", StereotypeIcon::TextalignBelow},
-                    << qMakePair(QString("center"), StereotypeIcon::TextalignCenter)
+                       {"center", StereotypeIcon::TextalignCenter},
-                    << qMakePair(QString("none"), StereotypeIcon::TextalignNone)
+                       {"none", StereotypeIcon::TextalignNone},
-                    << qMakePair(QString("top"), StereotypeIcon::TextalignTop);
+                       {"top", StereotypeIcon::TextalignTop}};
             parseEnum<StereotypeIcon::TextAlignment>(
                         parseIdentifierProperty(), alignNames, token.sourcePos(),
                         [&](StereotypeIcon::TextAlignment align) { stereotypeIcon.setTextAlignment(align); });
@@ -434,22 +430,22 @@ void StereotypeDefinitionParser::parseIcon()
 
 QPair<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitionParser::SCALED(int keyword)
 {
-    return qMakePair(keyword, IconCommandParameter(ShapeValueF::UnitScaled));
+    return {keyword, IconCommandParameter(ShapeValueF::UnitScaled)};
 }
 
 QPair<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitionParser::FIX(int keyword)
 {
-    return qMakePair(keyword, IconCommandParameter(ShapeValueF::UnitRelative));
+    return {keyword, IconCommandParameter(ShapeValueF::UnitRelative)};
 }
 
 QPair<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitionParser::ABSOLUTE(int keyword)
 {
-    return qMakePair(keyword, IconCommandParameter(ShapeValueF::UnitAbsolute));
+    return {keyword, IconCommandParameter(ShapeValueF::UnitAbsolute)};
 }
 
 QPair<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitionParser::BOOLEAN(int keyword)
 {
-    return qMakePair(keyword, IconCommandParameter(IconCommandParameter::Boolean));
+    return {keyword, IconCommandParameter(IconCommandParameter::Boolean)};
 }
 
 IconShape StereotypeDefinitionParser::parseIconShape()
@@ -626,10 +622,10 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
             break;
         case KEYWORD_DIRECTION:
         {
-            const static QHash<QString, CustomRelation::Direction> directionNames = QHash<QString, CustomRelation::Direction>()
+            const static QHash<QString, CustomRelation::Direction> directionNames
-                    << qMakePair(QString("atob"), CustomRelation::Direction::AtoB)
+                    = {{"atob", CustomRelation::Direction::AtoB},
-                    << qMakePair(QString("btoa"), CustomRelation::Direction::BToA)
+                       {"btoa", CustomRelation::Direction::BToA},
-                    << qMakePair(QString("bi"), CustomRelation::Direction::Bi);
+                       {"bi", CustomRelation::Direction::Bi}};
             if (element != CustomRelation::Element::Dependency)
                 throwUnknownPropertyError(token);
             parseEnum<CustomRelation::Direction>(
@@ -639,12 +635,12 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
         }
         case KEYWORD_PATTERN:
         {
-            const static QHash<QString, CustomRelation::ShaftPattern> patternNames = QHash<QString, CustomRelation::ShaftPattern>()
+            const static QHash<QString, CustomRelation::ShaftPattern> patternNames
-                    << qMakePair(QString("solid"), CustomRelation::ShaftPattern::Solid)
+                    = {{"solid", CustomRelation::ShaftPattern::Solid},
-                    << qMakePair(QString("dash"), CustomRelation::ShaftPattern::Dash)
+                       {"dash", CustomRelation::ShaftPattern::Dash},
-                    << qMakePair(QString("dot"), CustomRelation::ShaftPattern::Dot)
+                       {"dot", CustomRelation::ShaftPattern::Dot},
-                    << qMakePair(QString("dashdot"), CustomRelation::ShaftPattern::DashDot)
+                       {"dashdot", CustomRelation::ShaftPattern::DashDot},
-                    << qMakePair(QString("dashdotdot"), CustomRelation::ShaftPattern::DashDotDot);
+                       {"dashdotdot", CustomRelation::ShaftPattern::DashDotDot}};
             if (element != CustomRelation::Element::Relation)
                 throwUnknownPropertyError(token);
             parseEnum<CustomRelation::ShaftPattern>(
@@ -743,10 +739,10 @@ void StereotypeDefinitionParser::parseRelationEnd(CustomRelation *relation)
         {
             if (relation->element() != CustomRelation::Element::Association)
                 throwUnknownPropertyError(token);
-            const static QHash<QString, CustomRelation::Relationship> relationshipNames = QHash<QString, CustomRelation::Relationship>()
+            const static QHash<QString, CustomRelation::Relationship> relationshipNames
-                    << qMakePair(QString("association"), CustomRelation::Relationship::Association)
+                    = {{"association", CustomRelation::Relationship::Association},
-                    << qMakePair(QString("aggregation"), CustomRelation::Relationship::Aggregation)
+                       {"aggregation", CustomRelation::Relationship::Aggregation},
-                    << qMakePair(QString("composition"), CustomRelation::Relationship::Composition);
+                       {"composition", CustomRelation::Relationship::Composition}};
             parseEnum<CustomRelation::Relationship>(
                         parseIdentifierProperty(), relationshipNames, token.sourcePos(),
                         [&](CustomRelation::Relationship relationship) { relationEnd.setRelationship(relationship); });
@@ -756,13 +752,13 @@ void StereotypeDefinitionParser::parseRelationEnd(CustomRelation *relation)
         {
             if (relation->element() != CustomRelation::Element::Relation)
                 throwUnknownPropertyError(token);
-            const static QHash<QString, CustomRelation::Head> headNames = QHash<QString, CustomRelation::Head>()
+            const static QHash<QString, CustomRelation::Head> headNames
-                    << qMakePair(QString("none"), CustomRelation::Head::None)
+                    = {{"none", CustomRelation::Head::None},
-                    << qMakePair(QString("arrow"), CustomRelation::Head::Arrow)
+                       {"arrow", CustomRelation::Head::Arrow},
-                    << qMakePair(QString("triangle"), CustomRelation::Head::Triangle)
+                       {"triangle", CustomRelation::Head::Triangle},
-                    << qMakePair(QString("filledtriangle"), CustomRelation::Head::FilledTriangle)
+                       {"filledtriangle", CustomRelation::Head::FilledTriangle},
-                    << qMakePair(QString("diamond"), CustomRelation::Head::Diamond)
+                       {"diamond", CustomRelation::Head::Diamond},
-                    << qMakePair(QString("filleddiamond"), CustomRelation::Head::FilledDiamond);
+                       {"filleddiamond", CustomRelation::Head::FilledDiamond}};
             parseEnum<CustomRelation::Head>(
                         parseIdentifierProperty(), headNames, token.sourcePos(),
                         [&](CustomRelation::Head head) { relationEnd.setHead(head); });

src/libs/modelinglib/qmt/config/textscanner.cpp

@@ -52,14 +52,14 @@ TextScanner::~TextScanner()
     delete d;
 }
 
-void TextScanner::setKeywords(const QList<QPair<QString, int> > &keywords)
+void TextScanner::setKeywords(const QList<QPair<QString, int>> &keywords)
 {
     d->m_keywordToSubtypeMap.clear();
     foreach (const DefTuple &tuple, keywords)
         d->m_keywordToSubtypeMap.insert(tuple.first.toLower(), tuple.second);
 }
 
-void TextScanner::setOperators(const QList<QPair<QString, int> > &operators)
+void TextScanner::setOperators(const QList<QPair<QString, int>> &operators)
 {
     d->m_operatorToSubtypeMap.clear();
     d->m_maxOperatorLength = 0;

src/libs/modelinglib/qmt/config/textscanner.h

@@ -36,8 +36,8 @@ public:
     explicit TextScanner(QObject *parent = nullptr);
     ~TextScanner() override;
 
-    void setKeywords(const QList<QPair<QString, int> > &keywords);
+    void setKeywords(const QList<QPair<QString, int>> &keywords);
-    void setOperators(const QList<QPair<QString, int> > &operators);
+    void setOperators(const QList<QPair<QString, int>> &operators);
     void setSource(ITextSource *textSource);
     SourcePos sourcePos() const;
 

src/libs/modelinglib/qmt/infrastructure/handles.h

@@ -15,7 +15,7 @@ template<typename T>
 class Handles
 {
 public:
-    typedef QList<Handle<T> > value_type;
+    typedef QList<Handle<T>> value_type;
     typedef typename value_type::iterator iterator;
     typedef typename value_type::const_iterator const_iterator;
 

src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp

@@ -1146,7 +1146,7 @@ void PropertiesView::MView::visitDSwimlane(const DSwimlane *swimlane)
 void PropertiesView::MView::onStereotypesChanged(const QString &stereotypes)
 {
     QList<QString> set = m_stereotypesController->fromString(stereotypes);
-    assignModelElement<MElement, QList<QString> >(m_modelElements, SelectionMulti, set,
+    assignModelElement<MElement, QList<QString>>(m_modelElements, SelectionMulti, set,
                                                   &MElement::stereotypes, &MElement::setStereotypes);
 }
 
@@ -1164,7 +1164,7 @@ void PropertiesView::MView::onNamespaceChanged(const QString &umlNamespace)
 void PropertiesView::MView::onTemplateParametersChanged(const QString &templateParameters)
 {
     QList<QString> templateParametersList = splitTemplateParameters(templateParameters);
-    assignModelElement<MClass, QList<QString> >(m_modelElements, SelectionSingle, templateParametersList,
+    assignModelElement<MClass, QList<QString>>(m_modelElements, SelectionSingle, templateParametersList,
                                                 &MClass::templateParameters, &MClass::setTemplateParameters);
 }
 
@@ -1191,7 +1191,7 @@ void PropertiesView::MView::onClassMembersChanged(QList<MClassMember> &classMemb
                 showMembers.insert(klass->uid());
         }
     }
-    assignModelElement<MClass, QList<MClassMember> >(m_modelElements, SelectionSingle, classMembers,
+    assignModelElement<MClass, QList<MClassMember>>(m_modelElements, SelectionSingle, classMembers,
                                                      &MClass::members, &MClass::setMembers);
     foreach (DElement *element, m_diagramElements) {
         if (showMembers.contains(element->modelUid())) {

src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp

@@ -117,12 +117,14 @@ QString StereotypeController::findStereotypeIconId(StereotypeIcon::Element eleme
                                                    const QList<QString> &stereotypes) const
 {
     foreach (const QString &stereotype, stereotypes) {
-        if (d->m_stereotypeToIconIdMap.contains(qMakePair(element, stereotype)))
+        auto it = d->m_stereotypeToIconIdMap.constFind({element, stereotype});
-            return d->m_stereotypeToIconIdMap.value(qMakePair(element, stereotype));
+        if (it != d->m_stereotypeToIconIdMap.constEnd())
-        else if (d->m_stereotypeToIconIdMap.contains(qMakePair(StereotypeIcon::ElementAny, stereotype)))
+            return it.value();
-            return d->m_stereotypeToIconIdMap.value(qMakePair(StereotypeIcon::ElementAny, stereotype));
+        it = d->m_stereotypeToIconIdMap.constFind({StereotypeIcon::ElementAny, stereotype});
+        if (it != d->m_stereotypeToIconIdMap.constEnd())
+            return it.value();
     }
-    return QString();
+    return {};
 }
 
 QList<QString> StereotypeController::filterStereotypesByIconId(const QString &stereotypeIconId,
@@ -232,11 +234,11 @@ void StereotypeController::addStereotypeIcon(const StereotypeIcon &stereotypeIco
 {
     if (stereotypeIcon.elements().isEmpty()) {
         foreach (const QString &stereotype, stereotypeIcon.stereotypes())
-            d->m_stereotypeToIconIdMap.insert(qMakePair(StereotypeIcon::ElementAny, stereotype), stereotypeIcon.id());
+            d->m_stereotypeToIconIdMap.insert({StereotypeIcon::ElementAny, stereotype}, stereotypeIcon.id());
     } else {
         foreach (StereotypeIcon::Element element, stereotypeIcon.elements()) {
             foreach (const QString &stereotype, stereotypeIcon.stereotypes())
-                d->m_stereotypeToIconIdMap.insert(qMakePair(element, stereotype), stereotypeIcon.id());
+                d->m_stereotypeToIconIdMap.insert({element, stereotype}, stereotypeIcon.id());
         }
     }
     d->m_iconIdToStereotypeIconsMap.insert(stereotypeIcon.id(), stereotypeIcon);

src/libs/sqlite/sqlitevalue.h

@@ -333,7 +333,7 @@ private:
         if (value.isNull())
             return VariantType{NullValue{}};
 
-        switch (value.type()) {
+        switch (value.userType()) {
         case QVariant::Int:
             return VariantType{static_cast<long long>(value.toInt())};
         case QVariant::LongLong:

src/libs/utils/differ.cpp

@@ -496,7 +496,7 @@ static QString encodeExpandedWhitespace(const QString &leftEquality,
         *ok = false;
 
     if (!leftCodeMap || !rightCodeMap)
-        return QString();
+        return {};
 
     leftCodeMap->clear();
     rightCodeMap->clear();
@@ -520,27 +520,25 @@ static QString encodeExpandedWhitespace(const QString &leftEquality,
 
         if (leftIndex < leftCount && rightIndex < rightCount) {
             if (leftEquality.at(leftIndex) != rightEquality.at(rightIndex))
-                return QString(); // equalities broken
+                return {}; // equalities broken
 
         } else if (leftIndex == leftCount && rightIndex == rightCount) {
             ; // do nothing, the last iteration
         } else {
-            return QString(); // equalities broken
+            return {}; // equalities broken
         }
 
-        if (leftWhitespaces.isEmpty() ^ rightWhitespaces.isEmpty()) {
+        if (leftWhitespaces.isEmpty() != rightWhitespaces.isEmpty()) {
             // there must be at least 1 corresponding whitespace, equalities broken
-            return QString();
+            return {};
         }
 
         if (!leftWhitespaces.isEmpty() && !rightWhitespaces.isEmpty()) {
             const int replacementPosition = output.count();
             const int replacementSize = qMax(leftWhitespaces.count(), rightWhitespaces.count());
             const QString replacement(replacementSize, ' ');
-            leftCodeMap->insert(replacementPosition,
+            leftCodeMap->insert(replacementPosition, {replacementSize, leftWhitespaces});
-                                qMakePair(replacementSize, leftWhitespaces));
+            rightCodeMap->insert(replacementPosition, {replacementSize, rightWhitespaces});
-            rightCodeMap->insert(replacementPosition,
-                                 qMakePair(replacementSize, rightWhitespaces));
             output.append(replacement);
         }
 
@@ -1235,8 +1233,7 @@ QStringList Differ::encode(const QString &text1,
                                   QString *encodedText1,
                                   QString *encodedText2)
 {
-    QStringList lines;
+    QStringList lines{{}}; // don't use code: 0
-    lines.append(QString()); // don't use code: 0
     QMap<QString, int> lineToCode;
 
     *encodedText1 = encode(text1, &lines, &lineToCode);

src/libs/utils/environment.cpp

@@ -61,7 +61,7 @@ void Environment::appendOrSet(const QString &key, const QString &value, const QS
     QTC_ASSERT(!key.contains('='), return );
     const auto it = m_dict.findKey(key);
     if (it == m_dict.m_values.end()) {
-        m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), qMakePair(value, true));
+        m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
     } else {
         // Append unless it is already there
         const QString toAppend = sep + value;
@@ -75,7 +75,7 @@ void Environment::prependOrSet(const QString &key, const QString &value, const Q
     QTC_ASSERT(!key.contains('='), return );
     const auto it = m_dict.findKey(key);
     if (it == m_dict.m_values.end()) {
-        m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), qMakePair(value, true));
+        m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
     } else {
         // Prepend unless it is already there
         const QString toPrepend = value + sep;

src/libs/utils/filepath.cpp

@@ -176,39 +176,39 @@ bool FilePath::isRootPath() const
 
 QString FilePath::encodedHost() const
 {
-    QString host = m_host;
+    QString result = host().toString();
-    host.replace('%', "%25");
+    result.replace('%', "%25");
-    host.replace('/', "%2f");
+    result.replace('/', "%2f");
-    return host;
+    return result;
 }
 
 /// \returns a QString for passing on to QString based APIs
 QString FilePath::toString() const
 {
-    if (m_scheme.isEmpty())
+    if (!needsDevice())
-        return m_path;
+        return path();
 
     if (isRelativePath())
-        return m_scheme + "://" + encodedHost() + "/./" + m_path;
+        return scheme() + "://" + encodedHost() + "/./" + path();
-    return m_scheme + "://" + encodedHost() +  m_path;
+    return scheme() + "://" + encodedHost() +  path();
 }
 
 QString FilePath::toFSPathString() const
 {
-    if (m_scheme.isEmpty())
+    if (scheme().isEmpty())
-        return m_path;
+        return path();
 
     if (isRelativePath())
-        return specialPath(SpecialPathComponent::RootPath) + "/" + m_scheme + "/" + encodedHost() + "/./" + m_path;
+        return specialPath(SpecialPathComponent::RootPath) + "/" + scheme() + "/" + encodedHost() + "/./" + path();
-    return specialPath(SpecialPathComponent::RootPath) + "/" + m_scheme + "/" + encodedHost() +  m_path;
+    return specialPath(SpecialPathComponent::RootPath) + "/" + scheme() + "/" + encodedHost() +  path();
 }
 
 QUrl FilePath::toUrl() const
 {
     QUrl url;
-    url.setScheme(m_scheme);
+    url.setScheme(scheme().toString());
-    url.setHost(m_host);
+    url.setHost(host().toString());
-    url.setPath(m_path);
+    url.setPath(path());
     return url;
 }
 
@@ -217,13 +217,10 @@ QUrl FilePath::toUrl() const
 /// this path belongs to.
 QString FilePath::toUserOutput() const
 {
-    if (needsDevice()) {
-        if (isRelativePath())
-            return m_scheme + "://" + encodedHost() + "/./" + m_path;
-        return m_scheme + "://" + encodedHost() + m_path;
-    }
-
     QString tmp = toString();
+    if (needsDevice())
+        return tmp;
+
     if (osType() == OsTypeWindows)
         tmp.replace('/', '\\');
     return tmp;
@@ -333,25 +330,29 @@ QString FilePath::completeSuffix() const
 
 QStringView FilePath::scheme() const
 {
-    return m_scheme;
+    return QStringView{m_data}.mid(m_pathLen, m_schemeLen);
 }
 
 QStringView FilePath::host() const
 {
-    return m_host;
+    return QStringView{m_data}.mid(m_pathLen + m_schemeLen, m_hostLen);
 }
 
 QString FilePath::path() const
 {
-    return m_path;
+    if (m_data.startsWith("/./"))
+        return m_data.mid(3, m_pathLen - 3);
+    return m_data.left(m_pathLen);
 }
 
 void FilePath::setParts(const QStringView scheme, const QStringView host, const QStringView path)
 {
-    QTC_CHECK(!m_scheme.contains('/'));
+    QTC_CHECK(!scheme.contains('/'));
-    m_scheme = scheme.toString();
+
-    m_host = host.toString();
+    m_data = path.toString() + scheme.toString() + host.toString();
-    setPath(path);
+    m_schemeLen = scheme.size();
+    m_hostLen = host.size();
+    m_pathLen = path.size();
 }
 
 /// \returns a bool indicating whether a file with this
@@ -611,7 +612,7 @@ void FilePath::asyncWriteFileContents(const Continuation<bool> &cont, const QByt
 
 bool FilePath::needsDevice() const
 {
-    return !m_scheme.isEmpty();
+    return m_schemeLen != 0;
 }
 
 bool FilePath::isSameDevice(const FilePath &other) const
@@ -764,7 +765,7 @@ FilePath FilePath::normalizedPathName() const
 {
     FilePath result = *this;
     if (!needsDevice()) // FIXME: Assumes no remote Windows and Mac for now.
-        result.m_path = FileUtils::normalizedPathName(result.m_path);
+        result.setParts(scheme(), host(), FileUtils::normalizedPathName(path()));
     return result;
 }
 
@@ -833,15 +834,13 @@ bool isWindowsDriveLetter(QChar ch)
 
 void FilePath::setPath(QStringView path)
 {
-    if (path.startsWith(QStringLiteral("/./")))
+    setParts(scheme(), host(), path);
-        path = path.mid(3);
-    m_path = path.toString();
 }
 
 void FilePath::setFromString(const QString &unnormalizedFileName)
 {
-    static const QLatin1String qtcDevSlash("__qtc_devices__/");
+    static const QStringView qtcDevSlash(u"__qtc_devices__/");
-    static const QLatin1String colonSlashSlash("://");
+    static const QStringView colonSlashSlash(u"://");
 
     QString fileName = unnormalizedFileName;
     if (fileName.contains('\\'))
@@ -865,23 +864,21 @@ void FilePath::setFromString(const QString &unnormalizedFileName)
         const int firstSlash = withoutQtcDeviceRoot.indexOf(slash);
 
         if (firstSlash != -1) {
-            m_scheme = withoutQtcDeviceRoot.left(firstSlash).toString();
+            QString scheme = withoutQtcDeviceRoot.left(firstSlash).toString();
             const int secondSlash = withoutQtcDeviceRoot.indexOf(slash, firstSlash + 1);
-            m_host = withoutQtcDeviceRoot.mid(firstSlash + 1, secondSlash - firstSlash - 1)
+            QString host = withoutQtcDeviceRoot.mid(firstSlash + 1, secondSlash - firstSlash - 1)
                          .toString();
             if (secondSlash != -1) {
                 QStringView path = withoutQtcDeviceRoot.mid(secondSlash);
-                setPath(path);
+                setParts(scheme, host, path);
                 return;
             }
 
-            m_path = slash;
+            setParts(scheme, host, u"/");
             return;
         }
 
-        m_scheme.clear();
+        setParts({}, {}, fileName);
-        m_host.clear();
-        m_path = fileName;
         return;
     }
 
@@ -889,16 +886,14 @@ void FilePath::setFromString(const QString &unnormalizedFileName)
     const int schemeEnd = fileName.indexOf(colonSlashSlash);
     if (schemeEnd != -1 && schemeEnd < firstSlash) {
         // This is a pseudo Url, we can't use QUrl here sadly.
-        m_scheme = fileName.left(schemeEnd);
+        QString scheme = fileName.left(schemeEnd);
         const int hostEnd = fileName.indexOf(slash, schemeEnd + 3);
-        m_host = fileName.mid(schemeEnd + 3, hostEnd - schemeEnd - 3);
+        QString host = fileName.mid(schemeEnd + 3, hostEnd - schemeEnd - 3);
-        if (hostEnd != -1)
+        setParts(scheme, host, hostEnd != -1 ? QStringView(fileName).mid(hostEnd) : QStringView());
-            setPath(QStringView(fileName).mid(hostEnd));
         return;
     }
 
-    setPath(fileName);
+    setParts({}, {}, fileName);
-    return;
 }
 
 /// Constructs a FilePath from \a filePath. The \a defaultExtension is appended
@@ -951,9 +946,9 @@ QVariant FilePath::toVariant() const
 
 bool FilePath::operator==(const FilePath &other) const
 {
-    return QString::compare(m_path, other.m_path, caseSensitivity()) == 0
+    return QString::compare(path(), other.path(), caseSensitivity()) == 0
-        && m_host == other.m_host
+        && host() == other.host()
-        && m_scheme == other.m_scheme;
+        && scheme() == other.scheme();
 }
 
 bool FilePath::operator!=(const FilePath &other) const
@@ -963,12 +958,12 @@ bool FilePath::operator!=(const FilePath &other) const
 
 bool FilePath::operator<(const FilePath &other) const
 {
-    const int cmp = QString::compare(m_path, other.m_path, caseSensitivity());
+    const int cmp = QString::compare(path(), other.path(), caseSensitivity());
     if (cmp != 0)
         return cmp < 0;
-    if (m_host != other.m_host)
+    if (host() != other.host())
-        return m_host < other.m_host;
+        return host() < other.host();
-    return m_scheme < other.m_scheme;
+    return scheme() < other.scheme();
 }
 
 bool FilePath::operator<=(const FilePath &other) const
@@ -996,15 +991,15 @@ bool FilePath::isChildOf(const FilePath &s) const
 {
     if (s.isEmpty())
         return false;
-    if (!m_path.startsWith(s.m_path, caseSensitivity()))
+    if (!path().startsWith(s.path(), caseSensitivity()))
         return false;
-    if (m_path.size() <= s.m_path.size())
+    if (path().size() <= s.path().size())
         return false;
     // s is root, '/' was already tested in startsWith
-    if (s.m_path.endsWith(QLatin1Char('/')))
+    if (s.path().endsWith(QLatin1Char('/')))
         return true;
     // s is a directory, next character should be '/' (/tmpdir is NOT a child of /tmp)
-    return s.m_path.isEmpty() || m_path.at(s.m_path.size()) == QLatin1Char('/');
+    return s.path().isEmpty() || path().at(s.path().size()) == QLatin1Char('/');
 }
 
 /// \returns whether path() startsWith \a s
@@ -1029,7 +1024,7 @@ bool FilePath::endsWith(const QString &s) const
 */
 bool FilePath::startsWithDriveLetter() const
 {
-    return !needsDevice() && m_path.size() >= 2 && isWindowsDriveLetter(m_path[0]) && m_path.at(1) == ':';
+    return !needsDevice() && path().size() >= 2 && isWindowsDriveLetter(path()[0]) && path().at(1) == ':';
 }
 
 /*!
@@ -1043,11 +1038,10 @@ FilePath FilePath::relativeChildPath(const FilePath &parent) const
 {
     FilePath res;
     if (isChildOf(parent)) {
-        res.m_scheme = m_scheme;
+        QString p = path().mid(parent.path().size());
-        res.m_host = m_host;
+        if (p.startsWith('/'))
-        res.m_path = m_path.mid(parent.m_path.size());
+            p = p.mid(1);
-        if (res.m_path.startsWith('/'))
+        res.setParts(scheme(), host(), p);
-            res.m_path = res.m_path.mid(1);
     }
     return res;
 }
@@ -1164,15 +1158,13 @@ QString FilePath::calcRelativePath(const QString &absolutePath, const QString &a
 */
 FilePath FilePath::onDevice(const FilePath &deviceTemplate) const
 {
-    const bool sameDevice = m_scheme == deviceTemplate.m_scheme && m_host == deviceTemplate.m_host;
+    const bool sameDevice = scheme() == deviceTemplate.scheme() && host() == deviceTemplate.host();
     if (sameDevice)
         return *this;
     // TODO: converting paths between different non local devices is still unsupported
     QTC_CHECK(!needsDevice());
     FilePath res;
-    res.m_scheme = deviceTemplate.m_scheme;
+    res.setParts(deviceTemplate.scheme(), deviceTemplate.host(), path());
-    res.m_host = deviceTemplate.m_host;
-    res.m_path = m_path;
     res.setPath(res.mapToDevicePath());
     return res;
 }
@@ -1191,9 +1183,7 @@ FilePath FilePath::onDevice(const FilePath &deviceTemplate) const
 FilePath FilePath::withNewPath(const QString &newPath) const
 {
     FilePath res;
-    res.setPath(newPath);
+    res.setParts(scheme(), host(), newPath);
-    res.m_host = m_host;
-    res.m_scheme = m_scheme;
     return res;
 }
 
@@ -1286,9 +1276,11 @@ FilePath FilePath::pathAppended(const QString &path) const
     if (isEmpty()) {
         return other;
     }
-    FilePath fn = *this;
+
-    join(fn.m_path, other.path());
+    QString p = this->path();
-    return fn;
+    join(p, other.path());
+
+    return withNewPath(p);
 }
 
 FilePath FilePath::stringAppended(const QString &str) const
@@ -1506,7 +1498,7 @@ bool FilePath::isNewerThan(const QDateTime &timeStamp) const
  */
 Qt::CaseSensitivity FilePath::caseSensitivity() const
 {
-    if (m_scheme.isEmpty())
+    if (scheme().isEmpty())
         return HostOsInfo::fileNameCaseSensitivity();
 
     // FIXME: This could or possibly should the target device's file name case sensitivity
@@ -1606,7 +1598,7 @@ void FilePath::clear()
 */
 bool FilePath::isEmpty() const
 {
-    return m_path.isEmpty();
+    return m_pathLen == 0;
 }
 
 /*!
@@ -1634,9 +1626,9 @@ QString FilePath::shortNativePath() const
 */
 bool FilePath::isRelativePath() const
 {
-    if (m_path.startsWith('/'))
+    if (path().startsWith('/'))
         return false;
-    if (m_path.size() > 1 && isWindowsDriveLetter(m_path[0]) && m_path.at(1) == ':')
+    if (path().size() > 1 && isWindowsDriveLetter(path()[0]) && path().at(1) == ':')
         return false;
     return true;
 }

src/libs/utils/filepath.h

@@ -219,9 +219,10 @@ private:
     [[nodiscard]] QString mapToDevicePath() const;
     [[nodiscard]] QString encodedHost() const;
 
-    QString m_scheme;
+    QString m_data; // Concatenated m_path, m_scheme, m_host
-    QString m_host; // May contain raw slashes.
+    unsigned int m_pathLen = 0;
-    QString m_path; // Includes the root bits
+    unsigned short m_schemeLen = 0;
+    unsigned short m_hostLen = 0;
 };
 
 inline size_t qHash(const Utils::FilePath &a, uint seed = 0)

src/libs/utils/fsengine/fsenginehandler.cpp

@@ -52,11 +52,11 @@ QAbstractFileEngine *FSEngineHandler::create(const QString &fileName) const
         FilePath filePath = FilePath::fromString(fixedFileName);
         if (filePath.needsDevice())
             return new FSEngineImpl(filePath);
-
-        if (fixedFileName.compare(QDir::rootPath(), Qt::CaseInsensitive) == 0)
-            return new RootInjectFSEngine(fixedFileName);
     }
 
+    if (fixedFileName.compare(QDir::rootPath(), Qt::CaseInsensitive) == 0)
+        return new RootInjectFSEngine(fixedFileName);
+
     return nullptr;
 }
 

src/libs/utils/projectintropage.cpp

@@ -82,17 +82,20 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
     d->m_pathChooser->setDisabled(d->m_forceSubProject);
 
     d->m_projectsDirectoryCheckBox = new QCheckBox(tr("Use as default project location"));
+    d->m_projectsDirectoryCheckBox->setObjectName("projectsDirectoryCheckBox");
     d->m_projectsDirectoryCheckBox->setDisabled(d->m_forceSubProject);
 
     d->m_projectComboBox = new QComboBox;
     d->m_projectComboBox->setVisible(d->m_forceSubProject);
 
     d->m_stateLabel = new Utils::InfoLabel(this);
+    d->m_stateLabel->setObjectName("stateLabel");
     d->m_stateLabel->setWordWrap(true);
     d->m_stateLabel->setFilled(true);
     hideStatusLabel();
 
     d->m_nameLineEdit->setPlaceholderText(tr("Enter project name"));
+    d->m_nameLineEdit->setObjectName("nameLineEdit");
     d->m_nameLineEdit->setFocus();
     d->m_nameLineEdit->setValidationFunction([this](FancyLineEdit *edit, QString *errorString) {
         return validateProjectName(edit->text(), errorString);

src/libs/utils/settingsaccessor.h

@@ -207,7 +207,7 @@ public:
     virtual QVariantMap upgrade(const QVariantMap &data) = 0;
 
 protected:
-    using Change = QPair<QLatin1String,QLatin1String>;
+    using Change = QPair<QLatin1String, QLatin1String>;
     QVariantMap renameKeys(const QList<Change> &changes, QVariantMap map) const;
 
 private:

src/libs/utils/theme/theme.cpp

@@ -3,7 +3,6 @@
 
 #include "theme.h"
 #include "theme_p.h"
-#include "../algorithm.h"
 #include "../hostosinfo.h"
 #include "../qtcassert.h"
 #ifdef Q_OS_MACOS
@@ -11,7 +10,6 @@
 #endif
 
 #include <QApplication>
-#include <QFileInfo>
 #include <QMetaEnum>
 #include <QPalette>
 #include <QSettings>
@@ -133,17 +131,18 @@ QString Theme::imageFile(Theme::ImageFile imageFile, const QString &fallBack) co
 
 QPair<QColor, QString> Theme::readNamedColor(const QString &color) const
 {
-    if (d->palette.contains(color))
+    const auto it = d->palette.constFind(color);
-        return qMakePair(d->palette[color], color);
+    if (it != d->palette.constEnd())
+        return {it.value(), color};
     if (color == QLatin1String("style"))
-        return qMakePair(QColor(), QString());
+        return {};
 
     const QColor col('#' + color);
     if (!col.isValid()) {
         qWarning("Color \"%s\" is neither a named color nor a valid color", qPrintable(color));
-        return qMakePair(Qt::black, QString());
+        return {Qt::black, {}};
     }
-    return qMakePair(col, QString());
+    return {col, {}};
 }
 
 QString Theme::filePath() const
@@ -222,11 +221,13 @@ bool Theme::systemUsesDarkMode()
         constexpr char regkey[]
             = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
         bool ok;
-        const auto setting = QSettings(regkey, QSettings::NativeFormat).value("AppsUseLightTheme").toInt(&ok);
+        const int setting = QSettings(regkey, QSettings::NativeFormat).value("AppsUseLightTheme").toInt(&ok);
         return ok && setting == 0;
-    } else if (HostOsInfo::isMacHost()) {
-        return macOSSystemIsDark();
     }
+
+    if (HostOsInfo::isMacHost())
+        return macOSSystemIsDark();
+
     return false;
 }
 

src/libs/utils/wizard.cpp

@@ -208,8 +208,8 @@ void LinearProgressWidget::recreateLayout()
 {
     disableUpdates();
 
-    QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator it = m_itemToItemWidget.constBegin();
+    auto it = m_itemToItemWidget.constBegin();
-    QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator itEnd = m_itemToItemWidget.constEnd();
+    const auto itEnd = m_itemToItemWidget.constEnd();
     while (it != itEnd) {
         it.value()->setVisible(false);
         ++it;
@@ -243,8 +243,8 @@ void LinearProgressWidget::updateProgress()
 
     QList<WizardProgressItem *> visitedItems = m_wizardProgress->visitedItems();
 
-    QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator it = m_itemToItemWidget.constBegin();
+    auto it = m_itemToItemWidget.constBegin();
-    QMap<WizardProgressItem *, ProgressItemWidget *>::ConstIterator itEnd = m_itemToItemWidget.constEnd();
+    const auto itEnd = m_itemToItemWidget.constEnd();
     while (it != itEnd) {
         WizardProgressItem *item = it.key();
         ProgressItemWidget *itemWidget = it.value();
@@ -636,12 +636,12 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr
     if (item->nextItems().contains(toItem))
         return {toItem};
 
-    QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> > visitedItemsToParents;
+    QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool>> visitedItemsToParents;
-    QList<QPair<WizardProgressItem *, WizardProgressItem *> > workingItems; // next to prev item
+    QList<QPair<WizardProgressItem *, WizardProgressItem *>> workingItems; // next to prev item
 
-    QList<WizardProgressItem *> items = item->nextItems();
+    const QList<WizardProgressItem *> items = item->nextItems();
-    for (int i = 0; i < items.count(); i++)
+    for (WizardProgressItem *i : items)
-        workingItems.append(qMakePair(items.at(i), item));
+        workingItems.push_back({i, item});
 
     while (!workingItems.isEmpty()) {
         QPair<WizardProgressItem *, WizardProgressItem *> workingItem = workingItems.takeFirst();
@@ -651,16 +651,16 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr
         if (parents.count() > 1)
             continue;
 
-        QList<WizardProgressItem *> items = workingItem.first->nextItems();
+        const QList<WizardProgressItem *> items = workingItem.first->nextItems();
-        for (int i = 0; i < items.count(); i++)
+        for (WizardProgressItem *i : items)
-            workingItems.append(qMakePair(items.at(i), workingItem.first));
+            workingItems.push_back({i, workingItem.first});
     }
 
     QList<WizardProgressItem *> path;
 
     WizardProgressItem *it = toItem;
-    QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> >::ConstIterator itItem = visitedItemsToParents.constFind(it);
+    auto itItem = visitedItemsToParents.constFind(it);
-    QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> >::ConstIterator itEnd = visitedItemsToParents.constEnd();
+    const auto itEnd = visitedItemsToParents.constEnd();
     while (itItem != itEnd) {
         path.prepend(itItem.key());
         if (itItem.value().count() != 1)
@@ -702,8 +702,8 @@ WizardProgress::~WizardProgress()
 {
     Q_D(WizardProgress);
 
-    QMap<WizardProgressItem *, WizardProgressItem *>::ConstIterator it = d->m_itemToItem.constBegin();
+    auto it = d->m_itemToItem.constBegin();
-    QMap<WizardProgressItem *, WizardProgressItem *>::ConstIterator itEnd = d->m_itemToItem.constEnd();
+    const auto itEnd = d->m_itemToItem.constEnd();
     while (it != itEnd) {
         delete it.key();
         ++it;

src/plugins/android/androidbuildapkstep.cpp

@@ -567,14 +567,16 @@ bool AndroidBuildApkStep::init()
     if (m_buildAAB)
         arguments << "--aab" <<  "--jarsigner";
 
+    if (buildType() == BuildConfiguration::Release) {
+        arguments << "--release";
+    }
+
     QStringList argumentsPasswordConcealed = arguments;
 
     if (m_signPackage) {
-        arguments << "--release"
+        arguments << "--sign" << m_keystorePath.toString() << m_certificateAlias
-                  << "--sign" << m_keystorePath.toString() << m_certificateAlias
                   << "--storepass" << m_keystorePasswd;
-        argumentsPasswordConcealed << "--release"
+        argumentsPasswordConcealed << "--sign" << "******"
-                                   << "--sign" << "******"
                                    << "--storepass" << "******";
         if (!m_certificatePasswd.isEmpty()) {
             arguments << "--keypass" << m_certificatePasswd;

src/plugins/android/androiddeployqtstep.cpp

@@ -240,6 +240,9 @@ bool AndroidDeployQtStep::init()
 
             m_androiddeployqtArgs.addArg("--gradle");
 
+            if (buildType() == BuildConfiguration::Release)
+                m_androiddeployqtArgs.addArgs({"--release"});
+
             if (androidBuildApkStep && androidBuildApkStep->signPackage()) {
                 // The androiddeployqt tool is not really written to do stand-alone installations.
                 // This hack forces it to use the correct filename for the apk file when installing

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -689,7 +689,7 @@ void AndroidManifestEditorWidget::updateInfoBar()
 
 void AndroidManifestEditorWidget::updateSdkVersions()
 {
-    static const QPair<int, int> sdkPair = qMakePair(16, 31);
+    static const QPair<int, int> sdkPair{16, 31};
     int minSdk = sdkPair.first;
     const int targetSdk = sdkPair.second;
     const Target *target = androidTarget(m_textEditorWidget->textDocument()->filePath());

src/plugins/android/androidsdkmanager.cpp

@@ -706,7 +706,7 @@ QPair<SystemImage *, int> SdkManagerOutputParser::parseSystemImage(const QString
         image->setDisplayText(packageData.description);
         image->setDescriptionText(packageData.description);
         image->setApiLevel(apiLevel);
-        result = qMakePair(image, apiLevel);
+        result = {image, apiLevel};
     } else {
         qCDebug(sdkManagerLog) << "System-image: Minimum required data unavailable: "<< data;
     }

src/plugins/autotoolsprojectmanager/autogenstep.cpp

@@ -4,6 +4,7 @@
 #include "autogenstep.h"
 
 #include "autotoolsprojectconstants.h"
+#include "autotoolsprojectmanagertr.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -19,8 +20,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 // AutogenStep
 
@@ -35,8 +35,6 @@ namespace Internal {
 
 class AutogenStep final : public AbstractProcessStep
 {
-    Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutogenStep)
-
 public:
     AutogenStep(BuildStepList *bsl, Id id);
 
@@ -50,7 +48,7 @@ AutogenStep::AutogenStep(BuildStepList *bsl, Id id) : AbstractProcessStep(bsl, i
 {
     auto arguments = addAspect<StringAspect>();
     arguments->setSettingsKey("AutotoolsProjectManager.AutogenStep.AdditionalArguments");
-    arguments->setLabelText(tr("Arguments:"));
+    arguments->setLabelText(Tr::tr("Arguments:"));
     arguments->setDisplayStyle(StringAspect::LineEditDisplay);
     arguments->setHistoryCompleter("AutotoolsPM.History.AutogenStepArgs");
 
@@ -86,7 +84,8 @@ void AutogenStep::doRun()
     }
 
     if (!m_runAutogen) {
-        emit addOutput(tr("Configuration unchanged, skipping autogen step."), BuildStep::OutputFormat::NormalMessage);
+        emit addOutput(Tr::tr("Configuration unchanged, skipping autogen step."),
+                       OutputFormat::NormalMessage);
         emit finished(true);
         return;
     }
@@ -106,10 +105,9 @@ void AutogenStep::doRun()
 AutogenStepFactory::AutogenStepFactory()
 {
     registerStep<AutogenStep>(Constants::AUTOGEN_STEP_ID);
-    setDisplayName(AutogenStep::tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id."));
+    setDisplayName(Tr::tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id."));
     setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID);
     setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
 }
 
-} // Internal
+} // AutotoolsProjectManager::Internal
-} // AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autogenstep.h

@@ -5,8 +5,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 class AutogenStepFactory final : public ProjectExplorer::BuildStepFactory
 {
@@ -14,5 +13,4 @@ public:
     AutogenStepFactory();
 };
 
-} // namespace Internal
+} // AutotoolsProjectManager::Internal
-} // namespace AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autoreconfstep.cpp

@@ -4,6 +4,7 @@
 #include "autoreconfstep.h"
 
 #include "autotoolsprojectconstants.h"
+#include "autotoolsprojectmanagertr.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -17,8 +18,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 // AutoreconfStep class
 
@@ -33,8 +33,6 @@ namespace Internal {
 
 class AutoreconfStep final : public AbstractProcessStep
 {
-    Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutoreconfStep)
-
 public:
     AutoreconfStep(BuildStepList *bsl, Id id);
 
@@ -49,7 +47,7 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Id id)
 {
     auto arguments = addAspect<StringAspect>();
     arguments->setSettingsKey("AutotoolsProjectManager.AutoreconfStep.AdditionalArguments");
-    arguments->setLabelText(tr("Arguments:"));
+    arguments->setLabelText(Tr::tr("Arguments:"));
     arguments->setValue("--force --install");
     arguments->setDisplayStyle(StringAspect::LineEditDisplay);
     arguments->setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");
@@ -80,7 +78,8 @@ void AutoreconfStep::doRun()
         m_runAutoreconf = true;
 
     if (!m_runAutoreconf) {
-        emit addOutput(tr("Configuration unchanged, skipping autoreconf step."), OutputFormat::NormalMessage);
+        emit addOutput(Tr::tr("Configuration unchanged, skipping autoreconf step."),
+                       OutputFormat::NormalMessage);
         emit finished(true);
         return;
     }
@@ -100,10 +99,9 @@ void AutoreconfStep::doRun()
 AutoreconfStepFactory::AutoreconfStepFactory()
 {
     registerStep<AutoreconfStep>(Constants::AUTORECONF_STEP_ID);
-    setDisplayName(AutoreconfStep::tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id."));
+    setDisplayName(Tr::tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id."));
     setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID);
     setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
 }
 
-} // Internal
+} // AutotoolsProjectManager::Internal
-} // AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autoreconfstep.h

@@ -5,8 +5,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 class AutoreconfStepFactory final : public ProjectExplorer::BuildStepFactory
 {
@@ -14,5 +13,4 @@ public:
     AutoreconfStepFactory();
 };
 
-} // namespace Internal
+} // AutotoolsProjectManager::Internal
-} // namespace AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp

@@ -4,6 +4,7 @@
 #include "autotoolsbuildconfiguration.h"
 
 #include "autotoolsprojectconstants.h"
+#include "autotoolsprojectmanagertr.h"
 
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildsteplist.h>
@@ -14,15 +15,12 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 // AutotoolsBuildConfiguration
 
 class AutotoolsBuildConfiguration : public BuildConfiguration
 {
-    Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration)
-
 public:
     AutotoolsBuildConfiguration(Target *target, Id id)
         : BuildConfiguration(target, id)
@@ -31,7 +29,7 @@ public:
         // The leading / is to avoid the relative the path expansion in BuildConfiguration::buildDirectory.
         setBuildDirectory("/<foobar>");
         setBuildDirectoryHistoryCompleter("AutoTools.BuildDir.History");
-        setConfigWidgetDisplayName(tr("Autotools Manager"));
+        setConfigWidgetDisplayName(Tr::tr("Autotools Manager"));
 
         // ### Build Steps Build ###
         const FilePath autogenFile = target->project()->projectDirectory() / "autogen.sh";
@@ -69,5 +67,4 @@ AutotoolsBuildConfigurationFactory::AutotoolsBuildConfigurationFactory()
     });
 }
 
-} // Internal
+} // AutotoolsProjectManager::Internal
-} // AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h

@@ -5,8 +5,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 class AutotoolsBuildConfigurationFactory final : public ProjectExplorer::BuildConfigurationFactory
 {
@@ -14,5 +13,4 @@ public:
     AutotoolsBuildConfigurationFactory();
 };
 
-} // namespace Internal
+} // AutotoolsProjectManager::Internal
-} // namespace AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp

@@ -4,7 +4,6 @@
 #include "autotoolsbuildsystem.h"
 
 #include "makefileparserthread.h"
-#include "makestep.h"
 
 #include <cppeditor/cppprojectupdater.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -12,19 +11,18 @@
 #include <qtsupport/qtcppkitinfo.h>
 
 #include <utils/filesystemwatcher.h>
+#include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 AutotoolsBuildSystem::AutotoolsBuildSystem(Target *target)
     : BuildSystem(target)
     , m_cppCodeModelUpdater(new CppEditor::CppProjectUpdater)
 {
-    connect(target, &Target::activeBuildConfigurationChanged, this, [this]() { requestParse(); });
+    connect(target, &Target::activeBuildConfigurationChanged, this, [this] { requestParse(); });
-
+    connect(target->project(), &Project::projectFileIsDirty, this, [this] { requestParse(); });
-    connect(target->project(), &Project::projectFileIsDirty, this, [this]() { requestParse(); });
 }
 
 AutotoolsBuildSystem::~AutotoolsBuildSystem()
@@ -158,5 +156,4 @@ void AutotoolsBuildSystem::updateCppCodeModel()
     m_cppCodeModelUpdater->update({project(), kitInfo, activeParseEnvironment(), {rpp}});
 }
 
-} // namespace Internal
+} // AutotoolsProjectManager::Internal
-} // namespace AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.h

@@ -9,8 +9,7 @@
 
 namespace CppEditor { class CppProjectUpdater; }
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
 class MakefileParserThread;
 
@@ -46,5 +45,4 @@ private:
     CppEditor::CppProjectUpdater *m_cppCodeModelUpdater = nullptr;
 };
 
-} // namespace Internal
+} // AutotoolsProjectManager::Internal
-} // namespace AutotoolsProjectManager

src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp

@@ -14,23 +14,36 @@
 #include <coreplugin/icontext.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-namespace AutotoolsProjectManager {
+namespace AutotoolsProjectManager::Internal {
-namespace Internal {
 
-AutotoolsProject::AutotoolsProject(const Utils::FilePath &fileName)
+/**
-    : Project(Constants::MAKEFILE_MIMETYPE, fileName)
+ * @brief Implementation of the ProjectExplorer::Project interface.
+ *
+ * Loads the autotools project and embeds it into the QtCreator project tree.
+ * The class AutotoolsProject is the core of the autotools project plugin.
+ * It is responsible to parse the Makefile.am files and do trigger project
+ * updates if a Makefile.am file or a configure.ac file has been changed.
+ */
+class AutotoolsProject : public ProjectExplorer::Project
 {
-    setId(Constants::AUTOTOOLS_PROJECT_ID);
+public:
-    setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
+    explicit AutotoolsProject(const Utils::FilePath &fileName)
-    setDisplayName(projectDirectory().fileName());
+        : Project(Constants::MAKEFILE_MIMETYPE, fileName)
+    {
+        setId(Constants::AUTOTOOLS_PROJECT_ID);
+        setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
+        setDisplayName(projectDirectory().fileName());
 
-    setHasMakeInstallEquivalent(true);
+        setHasMakeInstallEquivalent(true);
+
+        setBuildSystemCreator([](ProjectExplorer::Target *t) { return new AutotoolsBuildSystem(t); });
+    }
+};
 
-    setBuildSystemCreator([](ProjectExplorer::Target *t) { return new AutotoolsBuildSystem(t); });
-}
 
 class AutotoolsProjectPluginPrivate
 {
@@ -50,8 +63,7 @@ AutotoolsProjectPlugin::~AutotoolsProjectPlugin()
 void AutotoolsProjectPlugin::extensionsInitialized()
 { }
 
-bool AutotoolsProjectPlugin::initialize(const QStringList &arguments,
+bool AutotoolsProjectPlugin::initialize(const QStringList &arguments, QString *errorString)
-                                        QString *errorString)
 {
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
@@ -62,5 +74,4 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments,
     return true;
 }
 
-} // namespace Internal
+} // AutotoolsProjectManager::Internal
-} // AutotoolsProjectManager