diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-15 14:42:30 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-15 16:14:34 +0200 |
| commit | d9d0aba1c4870eaddd9ec3be1561ed0a39bcc74d (patch) | |
| tree | d2d40ffee8d17ae3193064d861894a5661908dd0 | |
| parent | 23536e9b426aba67880a9ef19e9c67517e642df0 (diff) | |
| parent | 8c133689be164cfdb8f77078a97dce3c97397afe (diff) | |
| download | qt-creator-d9d0aba1c4870eaddd9ec3be1561ed0a39bcc74d.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/projectexplorer/editorconfiguration.cpp
src/plugins/projectexplorer/projectfilewizardextension.cpp
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
103 files changed, 8536 insertions, 4344 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index 150768f062..7764b14868 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -6,8 +6,8 @@ headerdirs = sourcedirs = $SRCDIR/src imagedirs = $SRCDIR/images $SRCDIR/templates/images outputdir = $OUTDIR -exampledirs = $SRCDIR/examples \ - $SRCDIR/snippets +exampledirs = $SRCDIR/examples + indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \ $QDOC_INDEX_DIR/qtcore/qtcore.index \ $QDOC_INDEX_DIR/qtqml/qtqml.index \ diff --git a/doc/images/creator-diff-editor.png b/doc/images/creator-diff-editor.png Binary files differindex 54f39992ff..bfa3ad376f 100644 --- a/doc/images/creator-diff-editor.png +++ b/doc/images/creator-diff-editor.png diff --git a/doc/images/qtcreator-switchto-sidebyside-diffeditor.png b/doc/images/qtcreator-switchto-sidebyside-diffeditor.png Binary files differnew file mode 100644 index 0000000000..dfcfbe0246 --- /dev/null +++ b/doc/images/qtcreator-switchto-sidebyside-diffeditor.png diff --git a/doc/images/qtcreator-switchto-unified-diffeditor.png b/doc/images/qtcreator-switchto-unified-diffeditor.png Binary files differnew file mode 100644 index 0000000000..9d605aeb19 --- /dev/null +++ b/doc/images/qtcreator-switchto-unified-diffeditor.png diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index b7b85510ed..c55712f87a 100644 --- a/doc/src/editors/creator-diff-editor.qdoc +++ b/doc/src/editors/creator-diff-editor.qdoc @@ -51,6 +51,15 @@ indicates lines that contain added text (painted a darker green) in the right pane. + To view the differences in a unified view where changed rows are placed + below each other, select + \inlineimage qtcreator-switchto-unified-diffeditor.png + (\gui {Switch to Unified Diff Editor}). + + To switch back to the side-by-side view, select + \inlineimage qtcreator-switchto-sidebyside-diffeditor.png + (\gui {Switch to Side by Side Diff Editor}). + To change the default colors, select \gui Tools > \gui Options > \gui {Text Editor} > \gui {Font & Colors}. Create your own color scheme and select new colors for the following options: @@ -86,4 +95,8 @@ synchronized. To use them independently of each other, select the \inlineimage qtcreator-synchronizefocus.png (\gui {Synchronize Horizontal Scroll Bars}) button. + + If the files change outside \QC, select + \inlineimage qtcreator-regenerate-index.png + (\gui {Reload Editor}) to compare them again and to show the results. */ diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index b5bff9e137..97de575215 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -2217,7 +2217,8 @@ locator. For example, to open main.cpp to line 41, enter: \c {main.cpp:41}. If the path to a file is very long, it might not fit into the locator - window. To view the full path, press \key Alt when the filename is selected. + window. To view the full path, press \key Alt when the filename is selected + or use the handle next to the locator window to increase the window width. 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 diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index 7ff6f03cdd..5ffc53a4c8 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-projects-settings-run.qdoc @@ -45,6 +45,15 @@ parsed .pro files. For more information on how the commands are constructed, see \l{Starting External Processes}. + \section2 Creating Run Configurations for Subprojects + + To prevent \QC from automatically creating run configurations for SUBDIRS + projects, specify the following variable in the .pro file of the SUBDIRS + project: \c {CONFIG += qtc_runnable}. + + \QC creates run configurations only for subprojects that also have + \c {CONFIG += qtc_runnable} set in their .pro files. + \include projects/creator-projects-settings-run-desktop.qdocinc \include projects/creator-projects-settings-run-analyze.qdocinc \include projects/creator-projects-settings-run-debug.qdocinc diff --git a/qbs/modules/pluginspec/pluginspec.qbs b/qbs/modules/pluginspec/pluginspec.qbs index 8c1045f3a3..a5856d9242 100644 --- a/qbs/modules/pluginspec/pluginspec.qbs +++ b/qbs/modules/pluginspec/pluginspec.qbs @@ -73,7 +73,7 @@ Module { Artifact { fileTags: ["qt_plugin_metadata"] filePath: { - var destdir = FileInfo.joinPaths(product.moduleProperty("Qt/core", "generatedFilesDir"), + var destdir = FileInfo.joinPaths(product.moduleProperty("Qt.core", "generatedFilesDir"), input.fileName); return destdir.replace(/\.[^\.]*$/, '.json'); } @@ -81,7 +81,7 @@ Module { prepare: { var xslFile = project.path + "/../qtcreatorplugin2json.xsl"; // project is "Plugins" - var xmlPatternsPath = product.moduleProperty("Qt/core", "binPath") + "/xmlpatterns"; + var xmlPatternsPath = product.moduleProperty("Qt.core", "binPath") + "/xmlpatterns"; var args = [ "-no-format", "-output", diff --git a/qtcreator.pro b/qtcreator.pro index 5d22eb0409..e2d2de9e43 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -49,7 +49,7 @@ minQtVersion(5, 0, 0):exists(src/shared/qbs/qbs.pro) { QBS_APPS_RPATH_DIR = @loader_path/../PlugIns } else { QBS_PLUGINS_BUILD_DIR = $${IDE_BUILD_TREE}/$${IDE_LIBRARY_BASENAME}/qtcreator - QBS_APPS_RPATH_DIR = \\\$\\\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator + QBS_APPS_RPATH_DIR = \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator } cache(QBS_PLUGINS_BUILD_DIR) cache(QBS_APPS_RPATH_DIR) @@ -65,8 +65,10 @@ minQtVersion(5, 0, 0):exists(src/shared/qbs/qbs.pro) { cache(QBS_RELATIVE_PLUGINS_PATH) QBS_RELATIVE_SEARCH_PATH = $$relative_path($$QBS_RESOURCES_BUILD_DIR, $$QBS_APPS_DESTDIR) cache(QBS_RELATIVE_SEARCH_PATH) - QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates - cache(CONFIG, add, QBS_CONFIG_ADDITION) + !qbs_no_dev_install { + QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates + cache(CONFIG, add, QBS_CONFIG_ADDITION) + } } contains(QT_ARCH, i386): ARCHITECTURE = x86 diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp index a995ab36fb..c6383cd0ae 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp +++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp @@ -37,7 +37,9 @@ namespace QmlDesigner { -static QCache<qint32, SharedMemory> globalSharedMemoryCache(10000); +// using cache as a container which deletes sharedmemory pointers at process exit +typedef QCache<qint32, SharedMemory> GlobalSharedMemoryContainer; +Q_GLOBAL_STATIC_WITH_ARGS(GlobalSharedMemoryContainer, globalSharedMemoryContainer, (10000)) ValuesChangedCommand::ValuesChangedCommand() : m_keyNumber(0) @@ -63,7 +65,7 @@ quint32 ValuesChangedCommand::keyNumber() const void ValuesChangedCommand::removeSharedMemorys(const QVector<qint32> &keyNumberVector) { foreach (qint32 keyNumber, keyNumberVector) { - SharedMemory *sharedMemory = globalSharedMemoryCache.take(keyNumber); + SharedMemory *sharedMemory = globalSharedMemoryContainer()->take(keyNumber); delete sharedMemory; } } @@ -82,8 +84,10 @@ static SharedMemory *createSharedMemory(qint32 key, int byteCount) bool sharedMemoryIsCreated = sharedMemory->create(byteCount); if (sharedMemoryIsCreated) { - globalSharedMemoryCache.insert(key, sharedMemory); + globalSharedMemoryContainer()->insert(key, sharedMemory); return sharedMemory; + } else { + delete sharedMemory; } return 0; diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp index 031602e75c..497bb57d07 100644 --- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp @@ -42,7 +42,9 @@ namespace QmlDesigner { -static QCache<qint32, SharedMemory> globalSharedMemoryCache(10000); +// using cache as a container which deletes sharedmemory pointers at process exit +typedef QCache<qint32, SharedMemory> GlobalSharedMemoryContainer; +Q_GLOBAL_STATIC_WITH_ARGS(GlobalSharedMemoryContainer, globalSharedMemoryContainer, (10000)) ImageContainer::ImageContainer() : m_instanceId(-1), @@ -82,7 +84,7 @@ void ImageContainer::setImage(const QImage &image) void ImageContainer::removeSharedMemorys(const QVector<qint32> &keyNumberVector) { foreach (qint32 keyNumber, keyNumberVector) { - SharedMemory *sharedMemory = globalSharedMemoryCache.take(keyNumber); + SharedMemory *sharedMemory = globalSharedMemoryContainer()->take(keyNumber); delete sharedMemory; } } @@ -91,13 +93,13 @@ static const QLatin1String imageKeyTemplateString("Image-%1"); static SharedMemory *createSharedMemory(qint32 key, int byteCount) { - SharedMemory *sharedMemory = globalSharedMemoryCache.take(key); + SharedMemory *sharedMemory = (*globalSharedMemoryContainer())[key]; if (sharedMemory == 0) { sharedMemory = new SharedMemory(QString(imageKeyTemplateString).arg(key)); bool sharedMemoryIsCreated = sharedMemory->create(byteCount); if (sharedMemoryIsCreated) { - globalSharedMemoryCache.insert(key, sharedMemory); + globalSharedMemoryContainer()->insert(key, sharedMemory); } else { delete sharedMemory; sharedMemory = 0; @@ -118,8 +120,7 @@ static SharedMemory *createSharedMemory(qint32 key, int byteCount) } if (!sharedMemory->isAttached()) { - globalSharedMemoryCache.remove(key); - delete sharedMemory; + globalSharedMemoryContainer()->remove(key); sharedMemory = 0; } } diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp index d356dd31ef..eb79561f09 100644 --- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp @@ -49,16 +49,10 @@ #include <private/qcore_unix_p.h> -#ifdef Q_OS_OSX -#define NAME_MAX PSHMNAMLEN -#endif - -#ifndef QStringLiteral -#define QStringLiteral(str) QString::fromUtf8(str) +#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) +#define QStringLiteral(str) QString::fromLatin1(str) #endif -#include <QRegExp> - namespace QmlDesigner { class SharedMemoryLocker diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml index e04c067cf8..e9788e4bea 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml @@ -1,5 +1,44 @@ -import QtQuick 2.2 +import QtQuick 2.1 +import QtQuick.Controls 1.0 Rectangle { property string title + + property Item toolBar + property Item statusBar + + property alias contentItem : contentArea + default property alias data: contentArea.data + + onStatusBarChanged: { if (statusBar) { statusBar.parent = statusBarArea } } + onToolBarChanged: { if (toolBar) { toolBar.parent = toolBarArea } } + + Item { + id: contentArea + anchors.top: toolBarArea.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: statusBarArea.top + } + + Item { + id: toolBarArea + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + implicitHeight: childrenRect.height + height: visibleChildren.length > 0 ? implicitHeight: 0 + } + + Item { + id: statusBarArea + anchors.bottom: parent.bottom + anchors.left: parent.left + anchors.right: parent.right + implicitHeight: childrenRect.height + height: 0 + //The status bar is not visible for now + //height: visibleChildren.length > 0 ? implicitHeight: 0 + } + } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index bc1e5c7bd3..307feedd72 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -91,6 +91,14 @@ static bool isPropertyBlackListed(const QmlDesigner::PropertyName &propertyName) return false; } +static bool isSimpleExpression(const QString &expression) +{ + if (expression.startsWith(QStringLiteral("{"))) + return false; + + return true; +} + namespace QmlDesigner { namespace Internal { @@ -512,6 +520,9 @@ void ObjectNodeInstance::setPropertyBinding(const PropertyName &name, const QStr if (ignoredProperties().contains(name)) return; + if (!isSimpleExpression(expression)) + return; + QQmlProperty property(object(), name, context()); if (!property.isValid()) @@ -1084,6 +1095,15 @@ static bool isCrashingType(QQmlType *type) if (type->qmlTypeName() == QStringLiteral("QtMultimedia/Audio")) return true; + + if (type->qmlTypeName() == QStringLiteral("QtQuick.Controls/MenuItem")) + return true; + + if (type->qmlTypeName() == QStringLiteral("QtQuick.Controls/Menu")) + return true; + + if (type->qmlTypeName() == QStringLiteral("QtQuick/Timer")) + return true; } return false; diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp index 8668e9b3b8..3f6077920c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp @@ -38,11 +38,26 @@ #include <designersupport.h> +#if defined(Q_OS_UNIX) +#include <unistd.h> +#elif defined(Q_OS_WIN) +#include <windows.h> +#endif + namespace QmlDesigner { +static void prioritizeDown() +{ +#if defined(Q_OS_UNIX) + nice(19); +#elif defined(Q_OS_WIN) + SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); +#endif +} Qt5NodeInstanceClientProxy::Qt5NodeInstanceClientProxy(QObject *parent) : NodeInstanceClientProxy(parent) { + prioritizeDown(); DesignerSupport::activateDesignerWindowManager(); if (QCoreApplication::arguments().at(1) == QLatin1String("--readcapturedstream")) { qputenv("DESIGNER_DONT_USE_SHARED_MEMORY", "1"); diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml index d2df7ed73a..8f671ae4a7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml @@ -39,10 +39,7 @@ Controls.CheckBox { property color highlightColor: "orange" property color textColor: colorLogic.textColor - onTextChanged: { - if (text.charAt(0) !== " ") - text = " " + text - } + opacity: enabled ? 1 : 0.5 property variant backendValue diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml index c80fa15b2f..24ac31bf1e 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml @@ -66,8 +66,11 @@ Controls.ComboBox { var index = comboBox.find(enumString) + if (index < 0) + index = 0 + if (index !== comboBox.currentIndex) - comboBox.currentIndex = comboBox.find(enumString) + comboBox.currentIndex = index } else { if (comboBox.currentIndex !== backendValue.value) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml index 85b27d8556..816e15ac51 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml @@ -32,7 +32,7 @@ import QtQuick.Controls 1.1 as Controls import QtQuick.Controls.Styles 1.1 CheckBoxStyle { - spacing: 8 + spacing: 24 label: Controls.Label { text: control.text ; color: checkBox.textColor } indicator: Item { implicitWidth: 16 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir index e474f5e3ce..5aa64e7d68 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir @@ -1,41 +1,40 @@ -GroupBox 2.0 GroupBox.qml -LineEdit 2.0 LineEdit.qml -SpinBox 2.0 SpinBox.qml +AligmentHorizontalButtons 2.0 AligmentHorizontalButtons.qml +AligmentVerticalButtons 2.0 AligmentVerticalButtons.qml +AnchorButtons 2.0 AnchorButtons.qml +BoolButtonRowButton 2.0 BoolButtonRowButton.qml Button 2.0 Button.qml -Label 2.0 Label.qml -Section 2.0 Section.qml +ButtonRow 2.0 ButtonRow.qml +ButtonRowButton 2.0 ButtonRowButton.qml CheckBox 2.0 CheckBox.qml -TabView 2.0 TabView.qml -Tab 2.0 Tab.qml -ScrollView 2.0 ScrollView.qml -ComboBox 2.0 ComboBox.qml -CustomComboBoxStyle 2.0 CustomComboBoxStyle.qml -SectionLayout 2.0 SectionLayout.qml -SecondColumnLayout 2.0 SecondColumnLayout.qml -ExpandingSpacer 2.0 ExpandingSpacer.qml ColorButton 2.0 ColorButton.qml ColorCheckButton 2.0 ColorCheckButton.qml -HueSlider 2.0 HueSlider.qml -GradientLine 2.0 GradientLine.qml -SliderSpinBox 2.0 SliderSpinBox.qml ColorEditor 2.0 ColorEditor.qml -IconLabel 2.0 IconLabel.qml +ColorLogic 2.0 ColorLogic.qml +ComboBox 2.0 ComboBox.qml +CustomCheckBoxStyle 2.0 CustomCheckBoxStyle.qml +CustomComboBoxStyle 2.0 CustomComboBoxStyle.qml +CustomSpinBoxStyle 2.0 CustomSpinBoxStyle.qml +ExpandingSpacer 2.0 ExpandingSpacer.qml ExtendedFunctionButton 2.0 ExtendedFunctionButton.qml -ButtonRow 2.0 ButtonRow.qml -ButtonRowButton 2.0 ButtonRowButton.qml -BoolButtonRowButton 2.0 BoolButtonRowButton.qml -FontStyleButtons 2.0 FontStyleButtons.qml -AnchorButtons 2.0 AnchorButtons.qml -AligmentHorizontalButtons 2.0 AligmentHorizontalButtons.qml -AligmentVerticalButtons 2.0 AligmentVerticalButtons.qml -StandardTextSection 2.0 StandardTextSection.qml -FontSection 2.0 FontSection.qml FlickableSection 2.0 FlickableSection.qml -UrlChooser 2.0 UrlChooser.qml FontComboBox 2.0 FontComboBox.qml +FontSection 2.0 FontSection.qml +FontStyleButtons 2.0 FontStyleButtons.qml +GradientLine 2.0 GradientLine.qml +GroupBox 2.0 GroupBox.qml +HueSlider 2.0 HueSlider.qml +IconLabel 2.0 IconLabel.qml +Label 2.0 Label.qml +LineEdit 2.0 LineEdit.qml OriginControl 2.0 OriginControl.qml -CustomComboBoxStyle 2.0 CustomComboBoxStyle.qml -CustomSpinBoxStyle 2.0 CustomSpinBoxStyle.qml -CustomCheckBoxStyle 2.0 CustomCheckBoxStyle.qml -ColorLogic 2.0 ColorLogic.qml +ScrollView 2.0 ScrollView.qml +SecondColumnLayout 2.0 SecondColumnLayout.qml +Section 2.0 Section.qml +SectionLayout 2.0 SectionLayout.qml +SliderSpinBox 2.0 SliderSpinBox.qml +SpinBox 2.0 SpinBox.qml +StandardTextSection 2.0 StandardTextSection.qml +Tab 2.0 Tab.qml +TabView 2.0 TabView.qml ToolTipArea 2.0 ToolTipArea.qml +UrlChooser 2.0 UrlChooser.qml diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template index 3619dd5d4e..5fa8ab63ac 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template @@ -4,4 +4,6 @@ Label { } LineEdit { backendValue: backendValues.%2 + Layout.fillWidth: true + showTranslateCheckBox: false }
\ No newline at end of file diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml index 693d069b40..fa64043c49 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml @@ -75,17 +75,14 @@ Rectangle { placeholderText: qsTr("id") text: backendValues.id.value Layout.fillWidth: true - Layout.maximumWidth: 320 showTranslateCheckBox: false showExtendedFunctionButton: false } - - ExpandingSpacer { - } - + // workaround: without this item the lineedit does not shrink to the + // right size after resizing to a wider width Item { - width: 16 - height: 16 + width: 0 + height: 1 } } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml index 8e86a559bd..59ba8b62db 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml @@ -75,15 +75,14 @@ Rectangle { placeholderText: qsTr("id") text: backendValues.id.value Layout.fillWidth: true - Layout.maximumWidth: 320 + showTranslateCheckBox: false + showExtendedFunctionButton: false } - - ExpandingSpacer { - } - + // workaround: without this item the lineedit does not shrink to the + // right size after resizing to a wider width Item { - width: 16 - height: 16 + width: 0 + height: 1 } } } diff --git a/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml b/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml index c84ebbc4d3..e24d2678ba 100644 --- a/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml @@ -30,7 +30,7 @@ ****************************************************************************/ Custom class wizard example configuration file. --> -<wizard version="1" class="qt4project" firstpage="10" kind="project" id="A.ScriptGeneratedProject" category="B.CustomProjects"> +<wizard version="1" class="qmakeproject" firstpage="10" kind="project" id="A.ScriptGeneratedProject" category="B.CustomProjects"> <description>Creates a simple project using a generator script</description> <displayname>Simple Script-Generated Project</displayname>; <displaycategory>Custom Projects</displaycategory> diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index cc043ece8e..64f52df2ca 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -312,8 +312,8 @@ <translation>éµãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã§ãã¾ã›ã‚“</translation> </message> <message> - <source>Failed to create directory: '%1'.</source> - <translation>ディレクトリ '%1' ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Failed to create directory: "%1".</source> + <translation>ディレクトリã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: "%1"</translation> </message> <message> <source>Cannot Save Private Key File</source> @@ -418,16 +418,16 @@ <translation>無効ãªåŸºåº•ã‚¯ãƒ©ã‚¹å</translation> </message> <message> - <source>Invalid header file name: '%1'</source> - <translation>無効ãªãƒ˜ãƒƒãƒ€ãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«å: '%1'</translation> + <source>Invalid header file name: "%1"</source> + <translation>無効ãªãƒ˜ãƒƒãƒ€ãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«å: "%1"</translation> </message> <message> - <source>Invalid source file name: '%1'</source> - <translation>無効ãªã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«å: '%1'</translation> + <source>Invalid source file name: "%1"</source> + <translation>無効ãªã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«å: "%1"</translation> </message> <message> - <source>Invalid form file name: '%1'</source> - <translation>無効ãªãƒ•ã‚©ãƒ¼ãƒ ファイルå: '%1'</translation> + <source>Invalid form file name: "%1"</source> + <translation>無効ãªãƒ•ã‚©ãƒ¼ãƒ ファイルå: "%1"</translation> </message> </context> <context> @@ -457,6 +457,10 @@ <translation><プãƒã‚¸ã‚§ã‚¯ãƒˆåを入力ã—ã¦ãã ã•ã„></translation> </message> <message> + <source>Location</source> + <translation>パス</translation> + </message> + <message> <source>The project already exists.</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚</translation> </message> @@ -674,10 +678,6 @@ <translation>Android SDK:</translation> </message> <message> - <source>Uses the external Ministro application to download and maintain Qt libraries.</source> - <translation>Qtライブラリã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¨ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã«å¤–部ã®Ministroアプリケーションを使用ã™ã‚‹ã€‚</translation> - </message> - <message> <source>Pushes local Qt libraries to device. You must have Qt libraries compiled for that platform. The APK will not be usable on any other device.</source> <translation>ãƒãƒ¼ã‚«ãƒ«ã®Qtライブラリをデãƒã‚¤ã‚¹ã«è»¢é€ã—ã¾ã™ã€‚ãã®ãƒ—ラットフォーム用ã«ã‚³ãƒ³ãƒ‘イルã—ãŸQtライブラリãŒå¿…è¦ã§ã™ã€‚ @@ -687,6 +687,10 @@ The APK will not be usable on any other device.</source> <source>Add...</source> <translation>è¿½åŠ ...</translation> </message> + <message> + <source>Uses the external Ministro application to download and maintain Qt libraries.<br/><br/>Ministro is a third-party tool which provides the open source Qt libraries on demand. These libraries are compatible with the default open source binary package and will not always be up-to-date.</source> + <translation>Qtライブラリã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¨ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã«å¤–部ã®Ministroアプリケーションを使用ã™ã‚‹ã€‚<br/><br/>Ministro ã¯ã‚ªãƒ¼ãƒ—ンソース版Qtライブラリをオンデマンドã§æä¾›ã™ã‚‹ã‚µãƒ¼ãƒ‰ãƒ‘ーティ製ã®ãƒ„ールã§ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚ªãƒ¼ãƒ—ンソース版ãƒã‚¤ãƒŠãƒªãƒ‘ッケージã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã™ãŒã€å¿…ãšã—も最新版ã¨ã¯é™ã‚Šã¾ã›ã‚“。</translation> + </message> </context> <context> <name>AndroidDeployStepWidget</name> @@ -884,10 +888,6 @@ The APK will not be usable on any other device.</source> <translation>Android SDK パス:</translation> </message> <message> - <source>Browse</source> - <translation>å‚ç…§</translation> - </message> - <message> <source>Android NDK location:</source> <translation>Android NDK パス:</translation> </message> @@ -947,57 +947,40 @@ The APK will not be usable on any other device.</source> <source>Add...</source> <translation>è¿½åŠ ...</translation> </message> -</context> -<context> - <name>BareMetal::BareMetalDeviceConfigurationWidget</name> - <message> - <source>Form</source> - <translation>フォーム</translation> - </message> <message> - <source>GDB host:</source> - <translation>GDBã®ãƒ›ã‚¹ãƒˆ:</translation> - </message> - <message> - <source>GDB port:</source> - <translation>GDPã®ä½¿ç”¨ã™ã‚‹ãƒãƒ¼ãƒˆ:</translation> - </message> - <message> - <source>GDB commands:</source> - <translation>GDBコマンド:</translation> + <source><a href="xx">The GDB in the NDK appears to have broken python support.</a></source> + <translation><a href="xx">NDKã«åŒæ¢±ã•ã‚Œã¦ã„ã‚‹GDBãŒpythonをサãƒãƒ¼ãƒˆã—ã¦ã„ãªã„よã†ã§ã™ã€‚</a></translation> </message> </context> <context> <name>BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage</name> <message> - <source>Form</source> - <translation>フォーム</translation> + <source>Set up GDB Server or Hardware Debugger</source> + <translation>GDB サーãƒãƒ¼ã‚ã‚‹ã„ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‡ãƒãƒƒã‚¬ã®è¨å®š</translation> </message> <message> <source>Name:</source> <translation>åå‰:</translation> </message> <message> - <source>localhost</source> - <translation>localhost</translation> + <source>Init commands:</source> + <translation>åˆæœŸåŒ–コマンド:</translation> </message> <message> - <source>GDB port:</source> - <translation>GDBãƒãƒ¼ãƒˆ:</translation> + <source>Reset commands:</source> + <translation>リセットコマンド:</translation> </message> <message> - <source>GDB host:</source> - <translation>GDBホスト:</translation> + <source>Bare Metal Device</source> + <translation>ベアメタルデãƒã‚¤ã‚¹</translation> </message> <message> - <source>GDB commands:</source> - <translation>GDBコマンド:</translation> + <source>GDB port:</source> + <translation>GDBãƒãƒ¼ãƒˆ:</translation> </message> <message> - <source>load -monitor reset</source> - <translation>load -monitor reset</translation> + <source>GDB host:</source> + <translation>GDBホスト:</translation> </message> </context> <context> @@ -1265,10 +1248,6 @@ Local pulls are not applied to the master branch.</source> <context> <name>ClassView::Internal::NavigationWidget</name> <message> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <source>Show Subprojects</source> <translation>サブプãƒã‚¸ã‚§ã‚¯ãƒˆã‚’表示ã—ã¾ã™</translation> </message> @@ -1604,8 +1583,8 @@ Local pulls are not applied to the master branch.</source> <translation>ã“ã®æ‹¡å¼µåã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãプãƒã‚°ãƒ©ãƒ :</translation> </message> <message> - <source>Open file '%1' with:</source> - <translation>指定ã—ãŸã‚¨ãƒ‡ã‚£ã‚¿ã§ '%1' ã‚’é–‹ã:</translation> + <source>Open file "%1" with:</source> + <translation>指定ã—ãŸã‚¨ãƒ‡ã‚£ã‚¿ã§ "%1" ã‚’é–‹ã:</translation> </message> </context> <context> @@ -1817,6 +1796,10 @@ Do you want to check them out now?</source> <translation><システム言語></translation> </message> <message> + <source>Command used for reverting diff chunks.</source> + <translation>差分ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã™éš›ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚</translation> + </message> + <message> <source>Variables</source> <translation>変数</translation> </message> @@ -1841,6 +1824,10 @@ Do you want to check them out now?</source> <source>Automatically creates temporary copies of modified files. If Qt Creator is restarted after a crash or power failure, it asks whether to recover the auto-saved content.</source> <translation>変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€æ™‚ファイルを自動的ã«ä½œæˆã—ã¾ã™ã€‚Qt Creator ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚„é›»æºæ•…éšœã‹ã‚‰å¾©å¸°ã—ãŸéš›ã«è‡ªå‹•ä¿å˜ã—ãŸå†…容を復元ã™ã‚‹ã‹ã©ã†ã‹ç¢ºèªã—ã¾ã™ã€‚</translation> </message> + <message> + <source>Patch command:</source> + <translation>パッãƒã‚³ãƒžãƒ³ãƒ‰:</translation> + </message> </context> <context> <name>Core::Internal::MimeTypeMagicDialog</name> @@ -1928,10 +1915,6 @@ Do you want to check them out now?</source> <translation>パターン:</translation> </message> <message> - <source>Magic Header</source> - <translation>マジックヘッダー</translation> - </message> - <message> <source>Type</source> <translation>タイプ</translation> </message> @@ -1976,17 +1959,6 @@ Do you want to check them out now?</source> </message> </context> <context> - <name>Core::Internal::VariableChooser</name> - <message> - <source>Variables</source> - <translation>変数</translation> - </message> - <message> - <source>Select a variable to insert.</source> - <translation>挿入ã™ã‚‹å¤‰æ•°ã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> - </message> -</context> -<context> <name>CodePaster::Internal::FileShareProtocolSettingsWidget</name> <message> <source>Form</source> @@ -2066,10 +2038,6 @@ Do you want to check them out now?</source> <translation><説明></translation> </message> <message> - <source>Days</source> - <translation>æ—¥</translation> - </message> - <message> <source>&Expires after:</source> <translation>有効期間(&E):</translation> </message> @@ -2097,6 +2065,10 @@ p, li { white-space: pre-wrap; } <source>Patch 2</source> <translation>Patch 2</translation> </message> + <message> + <source> Days</source> + <translation> æ—¥</translation> + </message> </context> <context> <name>CodePaster::Internal::SettingsPage</name> @@ -2121,8 +2093,8 @@ p, li { white-space: pre-wrap; } <translation>ユーザーå:</translation> </message> <message> - <source>Days</source> - <translation>æ—¥</translation> + <source> Days</source> + <translation> æ—¥</translation> </message> </context> <context> @@ -2235,8 +2207,8 @@ p, li { white-space: pre-wrap; } <translation>宣言ã«å¯¾å¿œã™ã‚‹æœ€åˆã®è¨˜è¿°ã‚’æŒã¤ <i>brief</i> コマンドを生æˆã—ã¾ã™ã€‚</translation> </message> <message> - <source>Adds leading asterisks when continuing Qt '/*!' and Java '/**' style comments on new lines.</source> - <translation>Qt '/*!' ã‚ã‚‹ã„㯠Java '/**' スタイルã®ã‚³ãƒ¡ãƒ³ãƒˆã‚’改行ã§ç¶™ç¶šã™ã‚‹å ´åˆã«ã€è¡Œé ã«ã‚¢ã‚¹ã‚¿ãƒªã‚¹ã‚¯ '*' ã‚’è¿½åŠ ã—ã¾ã™ã€‚</translation> + <source>Adds leading asterisks when continuing C/C++ "/*", Qt "/*!" and Java "/**" style comments on new lines.</source> + <translation>C/C++ "/*" ã‚„ Qt "/*!" ã‚ã‚‹ã„㯠Java "/**" スタイルã®ã‚³ãƒ¡ãƒ³ãƒˆã‚’改行ã§ç¶™ç¶šã™ã‚‹å ´åˆã«ã€è¡Œé ã«ã‚¢ã‚¹ã‚¿ãƒªã‚¹ã‚¯ '*' ã‚’è¿½åŠ ã—ã¾ã™ã€‚</translation> </message> </context> <context> @@ -2682,51 +2654,6 @@ These prefixes are used in addition to current file name on Switch Header/Source </message> </context> <context> - <name>Debugger::Internal::DebuggingHelperOptionPage</name> - <message> - <source>Use Debugging Helper</source> - <translation>デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘を使用ã™ã‚‹</translation> - </message> - <message> - <source><html><head/><body> -<p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html></source> - <translation><html><head/><body> -<p>デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘㯠&quot;ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¨å¼&quot; ビュー内㧠QString ã‚„ std::map ã®ã‚ˆã†ãªç‰¹å®šã®åž‹ã‚’ãã‚Œã„ã«è¡¨ç¤ºã™ã‚‹ç‚ºã«ä½¿ã‚ã‚Œã¾ã™ã€‚Qt Creator ã«ãŠã‘るデãƒãƒƒã‚°ä½œæ¥ã§å¿…ãšå¿…è¦ãªã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</p></body></html></translation> - </message> - <message> - <source>Makes use of Qt Creator's code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source> - <translation>ã“ã®ã‚ªãƒ—ションをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã¨ã€å¤‰æ•°ãŒãƒ‡ãƒãƒƒã‚¬å‰²ã‚Šè¾¼ã¿æ™‚ã«å€¤ãŒä»£å…¥ã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã‚’調査ã™ã‚‹ç‚ºã« Qt Creator ã®ã‚³ãƒ¼ãƒ‰ãƒ¢ãƒ‡ãƒ«ãŒä½¿ç”¨ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚</translation> - </message> - <message> - <source>Use code model</source> - <translation>コードモデルを使用ã™ã‚‹</translation> - </message> - <message> - <source>Displays names of QThread based threads.</source> - <translation>QThread ベースã®ã‚¹ãƒ¬ãƒƒãƒ‰åを表示ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>Display thread names</source> - <translation>スレッドåを表示ã™ã‚‹</translation> - </message> - <message> - <source>Show "std::" namespace for types</source> - <translation>åž‹ã® "std::" åå‰ç©ºé–“を表示</translation> - </message> - <message> - <source>Show Qt's namespace for types</source> - <translation>åž‹æƒ…å ±ã« Qt åå‰ç©ºé–“ã‚’å«ã‚ã‚‹</translation> - </message> - <message> - <source>Shows 'std::' prefix for types from the standard library.</source> - <translation>標準ライブラリ内ã®åž‹ã« 'std::' プレフィックスを表示ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>Shows Qt namespace prefix for Qt types. This is only relevant if Qt was configured with '-qtnamespace'.</source> - <translation>Qt ã®åž‹ã«ã¯ Qt åå‰ç©ºé–“を表示ã—ã¾ã™ã€‚Qt ㌠'-qtnamespace' 付ã㧠configure ã•ã‚Œã¦ã„ã‚‹å ´åˆã®ã¿æœ‰åŠ¹ã§ã™ã€‚</translation> - </message> -</context> -<context> <name>Debugger::Internal::SymbolPathsDialog</name> <message> <source>Dialog</source> @@ -2799,6 +2726,10 @@ These prefixes are used in addition to current file name on Switch Header/Source <translation>クラス</translation> </message> <message> + <source>Class Details</source> + <translation>クラスã®è©³ç´°</translation> + </message> + <message> <source>%1 - Error</source> <translation>%1 - エラー</translation> </message> @@ -2964,14 +2895,6 @@ These prefixes are used in addition to current file name on Switch Header/Source <source>Make</source> <translation>Make</translation> </message> - <message> - <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>ビルドã™ã‚‹ç‚ºã«ã¯ã‚³ãƒ³ãƒ‘イラã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ã‚ットオプションã§ã‚³ãƒ³ãƒ‘イラを構æˆã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> </context> <context> <name>Git::Internal::BranchAddDialog</name> @@ -3102,16 +3025,16 @@ These prefixes are used in addition to current file name on Switch Header/Source <translation>ブランãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <source>Would you like to delete the tag '%1'?</source> - <translation>ã‚¿ã‚° '%1' を削除ã—ã¾ã™ã‹?</translation> + <source>Would you like to delete the tag "%1"?</source> + <translation>ã‚¿ã‚° "%1" を削除ã—ã¾ã™ã‹?</translation> </message> <message> - <source>Would you like to delete the branch '%1'?</source> - <translation>ブランム'%1' を削除ã—ã¾ã™ã‹?</translation> + <source>Would you like to delete the branch "%1"?</source> + <translation>ブランム"%1" を削除ã—ã¾ã™ã‹?</translation> </message> <message> - <source>Would you like to delete the <b>unmerged</b> branch '%1'?</source> - <translation><b>未マージ</b> ブランム'%1' を削除ã—ã¾ã™ã‹?</translation> + <source>Would you like to delete the <b>unmerged</b> branch "%1"?</source> + <translation><b>マージã•ã‚Œã¦ã„ãªã„</b>ブランムâ€%1" を削除ã—ã¾ã™ã‹?</translation> </message> <message> <source>Delete Tag</source> @@ -3130,8 +3053,8 @@ These prefixes are used in addition to current file name on Switch Header/Source <translation>Git リセット</translation> </message> <message> - <source>Hard reset branch '%1' to '%2'?</source> - <translation>ブランム'%1' ã‚’ '%2' ã«ãƒãƒ¼ãƒ‰ãƒªã‚»ãƒƒãƒˆã—ã¾ã™ã‹?</translation> + <source>Hard reset branch "%1" to "%2"?</source> + <translation>ブランム"%1" ã‚’ "%2" ã«ãƒãƒ¼ãƒ‰ãƒªã‚»ãƒƒãƒˆã—ã¾ã™ã‹?</translation> </message> <message> <source>Fast-Forward</source> @@ -3362,8 +3285,8 @@ Partial names can be used if they are unambiguous.</source> <translation>リãƒã‚¸ãƒˆãƒª</translation> </message> <message> - <source>Choose a repository of the project '%1'.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> + <source>Choose a repository of the project "%1".</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> </message> <message> <source>Mainline Repositories</source> @@ -3631,7 +3554,7 @@ You can choose between stashing the changes or discarding them.</source> </message> <message> <source>Discard</source> - <translation>廃棄</translation> + <translation>ç ´æ£„</translation> </message> <message> <source>Restore Stash to Branch</source> @@ -3797,14 +3720,6 @@ Add, modify, and remove document filters, which determine the documentation set <translation>常ã«ä¸¦ã¹ã¦è¡¨ç¤º</translation> </message> <message> - <source>Always Start Full Help</source> - <translation>常ã«ãƒ•ãƒ«ã‚µã‚¤ã‚ºã§è¡¨ç¤º</translation> - </message> - <message> - <source>Always Show Help in External Window</source> - <translation>常ã«å¤–部ウィンドウã«ãƒ˜ãƒ«ãƒ—を表示</translation> - </message> - <message> <source>On help start:</source> <translation>ヘルプを開ã時:</translation> </message> @@ -3880,6 +3795,14 @@ Add, modify, and remove document filters, which determine the documentation set <source>Switches to editor context after last help page is closed.</source> <translation>最後ã®ãƒ˜ãƒ«ãƒ—ページを閉ã˜ãŸå¾Œã€ã‚¨ãƒ‡ã‚£ã‚¿ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚</translation> </message> + <message> + <source>Always Show in Help Mode</source> + <translation>常ã«ãƒ˜ãƒ«ãƒ—モードã§è¡¨ç¤º</translation> + </message> + <message> + <source>Always Show in External Window</source> + <translation>常ã«åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§è¡¨ç¤º</translation> + </message> </context> <context> <name>Help::Internal::RemoteFilterOptions</name> @@ -3953,14 +3876,6 @@ Add, modify, and remove document filters, which determine the documentation set <source>xcodebuild</source> <translation>xcodebuild</translation> </message> - <message> - <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit preferences.</source> - <translation>ビルドã™ã‚‹ç‚ºã«ã¯ã‚³ãƒ³ãƒ‘イラã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ã‚ットオプションã§ã‚³ãƒ³ãƒ‘イラを構æˆã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Configuration is faulty. Check the Issues output pane for details.</source> - <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> </context> <context> <name>IosDeployStepWidget</name> @@ -3984,24 +3899,24 @@ Add, modify, and remove document filters, which determine the documentation set <translation>実行ファイル:</translation> </message> <message> - <source>iPhone 3.5-inch Retina display</source> - <translation>iPhone 3.5インムRetina ディスプレイ</translation> + <source>iPad</source> + <translation>iPad</translation> </message> <message> - <source>iPhone 4-inch Retina display</source> - <translation>iPhone 4インムRetina ディスプレイ</translation> + <source>iPhone 3.5-inch Retina Display</source> + <translation>iPhone 3.5インムRetina ディスプレイ</translation> </message> <message> - <source>iPad</source> - <translation>iPad</translation> + <source>iPhone 4-inch Retina Display</source> + <translation>iPhone 4インムRetina ディスプレイ</translation> </message> <message> - <source>iPad Retina display</source> + <source>iPad Retina Display</source> <translation>iPad Retina ディスプレイ</translation> </message> <message> - <source>Device Type:</source> - <translation>デãƒã‚¤ã‚¹ç¨®é¡ž:</translation> + <source>Device type:</source> + <translation>デãƒã‚¤ã‚¹ã®ç¨®é¡ž:</translation> </message> </context> <context> @@ -4072,13 +3987,13 @@ Add, modify, and remove document filters, which determine the documentation set <translation>ダイアãƒã‚°</translation> </message> <message> - <source>User name:</source> - <translation>ユーザーå:</translation> - </message> - <message> <source>Password:</source> <translation>パスワード:</translation> </message> + <message> + <source>Username:</source> + <translation>ユーザーå:</translation> + </message> </context> <context> <name>Mercurial::Internal::MercurialCommitPanel</name> @@ -4665,10 +4580,6 @@ Add, modify, and remove document filters, which determine the documentation set <translation>nmake ã®ä»£ã‚ã‚Šã« jom を使用ã™ã‚‹</translation> </message> <message> - <source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="http://releases.qt-project.org/jom/">http://releases.qt-project.org/jom/</a>. Disable it if you experience problems with your builds.</source> - <translation><i>jom</i> ã¯ã‚³ãƒ³ãƒ‘イルプãƒã‚»ã‚¹ã‚’複数㮠CPU コアã§å®Ÿè¡Œã™ã‚‹ <i>nmake</i> ã®äº’æ›ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚最新ã®ãƒã‚¤ãƒŠãƒªã¯ <a href="http://releases.qt-project.org/jom/">http://releases.qt-project.org/jom/</a> ã‹ã‚‰å…¥æ‰‹ã§ãã¾ã™ã€‚ビルドã«å•é¡ŒãŒç”Ÿã˜ãŸå ´åˆã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„。</translation> - </message> - <message> <source>Default build directory:</source> <translation>デフォルトビルドディレクトリ:</translation> </message> @@ -4680,6 +4591,10 @@ Add, modify, and remove document filters, which determine the documentation set <source>Asks before terminating the running application in response to clicking the stop button in Application Output.</source> <translation>アプリケーション出力ペインã®åœæ¢ãƒœã‚¿ãƒ³ãŒæŠ¼ã•ã‚ŒãŸéš›ã€å®Ÿè¡Œä¸ã®ã‚¢ãƒ—リケーションを終了ã™ã‚‹ã‹ã‚’確èªã—ã¾ã™ã€‚</translation> </message> + <message> + <source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="http://download.qt-project.org/official_releases/jom/">http://download.qt-project.org/official_releases/jom/</a>. Disable it if you experience problems with your builds.</source> + <translation><i>jom</i> ã¯ã‚³ãƒ³ãƒ‘イルプãƒã‚»ã‚¹ã‚’複数㮠CPU コアã§å®Ÿè¡Œã™ã‚‹ <i>nmake</i> ã®äº’æ›ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚最新版ã®ãƒã‚¤ãƒŠãƒªã¯ <a href="http://download.qt-project.org/official_releases/jom/">http://download.qt-project.org/official_releases/jom/</a> ã‹ã‚‰å…¥æ‰‹ã§ãã¾ã™ã€‚ビルドã«å•é¡ŒãŒç”Ÿã˜ãŸå ´åˆã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„。</translation> + </message> </context> <context> <name>ProjectExplorer::Internal::WizardPage</name> @@ -4743,16 +4658,16 @@ Add, modify, and remove document filters, which determine the documentation set <translation><a href="qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html">セッションã¦ä½•ï¼Ÿ</a></translation> </message> <message> - <source>New session name</source> - <translation>æ–°ã—ã„セッションã®åå‰</translation> + <source>Automatically restores the last session when Qt Creator is started.</source> + <translation>Qt Creator 開始時ã«æœ€å¾Œã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’自動的ã«å¾©å…ƒã—ã¾ã™ã€‚</translation> </message> <message> - <source>Rename session</source> - <translation>セッションåã®å¤‰æ›´</translation> + <source>New Session Name</source> + <translation>æ–°ã—ã„セッションå</translation> </message> <message> - <source>Automatically restores the last session when Qt Creator is started.</source> - <translation>Qt Creator 開始時ã«æœ€å¾Œã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’自動的ã«å¾©å…ƒã—ã¾ã™ã€‚</translation> + <source>Rename Session</source> + <translation>セッションåã®å¤‰æ›´</translation> </message> </context> <context> @@ -5052,6 +4967,10 @@ Add, modify, and remove document filters, which determine the documentation set <source>icons.qrc</source> <translation>icons.qrc</translation> </message> + <message> + <source>Plugin Details</source> + <translation>プラグインã®è©³ç´°</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name> @@ -5075,6 +4994,10 @@ Add, modify, and remove document filters, which determine the documentation set <source>...</source> <translation>...</translation> </message> + <message> + <source>Custom Widgets</source> + <translation>カスタムウィジェット</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::LibraryDetailsWidget</name> @@ -5243,49 +5166,6 @@ Add, modify, and remove document filters, which determine the documentation set </message> </context> <context> - <name>QmakeProjectManager::Internal::Html5AppWizardSourcesPage</name> - <message> - <source>WizardPage</source> - <translation>ウィザードページ</translation> - </message> - <message> - <source>Main HTML File</source> - <translation>メイン HTML ファイル</translation> - </message> - <message> - <source>Generate an index.html file</source> - <translation>index.html ファイルを生æˆã™ã‚‹</translation> - </message> - <message> - <source>Import an existing .html file</source> - <translation>æ—¢å˜ã® html ファイルをインãƒãƒ¼ãƒˆã™ã‚‹</translation> - </message> - <message> - <source>Load a URL</source> - <translation>URL ã‚’èªã¿è¾¼ã‚€</translation> - </message> - <message> - <source>http://</source> - <translation>http://</translation> - </message> - <message> - <source>Note: Unless you chose to load a URL, all files and directories that reside in the same directory as the main HTML file are deployed. You can modify the contents of the directory any time before deploying.</source> - <translation>注: URL ã®èªã¿è¾¼ã¿ã‚’é¸æŠžã—ãªã„å ´åˆã€main HTML ファイルã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒãƒ‡ãƒ—ãƒã‚¤ã•ã‚Œã¾ã™ã€‚ディレクトリã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ãƒ‡ãƒ—ãƒã‚¤å‰ã®ã„ã¤ã§ã‚‚編集ã§ãã¾ã™ã€‚</translation> - </message> - <message> - <source>Touch optimized navigation</source> - <translation>タッãƒã«æœ€é©åŒ–ã•ã‚ŒãŸãƒŠãƒ“ゲーション</translation> - </message> - <message> - <source>Enable touch optimized navigation</source> - <translation>タッãƒã«æœ€é©åŒ–ã•ã‚ŒãŸãƒŠãƒ“ゲーションを有効ã«ã™ã‚‹</translation> - </message> - <message> - <source>Touch optimized navigation will make the HTML page flickable and enlarge the area of touch sensitive elements. If you use a JavaScript framework which optimizes the touch interaction, leave the checkbox unchecked.</source> - <translation>タッãƒã«æœ€é©åŒ–ã•ã‚ŒãŸãƒŠãƒ“ゲーションã§ã¯ HTML ページをフリッカブルã«å¯¾å¿œã•ã›ã‹ã¤ã‚¿ãƒƒãƒã«åå¿œã™ã‚‹é ˜åŸŸã‚’広ãã—ã¾ã™ã€‚タッãƒæ“作ã«æœ€é©åŒ–ã•ã‚ŒãŸ JavaScript フレームワークを使用ã™ã‚‹å ´åˆã¯ãƒã‚§ãƒƒã‚¯ã‚’外ã—ã¦ãã ã•ã„。</translation> - </message> -</context> -<context> <name>QmakeProjectManager::Internal::TestWizardPage</name> <message> <source>WizardPage</source> @@ -5335,6 +5215,10 @@ Add, modify, and remove document filters, which determine the documentation set <source>Test Class Information</source> <translation>ãƒ†ã‚¹ãƒˆã‚¯ãƒ©ã‚¹æƒ…å ±</translation> </message> + <message> + <source>Details</source> + <translation>詳細</translation> + </message> </context> <context> <name>QmlDesigner::AddTabToTabViewDialog</name> @@ -5479,14 +5363,6 @@ Add, modify, and remove document filters, which determine the documentation set <translation>コンボボックス</translation> </message> <message> - <source>Tool tip</source> - <translation>ツールãƒãƒƒãƒ—</translation> - </message> - <message> - <source>The tool tip shown for the combobox.</source> - <translation>コンボボックスã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒ„ールãƒãƒƒãƒ—。</translation> - </message> - <message> <source>Focus on press</source> <translation>押下時ã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’å¾—ã‚‹</translation> </message> @@ -5628,14 +5504,6 @@ Add, modify, and remove document filters, which determine the documentation set <translation>テã‚ストフィールドãŒèªè¾¼å°‚用ã‹ã©ã†ã‹ã‚’指定ã™ã‚‹ã€‚</translation> </message> <message> - <source>Password mode</source> - <translation>パスワードモード</translation> - </message> - <message> - <source>Determines whether the text field is in password mode.</source> - <translation>テã‚ストフィールドãŒãƒ‘スワードモードã‹ã©ã†ã‹ã‚’指定ã™ã‚‹ã€‚</translation> - </message> - <message> <source>Input mask</source> <translation>入力マスク</translation> </message> @@ -5775,6 +5643,14 @@ Add, modify, and remove document filters, which determine the documentation set <source>Also warns in the code editor about QML features which are not properly supported by the Qt Quick Designer.</source> <translation>Qt Quick Designer ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ QML ã®æ©Ÿèƒ½ã«ã¤ã„ã¦ã‚³ãƒ¼ãƒ‰ã‚¨ãƒ‡ã‚£ã‚¿å†…ã§ã‚‚è¦å‘Šã™ã‚‹ã€‚</translation> </message> + <message> + <source>Subcomponents</source> + <translation>サブコンãƒãƒ¼ãƒãƒ³ãƒˆ</translation> + </message> + <message> + <source>Always save when leaving subcomponent in bread crumb</source> + <translation>パンããšãƒªã‚¹ãƒˆã§ã‚µãƒ–コンãƒãƒ¼ãƒãƒ³ãƒˆã‚’抜ã‘ã‚‹ã¨ãã¯å¸¸ã«ä¿å˜ã™ã‚‹</translation> + </message> </context> <context> <name>QmlJSEditor::Internal::ComponentNameDialog</name> @@ -5989,8 +5865,8 @@ Add, modify, and remove document filters, which determine the documentation set <translation>スプラッシュスクリーンã®é¸æŠž</translation> </message> <message> - <source><font color="red">Could not open '%1' for reading.</font></source> - <translation><font color="red">'%1' ã‚’èªã¿è¾¼ã¿ç”¨ã«é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</font></translation> + <source><font color="red">Could not open "%1" for reading.</font></source> + <translation><font color="red">"%1" ã‚’èªã¿è¾¼ã¿ç”¨ã«é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</font></translation> </message> <message> <source><font color="red">The selected image is too big (%1x%2). The maximum size is %3x%4 pixels.</font></source> @@ -6132,8 +6008,8 @@ Add, modify, and remove document filters, which determine the documentation set <translation>上書ãã—ã¾ã™ã‹?</translation> </message> <message> - <source>The file '%1' will be overwritten. Do you want to proceed?</source> - <translation>ファイル '%1' ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚処ç†ã‚’継続ã—ã¾ã™ã‹?</translation> + <source>The file "%1" will be overwritten. Do you want to proceed?</source> + <translation>ファイル "%1" ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚処ç†ã‚’継続ã—ã¾ã™ã‹?</translation> </message> <message> <source>The blackberry-keytool process is already running.</source> @@ -6274,8 +6150,8 @@ Add, modify, and remove document filters, which determine the documentation set <translation>上書ãã—ã¾ã™ã‹?</translation> </message> <message> - <source>The file '%1' will be overwritten. Do you want to proceed?</source> - <translation>ファイル '%1' ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚処ç†ã‚’継続ã—ã¾ã™ã‹?</translation> + <source>The file "%1" will be overwritten. Do you want to proceed?</source> + <translation>ファイル "%1" ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚処ç†ã‚’継続ã—ã¾ã™ã‹?</translation> </message> <message> <source>Failed to request debug token:</source> @@ -7061,6 +6937,10 @@ Add, modify, and remove document filters, which determine the documentation set <source>Project path:</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒ‘ス:</translation> </message> + <message> + <source>Momentics</source> + <translation>Momentics</translation> + </message> </context> <context> <name>Qnx::Internal::QnxBaseQtConfigWidget</name> @@ -7134,7 +7014,7 @@ Add, modify, and remove document filters, which determine the documentation set <translation>削除</translation> </message> <message> - <source>Clean up</source> + <source>Clean Up</source> <translation>クリーンアップ</translation> </message> </context> @@ -7251,10 +7131,6 @@ Add, modify, and remove document filters, which determine the documentation set <translation>デãƒã‚¤ã‚¹ã®ãƒ›ã‚¹ãƒˆåã‹IPアドレス:</translation> </message> <message> - <source>The user name to log into the device:</source> - <translation>デãƒã‚¤ã‚¹ã«ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ç‚ºã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å:</translation> - </message> - <message> <source>The authentication type:</source> <translation>èªè¨¼æ–¹æ³•:</translation> </message> @@ -7274,6 +7150,10 @@ Add, modify, and remove document filters, which determine the documentation set <source>The file containing the user's private key:</source> <translation>ユーザーã®ç§˜å¯†éµã‚’å«ã‚“ã ファイル:</translation> </message> + <message> + <source>The username to log into the device:</source> + <translation>デãƒã‚¤ã‚¹ã«ãƒã‚°ã‚¤ãƒ³ã™ã‚‹éš›ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å:</translation> + </message> </context> <context> <name>RemoteLinuxCheckForFreeDiskSpaceStepWidget</name> @@ -7291,17 +7171,6 @@ Add, modify, and remove document filters, which determine the documentation set </message> </context> <context> - <name>RemoteLinux::Internal::RemoteLinuxDeployConfigurationWidget</name> - <message> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <source>Files to deploy:</source> - <translation>デプãƒã‚¤ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«:</translation> - </message> -</context> -<context> <name>QrcEditor</name> <message> <source>Add</source> @@ -8324,10 +8193,6 @@ With cache simulation, further event counters are enabled: <translation>ユーザーフィールドã®æ§‹æˆãƒ•ã‚¡ã‚¤ãƒ«(&F):</translation> </message> <message> - <source>&Patch command:</source> - <translation>パッãƒã‚³ãƒžãƒ³ãƒ‰(&P):</translation> - </message> - <message> <source>Specifies a command that is executed to graphically prompt for a password, should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS).</source> <translation>GUI ã§ãƒ‘スワードを確èªã‚’è¡Œã†ã‚³ãƒžãƒ³ãƒ‰ã‚’指定ã—ã¾ã™ã€‚ @@ -8338,7 +8203,7 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <translation>SSH プãƒãƒ³ãƒ—トコマンド(&S):</translation> </message> <message> - <source>A file listing user names and email addresses in a 4-column mailmap format: + <source>A file listing nicknames in a 4-column mailmap format: 'name <email> alias <email>'.</source> <translation>4列㮠mailmap フォーマットã§ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¨ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’記述ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«: 'name <email> alias <email>'</translation> @@ -8355,16 +8220,16 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <translation>åå‰</translation> </message> <message> - <source>E-mail</source> - <translation>E-mail</translation> + <source>Email</source> + <translation>Email</translation> </message> <message> - <source>Alias</source> - <translation>エイリアス</translation> + <source>Alias email</source> + <translation>エイリアスã®Email</translation> </message> <message> - <source>Alias e-mail</source> - <translation>エイリアスã®E-mail</translation> + <source>Alias</source> + <translation>エイリアス</translation> </message> </context> <context> @@ -8381,10 +8246,6 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <source>F&iles</source> <translation>ファイル(&I)</translation> </message> - <message> - <source>Check a&ll</source> - <translation>ã™ã¹ã¦ã‚’ãƒã‚§ãƒƒã‚¯(&L)</translation> - </message> <message numerus="yes"> <source>%1 %2/%n File(s)</source> <translation> @@ -8396,14 +8257,18 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <translation>コミット(&C)</translation> </message> <message> - <source>Check All</source> + <source>Select All</source> <extracomment>Check all for submit</extracomment> - <translation>ã™ã¹ã¦ã‚’ãƒã‚§ãƒƒã‚¯</translation> + <translation>ã™ã¹ã¦ã‚’é¸æŠž</translation> </message> <message> - <source>Uncheck All</source> + <source>Unselect All</source> <extracomment>Uncheck all for submit</extracomment> - <translation>ã™ã¹ã¦ã®ãƒã‚§ãƒƒã‚¯ã‚’外ã™</translation> + <translation>ã™ã¹ã¦ã‚’é¸æŠžè§£é™¤</translation> + </message> + <message> + <source>Select a&ll</source> + <translation>ã™ã¹ã¦ã‚’é¸æŠž(&L)</translation> </message> </context> <context> @@ -8914,10 +8779,6 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <translation>フリック減速</translation> </message> <message> - <source>Follows current</source> - <translation>カレントã«è¿½å¾“</translation> - </message> - <message> <source>A user cannot drag or flick a PathView that is not interactive.</source> <translation>インタラクティブã§ãªã„ PathView をユーザーãŒãƒ‰ãƒ©ãƒƒã‚°ã—ãŸã‚Šãƒ•ãƒªãƒƒã‚¯ã—ãŸã‚Šã™ã‚‹äº‹ã¯ã§ãã¾ã›ã‚“。</translation> </message> @@ -8958,20 +8819,16 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <translation>推奨開始ä½ç½®</translation> </message> <message> - <source>Preferred highlight begin - must be smaller than Preferred end.</source> - <translation>推奨開始ä½ç½® - 推奨終了ä½ç½®ã‚ˆã‚Šã‚‚å°ã•ããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Preferred end</source> - <translation>推奨終了ä½ç½®</translation> + <source>Preferred highlight begin - must be smaller than Preferred end. Note that the user has to add a highlight component.</source> + <translation>ãƒã‚¤ãƒ©ã‚¤ãƒˆã®æŽ¨å¥¨é–‹å§‹ä½ç½® - 推奨終了ä½ç½®ã‚ˆã‚Šã‚‚å°ã•ããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。highlight コンãƒãƒ¼ãƒãƒ³ãƒˆãŒå¿…è¦ãªã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Preferred highlight end - must be larger than Preferred begin.</source> - <translation>推奨終了ä½ç½® - 推奨開始ä½ç½®ã‚ˆã‚Šã‚‚大ãããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。</translation> + <source>Preferred highlight end - must be larger than Preferred begin. Note that the user has to add a highlight component.</source> + <translation>ãƒã‚¤ãƒ©ã‚¤ãƒˆã®æŽ¨å¥¨çµ‚了ä½ç½® - 推奨開始ä½ç½®ã‚ˆã‚Šã‚‚大ãããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。highlight コンãƒãƒ¼ãƒãƒ³ãƒˆãŒå¿…è¦ãªã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Determines whether the highlight is managed by the view.</source> - <translation>ãƒã‚¤ãƒ©ã‚¤ãƒˆãŒãƒ“ューã«ã‚ˆã£ã¦ç®¡ç†ã•ã‚Œã‚‹ã‹ã©ã†ã‹ã‚’指定ã—ã¾ã™ã€‚</translation> + <source>Preferred end</source> + <translation>推奨終了ä½ç½®</translation> </message> <message> <source>Interactive</source> @@ -9019,10 +8876,6 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <context> <name>TextEditSpecifics</name> <message> - <source>Format</source> - <translation>フォーマット</translation> - </message> - <message> <source>Text Color</source> <translation>テã‚ストã®è‰²</translation> </message> @@ -9030,10 +8883,6 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <source>Selection Color</source> <translation>é¸æŠžæ™‚ã®è‰²</translation> </message> - <message> - <source>Text Input</source> - <translation>テã‚スト入力</translation> - </message> </context> <context> <name>FlickableSection</name> @@ -9111,6 +8960,10 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <source>Alignment</source> <translation>整列</translation> </message> + <message> + <source>Format</source> + <translation>フォーマット</translation> + </message> </context> <context> <name>AdvancedSection</name> @@ -9233,14 +9086,6 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <source>Anchors</source> <translation>アンカー</translation> </message> - <message> - <source>Target</source> - <translation type="obsolete">ターゲット</translation> - </message> - <message> - <source>Margin</source> - <translation type="obsolete">マージン</translation> - </message> </context> <context> <name>QtObjectPane</name> @@ -9496,12 +9341,12 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <context> <name>PluginManager</name> <message> - <source>The plugin '%1' is specified twice for testing.</source> - <translation>プラグイン '%1' ã¯ãƒ†ã‚¹ãƒˆç”¨ã«2回指定ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> + <source>The plugin "%1" is specified twice for testing.</source> + <translation>プラグイン "%1" ã¯ãƒ†ã‚¹ãƒˆç”¨ã«2回指定ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>The plugin '%1' does not exist.</source> - <translation>プラグイン '%1' ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> + <source>The plugin "%1" does not exist.</source> + <translation>プラグイン "%1" ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> </message> <message> <source>Unknown option %1</source> @@ -9526,6 +9371,10 @@ SSH èªè¨¼ãŒå¿…è¦ã¨ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã•ã‚Œã¾ã™(SSH ã® SSH_ <source>All</source> <translation>ã™ã¹ã¦</translation> </message> + <message> + <source>%1 (current: "%2")</source> + <translation>%1 (ç¾åœ¨: "%2")</translation> + </message> </context> <context> <name>ExtensionSystem::PluginErrorOverview</name> @@ -9636,28 +9485,28 @@ Reason: %3</source> <context> <name>PluginSpec</name> <message> - <source>'%1' misses attribute '%2'</source> - <translation>è¦ç´ '%1' ã®å±žæ€§ '%2' ãŒè¶³ã‚Šã¾ã›ã‚“</translation> + <source>Unexpected token</source> + <translation>予期ã›ã¬ãƒˆãƒ¼ã‚¯ãƒ³ã§ã™</translation> </message> <message> - <source>'%1' has invalid format</source> - <translation>'%1' ã«ç„¡åŠ¹ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆãŒã‚ã‚Šã¾ã™</translation> + <source>"%1" misses attribute "%2"</source> + <translation>è¦ç´ "%1" ã«å±žæ€§ "%2" ãŒæ¬ ã‘ã¦ã„ã¾ã™</translation> </message> <message> - <source>Invalid element '%1'</source> - <translation>'%1' ã¯ç„¡åŠ¹ãªè¦ç´ ã§ã™</translation> + <source>"%1" has invalid format</source> + <translation>"%1" ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆãŒç„¡åŠ¹ã§ã™</translation> </message> <message> - <source>Unexpected closing element '%1'</source> - <translation>è¦ç´ '%1' ã®ã‚¿ã‚°ãŒäºˆæœŸã›ã¬ä½ç½®ã§é–‰ã˜ã‚‰ã‚Œã¦ã„ã¾ã™</translation> + <source>Invalid element "%1"</source> + <translation>"%1" ã¯ç„¡åŠ¹ãªè¦ç´ ã§ã™</translation> </message> <message> - <source>Unexpected token</source> - <translation>予期ã›ã¬ãƒˆãƒ¼ã‚¯ãƒ³ã§ã™</translation> + <source>Unexpected closing element "%1"</source> + <translation>予期ã›ã¬çµ‚了タグ "%1" ã§ã™</translation> </message> <message> - <source>Expected element '%1' as top level element</source> - <translation>è¦ç´ '%1' ã¯ã€æœ€ä¸Šä½ã®è¦ç´ ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“</translation> + <source>Expected element "%1" as top level element</source> + <translation>最上ä½ã®è¦ç´ 㯠"%1" ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™</translation> </message> <message> <source>Resolving dependencies failed because state != Read</source> @@ -9726,6 +9575,18 @@ Reason: %3</source> <source>Utilities</source> <translation>ユーティリティ</translation> </message> + <message> + <source>Plugin is not available on this platform.</source> + <translation>ã“ã®ãƒ—ラットフォームã§ã¯ãƒ—ラグインã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Plugin is required.</source> + <translation>プラグインãŒå¿…è¦ã§ã™ã€‚</translation> + </message> + <message> + <source>Load on startup</source> + <translation>起動時ã«èªã¿è¾¼ã‚€</translation> + </message> </context> <context> <name>PluginDialog</name> @@ -9921,12 +9782,12 @@ Reason: %3</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 1.1 対応部ã®ã¿èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> </message> <message> - <source>Expected only Property, Method, Signal and Enum object definitions, not '%1'.</source> - <translation>'%1' ã§ã¯ãªãã€Property, Method, Signal, Enum オブジェクトã®å®šç¾©ã«ã®ã¿å¯¾å¿œã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Expected only Property, Method, Signal and Enum object definitions, not "%1".</source> + <translation>"%1" ã§ã¯ãªãã€Property, Method, Signal, Enum オブジェクトã®å®šç¾©ã«ã®ã¿å¯¾å¿œã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Expected only name, prototype, defaultProperty, attachedType, exports isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not '%1'.</source> - <translation>'%1' ã§ã¯ãªãã€åå‰ã€ãƒ—ãƒãƒˆã‚¿ã‚¤ãƒ—ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ—ãƒãƒ‘ティã€ã‚¢ã‚¿ãƒƒãƒã‚¿ã‚¤ãƒ—ã€isSingle, isCreatable, isComposite ãªã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã€exportMetaObjectRevisions ãªã‚¹ã‚¯ãƒªãƒ—トãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã«ã®ã¿å¯¾å¿œã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Expected only name, prototype, defaultProperty, attachedType, exports isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not "%1".</source> + <translation>"%1" ã§ã¯ãªãã€åå‰ã€ãƒ—ãƒãƒˆã‚¿ã‚¤ãƒ—ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ—ãƒãƒ‘ティã€ã‚¢ã‚¿ãƒƒãƒã‚¿ã‚¤ãƒ—ã€isSingle, isCreatable, isComposite ãªã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã€exportMetaObjectRevisions ãªã‚¹ã‚¯ãƒªãƒ—トãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã«ã®ã¿å¯¾å¿œã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> <source>Expected only script bindings and object definitions.</source> @@ -10115,10 +9976,6 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <context> <name>QmlJS::StaticAnalysisMessages</name> <message> - <source>Do not use '%1' as a constructor.</source> - <translation>'%1' ã¯ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿ã¨ã—ã¦ä½¿ç”¨ã§ãã¾ã›ã‚“。</translation> - </message> - <message> <source>Invalid value for enum.</source> <translation>無効ãªå€¤ã® enum ã§ã™ã€‚</translation> </message> @@ -10171,18 +10028,6 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <translation>é‡è¤‡ã—㟠id ã§ã™ã€‚</translation> </message> <message> - <source>Invalid property name '%1'.</source> - <translation>無効ãªãƒ—ãƒãƒ‘ティå '%1' ã§ã™ã€‚</translation> - </message> - <message> - <source>'%1' does not have members.</source> - <translation>'%1' ã¯ãƒ¡ãƒ³ãƒã‚’æŒã£ã¦ã„ã¾ã›ã‚“。</translation> - </message> - <message> - <source>'%1' is not a member of '%2'.</source> - <translation>'%1' 㯠'%2' ã®ãƒ¡ãƒ³ãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> <source>Assignment in condition.</source> <translation>æ¡ä»¶å¼å†…ã§ä»£å…¥ã—ã¦ã„ã¾ã™ã€‚</translation> </message> @@ -10207,34 +10052,10 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <translation>コンマ演算åを用ã„ãŸå¼ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>'%1' already is a formal parameter.</source> - <translation>'%1' ã¯æ—¢ã«ä»®ãƒ‘ラメータã«ã‚ã‚Šã¾ã™ã€‚</translation> - </message> - <message> <source>Unnecessary message suppression.</source> <translation>ä¸è¦ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸æŠ‘制ã§ã™ã€‚</translation> </message> <message> - <source>'%1' already is a function.</source> - <translation>'%1' ã¯æ—¢ã«é–¢æ•°ã§ã™ã€‚</translation> - </message> - <message> - <source>var '%1' is used before its declaration.</source> - <translation>変数 '%1' ã¯ãã®å®£è¨€ã®å‰ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>'%1' already is a var.</source> - <translation>'%1' ã¯æ—¢ã«å¤‰æ•°ã§ã™ã€‚</translation> - </message> - <message> - <source>'%1' is declared more than once.</source> - <translation>'%1' ã¯äºŒå›žä»¥ä¸Šå®£è¨€ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>Function '%1' is used before its declaration.</source> - <translation>関数 '%1' ã¯ãã®å®£è¨€ã®å‰ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> <source>The 'function' keyword and the opening parenthesis should be separated by a single space.</source> <translation>'function' ã‚ーワードã¨é–‹ã括弧ã®é–“ã¯ã‚¹ãƒšãƒ¼ã‚¹ã§åˆ†å‰²ã•ã‚Œã‚‹ã¹ãã§ã™ã€‚</translation> </message> @@ -10283,22 +10104,6 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <translation>未知ã®ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã§ã™ã€‚</translation> </message> <message> - <source>Could not resolve the prototype '%1' of '%2'.</source> - <translation>'%2' ã®ãƒ—ãƒãƒˆã‚¿ã‚¤ãƒ— '%1' を解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not resolve the prototype '%1'.</source> - <translation>プãƒãƒˆã‚¿ã‚¤ãƒ— '%1' を解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Prototype cycle, the last non-repeated component is '%1'.</source> - <translation>プãƒãƒˆã‚¿ã‚¤ãƒ—サイクルã®æœ€å¾Œã®ç¹°ã‚Šè¿”ã•ã‚Œã¦ã„ãªã„コンãƒãƒ¼ãƒãƒ³ãƒˆã¯'%1'ã§ã™ã€‚</translation> - </message> - <message> - <source>Invalid property type '%1'.</source> - <translation>無効ãªãƒ—ãƒãƒ‘ティã®åž‹ '%1' ã§ã™ã€‚</translation> - </message> - <message> <source>== and != perform type coercion, use === or !== to avoid it.</source> <translation>== ã‚„ != ã¯å¼·åˆ¶çš„ãªåž‹å¤‰æ›ã‚’ä¼´ã„ã¾ã™ã€‚ãれをé¿ã‘ã‚‹ã«ã¯ === ã‚„ !== を使用ã—ã¦ãã ã•ã„。</translation> </message> @@ -10323,7 +10128,63 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <translation>パフォーマンスã®æ”¹å–„ã«ã¯ 'var' ã‚„ 'variant' ã§ã¯ãªã %1 を使用ã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Missing property '%1'.</source> + <source>Do not use "%1" as a constructor.</source> + <translation>"%1" ã¯ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿ã¨ã—ã¦ä½¿ç”¨ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Invalid property name "%1".</source> + <translation>無効ãªãƒ—ãƒãƒ‘ティå "%1" ã§ã™ã€‚</translation> + </message> + <message> + <source>"%1" does not have members.</source> + <translation>"%1" ã¯ãƒ¡ãƒ³ãƒã‚’æŒã£ã¦ã„ã¾ã›ã‚“。</translation> + </message> + <message> + <source>"%1" is not a member of "%2".</source> + <translation>"%1" 㯠"%2" ã®ãƒ¡ãƒ³ãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>"%1" already is a formal parameter.</source> + <translation>"%1" ã¯æ—¢ã«ä»®ãƒ‘ラメータã«ã‚ã‚Šã¾ã™ã€‚</translation> + </message> + <message> + <source>"%1" already is a function.</source> + <translation>"%1" ã¯æ—¢ã«é–¢æ•°ã§ã™ã€‚</translation> + </message> + <message> + <source>var "%1" is used before its declaration.</source> + <translation>変数 "%1" ã¯ãã®å®£è¨€ã®å‰ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>"%1" already is a var.</source> + <translation>"%1" ã¯æ—¢ã«å¤‰æ•°ã§ã™ã€‚</translation> + </message> + <message> + <source>"%1" is declared more than once.</source> + <translation>"%1" ã¯äºŒå›žä»¥ä¸Šå®£è¨€ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>Function "%1" is used before its declaration.</source> + <translation>関数 "%1" ã¯ãã®å®£è¨€ã®å‰ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>Could not resolve the prototype "%1" of "%2".</source> + <translation>"%2" ã®ãƒ—ãƒãƒˆã‚¿ã‚¤ãƒ— "%1" を解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>Could not resolve the prototype "%1".</source> + <translation>プãƒãƒˆã‚¿ã‚¤ãƒ— "%1" を解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>Prototype cycle, the last non-repeated component is "%1".</source> + <translation>プãƒãƒˆã‚¿ã‚¤ãƒ—サイクルã®æœ€å¾Œã®ç¹°ã‚Šè¿”ã•ã‚Œã¦ã„ãªã„コンãƒãƒ¼ãƒãƒ³ãƒˆã¯ "%1" ã§ã™ã€‚</translation> + </message> + <message> + <source>Invalid property type "%1".</source> + <translation>無効ãªãƒ—ãƒãƒ‘ティã®åž‹ "%1" ã§ã™ã€‚</translation> + </message> + <message> + <source>Missing property "%1".</source> <translation>プãƒãƒ‘ティ '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> @@ -10422,20 +10283,20 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <translation>ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã§ã™ã€‚</translation> </message> <message> - <source>Created remote directory '%1'.</source> - <translation>リモートディレクトリ '%1' を作æˆã—ã¾ã—ãŸã€‚</translation> + <source>Created remote directory "%1".</source> + <translation>リモートディレクトリ "%1" を作æˆã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Remote directory '%1' already exists.</source> - <translation>リモートディレクトリ '%1' ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Remote directory "%1" already exists.</source> + <translation>リモートディレクトリ "%1" ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Error creating directory '%1': %2</source> - <translation>ディレクトリ '%1' 作æˆä¸ã«ã‚¨ãƒ©ãƒ¼ :%2</translation> + <source>Error creating directory "%1": %2</source> + <translation>ディレクトリ "%1" 作æˆä¸ã®ã‚¨ãƒ©ãƒ¼ :%2</translation> </message> <message> - <source>Could not open local file '%1': %2</source> - <translation>ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> + <source>Could not open local file "%1": %2</source> + <translation>ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ« "%1" ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> </message> <message> <source>Remote directory could not be opened for reading.</source> @@ -10501,12 +10362,12 @@ qmlproject プãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ã€ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãƒ‘ス㫠importPaths <translation>ファイルå</translation> </message> <message> - <source>Error getting 'stat' info about '%1': %2</source> - <translation>'%1' ã® 'stat' æƒ…å ±å–得時ã®ã‚¨ãƒ©ãƒ¼: %2</translation> + <source>Error getting "stat" info about "%1": %2</source> + <translation>"%1" ã® "stat" æƒ…å ±å–得時ã®ã‚¨ãƒ©ãƒ¼: %2</translation> </message> <message> - <source>Error listing contents of directory '%1': %2</source> - <translation>ディレクトリ '%1' ã®å†…容å–å¾—ä¸ã«ã‚¨ãƒ©ãƒ¼ :%2</translation> + <source>Error listing contents of directory "%1": %2</source> + <translation>ディレクトリ "%1" ã®å†…容å–å¾—ä¸ã®ã‚¨ãƒ©ãƒ¼ :%2</translation> </message> </context> <context> @@ -10546,12 +10407,12 @@ Server list was %2.</source> <translation>サーãƒãƒ¼è˜åˆ¥æ–‡å—列ãŒã€ä¸æ£ãª NUL æ–‡å—ã‚’å«ã‚“ã§ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Server Identification string '%1' is invalid.</source> - <translation>サーãƒãƒ¼è˜åˆ¥æ–‡å—列 '%1' ã¯ã€ç„¡åŠ¹ã§ã™ã€‚</translation> + <source>Server Identification string "%1" is invalid.</source> + <translation>無効ãªã‚µãƒ¼ãƒãƒ¼è˜åˆ¥æ–‡å—列 "%1" ã§ã™ã€‚</translation> </message> <message> - <source>Server protocol version is '%1', but needs to be 2.0 or 1.99.</source> - <translation>サーãƒãƒ¼ãƒ—ãƒãƒˆã‚³ãƒ«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ '%1' ã§ã™ãŒã€2.0ã‹1.99ãŒå¿…è¦ã§ã™ã€‚</translation> + <source>Server protocol version is "%1", but needs to be 2.0 or 1.99.</source> + <translation>サーãƒãƒ¼ãƒ—ãƒãƒˆã‚³ãƒ«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ "%1" ã§ã™ãŒã€2.0ã‹1.99ãŒå¿…è¦ã§ã™ã€‚</translation> </message> <message> <source>Server identification string is invalid (missing carriage return).</source> @@ -10644,15 +10505,8 @@ with a password, which you can enter below.</source> <translation>プãƒã‚»ã‚¹ã¯ã‚·ã‚°ãƒŠãƒ«ã§ kill ã•ã‚Œã¾ã—ãŸ</translation> </message> <message> - <source>Server sent invalid signal '%1'</source> - <translation>サーãƒãƒ¼ãŒç„¡åŠ¹ãªã‚·ã‚°ãƒŠãƒ« '%1' ã‚’é€ä¿¡ã—ã¦ãã¾ã—ãŸ</translation> - </message> -</context> -<context> - <name>Utils::BaseTreeView</name> - <message> - <source>Adjust Column Widths to Contents</source> - <translation>内容ã«åˆã‚ã›ã¦åˆ—幅を調整</translation> + <source>Server sent invalid signal "%1"</source> + <translation>サーãƒãƒ¼ãŒç„¡åŠ¹ãªã‚·ã‚°ãƒŠãƒ« "%1" ã‚’é€ä¿¡ã—ã¾ã—ãŸ</translation> </message> </context> <context> @@ -10697,13 +10551,13 @@ with a password, which you can enter below.</source> %2</translation> </message> <message> - <source>Error running '%1' in %2: %3</source> - <translation>%2 ã§å®Ÿè¡Œä¸ã® '%1' ã§ã‚¨ãƒ©ãƒ¼: %3</translation> + <source>Error running "%1" in %2: %3</source> + <translation>%2 㧠"%1" 実行ä¸ã®ã‚¨ãƒ©ãƒ¼: %3</translation> </message> <message> - <source>Building helper '%1' in %2 + <source>Building helper "%1" in %2 </source> - <translation>%2 ã«ã‚るヘルパ '%1' ã‚’ãƒ“ãƒ«ãƒ‰ä¸ + <translation>%2 ã§ãƒ˜ãƒ«ãƒ‘ "%1" ã‚’ãƒ“ãƒ«ãƒ‰ä¸ </translation> </message> <message> @@ -10770,20 +10624,20 @@ with a password, which you can enter below.</source> <translation>一時ファイルを作æˆã§ãã¾ã›ã‚“。ディスクãŒä¸€æ¯ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã‹ï¼Ÿ</translation> </message> <message> - <source>Cannot create temporary directory '%1': %2</source> - <translation>一時ディレクトリ '%1' を作æˆã§ãã¾ã›ã‚“: %2</translation> + <source>Cannot create temporary directory "%1": %2</source> + <translation>一時ディレクトリ "%1" を作æˆã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>Unexpected output from helper program (%1).</source> - <translation>ヘルパプãƒã‚°ãƒ©ãƒ (%1) ã‹ã‚‰ã®äºˆæœŸã›ã¬å‡ºåŠ›ã§ã™ã€‚</translation> + <source>Cannot change to working directory "%1": %2</source> + <translation>作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª "%1" ã«ç§»å‹•ã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>Cannot change to working directory '%1': %2</source> - <translation>作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª '%1' ã«ç§»å‹•ã§ãã¾ã›ã‚“: %2</translation> + <source>Cannot execute "%1": %2</source> + <translation>"%1" を実行ã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>Cannot execute '%1': %2</source> - <translation>'%1' を実行ã§ãã¾ã›ã‚“: %2</translation> + <source>Unexpected output from helper program (%1).</source> + <translation>ヘルパプãƒã‚°ãƒ©ãƒ (%1) ã‹ã‚‰ã®äºˆæœŸã›ã¬å‡ºåŠ›ã§ã™ã€‚</translation> </message> <message> <source>Quoting error in command.</source> @@ -10802,16 +10656,16 @@ with a password, which you can enter below.</source> <translation>ターミナルコマンドãŒã‚·ã‚§ãƒ«ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> - <source>Cannot start the terminal emulator '%1', change the setting in the Environment options.</source> - <translation>ターミナルエミュレータ '%1' ãŒé–‹å§‹ã§ãã¾ã›ã‚“。環境オプションã®è¨å®šã‚’変更ã—ã¦ãã ã•ã„。</translation> + <source>Cannot start the terminal emulator "%1", change the setting in the Environment options.</source> + <translation>ターミナルエミュレータ "%1" ãŒèµ·å‹•ã§ãã¾ã›ã‚“。環境オプションã®è¨å®šã‚’変更ã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Cannot create socket '%1': %2</source> - <translation>ソケット '%1' を作æˆã§ãã¾ã›ã‚“: %2</translation> + <source>Cannot create socket "%1": %2</source> + <translation>ソケット "%1" を作æˆã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>The process '%1' could not be started: %2</source> - <translation>プãƒã‚»ã‚¹ '%1' を開始ã§ãã¾ã›ã‚“: %2</translation> + <source>The process "%1" could not be started: %2</source> + <translation>プãƒã‚»ã‚¹ "%1" を開始ã§ãã¾ã›ã‚“: %2</translation> </message> <message> <source>Cannot obtain a handle to the inferior: %1</source> @@ -10832,16 +10686,16 @@ with a password, which you can enter below.</source> <context> <name>Utils::ElfReader</name> <message> - <source>'%1' is an invalid ELF object (%2)</source> - <translation>'%1' ã¯ã€ä¸æ£ãª ELF オブジェクトã§ã™ (%2)</translation> + <source>"%1" is an invalid ELF object (%2)</source> + <translation>"%1" ã¯ã€ä¸æ£ãª ELF オブジェクトã§ã™ (%2)</translation> </message> <message> - <source>'%1' is not an ELF object (file too small)</source> - <translation>'%1' ã¯ã€ELF オブジェクトã§ã¯ã‚ã‚Šã¾ã›ã‚“ (ファイルãŒå°ã•ã™ãŽã¾ã™)</translation> + <source>"%1" is not an ELF object (file too small)</source> + <translation>"%1" ã¯ã€ELF オブジェクトã§ã¯ã‚ã‚Šã¾ã›ã‚“ (ファイルãŒå°ã•ã™ãŽã¾ã™)</translation> </message> <message> - <source>'%1' is not an ELF object</source> - <translation>'%1' ã¯ã€ELF オブジェクトã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> + <source>"%1" is not an ELF object</source> + <translation>"%1" ã¯ã€ELF オブジェクトã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> </message> <message> <source>odd cpu architecture</source> @@ -10902,10 +10756,6 @@ with a password, which you can enter below.</source> <context> <name>Utils::FancyMainWindow</name> <message> - <source>Locked</source> - <translation>固定ã™ã‚‹</translation> - </message> - <message> <source>Reset to Default Layout</source> <translation>デフォルトレイアウトã«æˆ»ã™</translation> </message> @@ -10921,12 +10771,12 @@ with a password, which you can enter below.</source> <translation>ファイルåã«ç©ºç™½ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Invalid character '%1'.</source> - <translation>'%1' ã¯ç„¡åŠ¹ãªæ–‡å—ã§ã™ã€‚</translation> + <source>Invalid character "%1".</source> + <translation>"%1" ã¯ç„¡åŠ¹ãªæ–‡å—ã§ã™ã€‚</translation> </message> <message> - <source>Invalid characters '%1'.</source> - <translation>'%1' ã¯ç„¡åŠ¹ãªæ–‡å—列ã§ã™ã€‚</translation> + <source>Invalid characters "%1".</source> + <translation>"%1" ã¯ç„¡åŠ¹ãªæ–‡å—列ã§ã™ã€‚</translation> </message> <message> <source>Name matches MS Windows device. (%1).</source> @@ -10967,20 +10817,20 @@ with a password, which you can enter below.</source> <translation>ホームディレクトリã¯å‰Šé™¤ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Failed to remove directory '%1'.</source> - <translation>ディレクトリ '%1' ã®å‰Šé™¤ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Failed to remove directory "%1".</source> + <translation>ディレクトリ "%1" ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Failed to remove file '%1'.</source> - <translation>ファイル '%1' ã®å‰Šé™¤ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Failed to remove file "%1".</source> + <translation>ファイル "%1" ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Failed to create directory '%1'.</source> - <translation>ディレクトリ '%1' ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Failed to create directory "%1".</source> + <translation>ディレクトリ "%1" ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Could not copy file '%1' to '%2'.</source> - <translation>'%1' ã‹ã‚‰ '%2' ã¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’コピーã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Could not copy file "%1" to "%2".</source> + <translation>ファイル "%1" ã‚’ "%2" ã¸ã‚’コピーã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>Cannot open %1 for reading: %2</source> @@ -11012,13 +10862,6 @@ with a password, which you can enter below.</source> </message> </context> <context> - <name>Utils::FileWizardDialog</name> - <message> - <source>Location</source> - <translation>パス</translation> - </message> -</context> -<context> <name>Utils::IpAddressLineEdit</name> <message> <source>The IP address is not valid.</source> @@ -11052,24 +10895,24 @@ with a password, which you can enter below.</source> <translation>パスã¯ç©ºã«ã¯ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>The path '%1' expanded to an empty string.</source> - <translation>パス '%1' ã¯ç©ºã®æ–‡å—列ã«å±•é–‹ã•ã‚Œã¾ã™ã€‚</translation> + <source>The path "%1" expanded to an empty string.</source> + <translation>パス "%1" ã¯ç©ºã®æ–‡å—列ã«å±•é–‹ã•ã‚Œã¾ã—ãŸã€‚</translation> </message> <message> - <source>The path '%1' does not exist.</source> - <translation>パス '%1' ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> + <source>The path "%1" does not exist.</source> + <translation>パス "%1" ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> </message> <message> - <source>The path '%1' is not a directory.</source> - <translation>パス '%1' ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> + <source>The path "%1" is not a directory.</source> + <translation>パス "%1" ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>The directory '%1' does not exist.</source> + <source>The directory "%1" does not exist.</source> <translation>ディレクトリ "%1" ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> </message> <message> - <source>Cannot execute '%1'.</source> - <translation>'%1' を実行ã§ãã¾ã›ã‚“。</translation> + <source>Cannot execute "%1".</source> + <translation>"%1" を実行ã§ãã¾ã›ã‚“。</translation> </message> <message> <source>The path <b>%1</b> is not a directory.</source> @@ -11118,8 +10961,8 @@ with a password, which you can enter below.</source> <context> <name>Utils::ProjectNameValidatingLineEdit</name> <message> - <source>Invalid character '%1' found!</source> - <translation>無効ãªæ–‡å— '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ!</translation> + <source>Invalid character "%1" found!</source> + <translation>無効ãªæ–‡å— "%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ!</translation> </message> <message> <source>Invalid character '.'.</source> @@ -11209,24 +11052,24 @@ with a password, which you can enter below.</source> <context> <name>Utils::SynchronousProcess</name> <message> - <source>The command '%1' finished successfully.</source> - <translation>コマンド '%1' ã¯æ£å¸¸ã«çµ‚了ã—ã¾ã—ãŸã€‚</translation> + <source>The command "%1" finished successfully.</source> + <translation>コマンド "%1" ã¯æ£å¸¸ã«çµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>The command '%1' terminated with exit code %2.</source> - <translation>コマンド '%1' ã¯çµ‚了コード %2 ã§çµ‚了ã—ã¾ã—ãŸã€‚</translation> + <source>The command "%1" terminated with exit code %2.</source> + <translation>コマンド "%1" ã¯çµ‚了コード %2 ã§çµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>The command '%1' terminated abnormally.</source> - <translation>コマンド '%1' ã¯ç•°å¸¸çµ‚了ã—ã¾ã—ãŸã€‚</translation> + <source>The command "%1" terminated abnormally.</source> + <translation>コマンド "%1" ã¯ç•°å¸¸çµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>The command '%1' could not be started.</source> - <translation>コマンド '%1' ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>The command "%1" could not be started.</source> + <translation>コマンド "%1" ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <source>The command '%1' did not respond within the timeout limit (%2 ms).</source> - <translation>コマンド '%1' ã¯ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆåˆ¶é™ (%2 ms)以内ã«å¿œç”ã—ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>The command "%1" did not respond within the timeout limit (%2 ms).</source> + <translation>コマンド "%1" ã¯ã‚¿ã‚¤ãƒ アウト制é™(%2 ms)以内ã«å¿œç”ã—ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>Process not Responding</source> @@ -11237,8 +11080,8 @@ with a password, which you can enter below.</source> <translation>プãƒã‚»ã‚¹ãŒç„¡å¿œç”ã§ã™ã€‚</translation> </message> <message> - <source>The process '%1' is not responding.</source> - <translation>プãƒã‚»ã‚¹ '%1' ãŒç„¡å¿œç”ã§ã™ã€‚</translation> + <source>The process "%1" is not responding.</source> + <translation>プãƒã‚»ã‚¹ "%1" ãŒç„¡å¿œç”ã§ã™ã€‚</translation> </message> <message> <source>Would you like to terminate it?</source> @@ -11273,8 +11116,8 @@ with a password, which you can enter below.</source> <context> <name>ZeroConf::Internal::ZConfLib</name> <message> - <source>AvahiZConfLib could not load the native library '%1': %2</source> - <translation>AvahiZConfLib ã¯ãƒã‚¤ãƒ†ã‚£ãƒ–ライブラリ '%1' ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> + <source>AvahiZConfLib could not load the native library "%1": %2</source> + <translation>AvahiZConfLib ã¯ãƒã‚¤ãƒ†ã‚£ãƒ–ライブラリ "%1" ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> </message> <message> <source>%1 cannot create a client. The daemon is probably not running.</source> @@ -11301,16 +11144,16 @@ with a password, which you can enter below.</source> <translation>cAvahiBrowseReply ãŒäºˆæœŸã—ãªã„状態 %1 ã§ã™ã€‚</translation> </message> <message> - <source>%1 failed to kill other daemons with '%2'.</source> - <translation>%1 ã¯ã€'%2' ã§ä»–ã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’ kill ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>%1 failed to kill other daemons with "%2".</source> + <translation>%1 ã¯ã€"%2" ã§ä»–ã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’ kill ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>%1 detected a file at /tmp/mdnsd, daemon startup will probably fail.</source> <translation>%1 㯠/tmp/mdnsd ファイルを検出ã—ã¾ã—ãŸã€‚ãŠãらãã€ãƒ‡ãƒ¼ãƒ¢ãƒ³ã¯èµ·å‹•ã«å¤±æ•—ã™ã‚‹ã§ã—ょã†ã€‚</translation> </message> <message> - <source>%1: log of previous daemon run is: '%2'.</source> - <translation>%1: 以å‰ã«å®Ÿè¡Œã•ã‚ŒãŸãƒ‡ãƒ¼ãƒ¢ãƒ³ã®ãƒã‚°: '%2'</translation> + <source>%1: log of previous daemon run is: "%2".</source> + <translation>%1: 以å‰ã«å®Ÿè¡Œã•ã‚ŒãŸãƒ‡ãƒ¼ãƒ¢ãƒ³ã®ãƒã‚°: "%2"</translation> </message> <message> <source>%1 failed starting embedded daemon at %2.</source> @@ -11827,8 +11670,8 @@ with a password, which you can enter below.</source> <context> <name>Android::Internal::AndroidManager</name> <message> - <source>Error creating Android directory '%1'.</source> - <translation>Android ディレクトリ '%1' ã®ä½œæˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + <source>Error creating Android directory "%1".</source> + <translation>Android ディレクトリ "%1" ã®ä½œæˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> <message> <source>No Qt for Android SDKs were found. @@ -11845,20 +11688,20 @@ SDK ã‚’å°‘ãªãã¨ã‚‚1ã¤ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。</translation> <translation>Android ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è‡ªå‹•çš„ã«æ›´æ–°ã•ã‚Œã¾ã—ãŸã€‚</translation> </message> <message> - <source>Unknown Android version.</source> - <translation>未知㮠Android ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™ã€‚</translation> + <source>Unknown Android version. API Level: %1</source> + <translation>未知ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Android ã§ã™ã€‚API レベル: %1</translation> </message> <message> - <source>Error creating Android templates.</source> - <translation>Android テンプレートã®ä½œæˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + <source>Cannot parse "%1".</source> + <translation>"%1" を解æžã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Cannot parse '%1'.</source> - <translation>'%1' を解æžã§ãã¾ã›ã‚“。</translation> + <source>Cannot open "%1".</source> + <translation>"%1" ã‚’é–‹ã‘ã¾ã›ã‚“。</translation> </message> <message> - <source>Cannot open '%1'.</source> - <translation>'%1' ã‚’é–‹ã‘ã¾ã›ã‚“。</translation> + <source>Error creating Android templates.</source> + <translation>Android テンプレートã®ä½œæˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> <message> <source>Starting Android virtual device failed.</source> @@ -11986,12 +11829,12 @@ SDK ã‚’å°‘ãªãã¨ã‚‚1ã¤ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。</translation> <translation>API %1: %2</translation> </message> <message> - <source>Could not parse file: '%1'.</source> - <translation>ファイルを解æžã§ãã¾ã›ã‚“ã§ã—ãŸ: '%1'</translation> + <source>Could not parse file: "%1".</source> + <translation>ファイルを解æžã§ãã¾ã›ã‚“ã§ã—ãŸ: "%1"</translation> </message> <message> - <source>%2: Could not parse file: '%1'.</source> - <translation>%2: ファイルを解æžã§ãã¾ã›ã‚“ã§ã—ãŸ: '%1'</translation> + <source>%2: Could not parse file: "%1".</source> + <translation>%2: ファイルを解æžã§ãã¾ã›ã‚“ã§ã—ãŸ: "%1"</translation> </message> <message> <source>Goto error</source> @@ -12044,12 +11887,6 @@ SDK ã‚’å°‘ãªãã¨ã‚‚1ã¤ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。</translation> <translation>ELF æƒ…å ±ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> </message> <message> - <source>Cannot find '%1'. -Please make sure your application is built successfully and is selected in Application tab ('Run option').</source> - <translation>'%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 -実行オプション内ã®ã‚¢ãƒ—リケーションタブã§ã€ãƒ“ルドãŒæˆåŠŸã—ãŸã‚¢ãƒ—リケーションãŒé¸æŠžã•ã‚Œã¦ã„る事を確èªã—ã¦ãã ã•ã„。</translation> - </message> - <message> <source>Error</source> <translation>エラー</translation> </message> @@ -12066,8 +11903,14 @@ Please make sure your application is built successfully and is selected in Appli <translation>Qt アプリケーションã¨ãƒ©ã‚¤ãƒ–ラリを Android パッケージã«ã‚³ãƒ”ーã—ã¦ã„ã¾ã™...</translation> </message> <message> - <source>Can't copy gdbserver from '%1' to '%2'</source> - <translation>'%1' ã‹ã‚‰ '%2' 㸠gdbserver をコピーã§ãã¾ã›ã‚“</translation> + <source>Cannot find "%1". +Please make sure your application is built successfully and is selected in Application tab ('Run option').</source> + <translation>"%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 +実行オプション内ã®ã‚¢ãƒ—リケーションタブã§ã€ãƒ“ルドãŒæˆåŠŸã—ãŸã‚¢ãƒ—リケーションãŒé¸æŠžã•ã‚Œã¦ã„る事を確èªã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Can't copy gdbserver from "%1" to "%2"</source> + <translation>"%1" ã‹ã‚‰ "%2" 㸠gdbserver をコピーã§ãã¾ã›ã‚“</translation> </message> <message> <source>Creating package file ...</source> @@ -12200,8 +12043,8 @@ Please make sure your application is built successfully and is selected in Appli <context> <name>Android::Internal::AndroidRunConfiguration</name> <message> - <source>The .pro file '%1' is currently being parsed.</source> - <translation>.pro ファイル '%1' ã‚’ç¾åœ¨è§£æžã—ã¦ã„ã¾ã™ã€‚</translation> + <source>The .pro file "%1" is currently being parsed.</source> + <translation>.pro ファイル "%1" ã‚’ç¾åœ¨è§£æžã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> <source>Run on Android device</source> @@ -12250,10 +12093,6 @@ Please make sure your application is built successfully and is selected in Appli <translation>アクティビティã®é–‹å§‹ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ç†ç”±: %1。</translation> </message> <message> - <source>Unable to start '%1'.</source> - <translation>'%1' を開始ã§ãã¾ã›ã‚“。</translation> - </message> - <message> <source>"%1" terminated.</source> <translation>"%1" ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> @@ -12292,6 +12131,10 @@ Please make sure your application is built successfully and is selected in Appli <translation>"%1" 㯠Android NDK 最上ä½ãƒ•ã‚©ãƒ«ãƒ€ã§ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> + <source>Select JDK Path</source> + <translation>JDK パスをé¸æŠž</translation> + </message> + <message> <source>The Android NDK cannot be installed into a path with spaces.</source> <translation>空白をå«ã‚€ãƒ‘ス㫠Android SDK ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã¾ã›ã‚“。</translation> </message> @@ -12322,6 +12165,22 @@ Qt ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã‚ªãƒ—ションã‹ã‚‰ã€Œãƒ“ルドã¨å®Ÿè¡Œã€â†’「Qt ム<translation>"%1" 㯠JDK フォルダã§ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> + <source>Remove Android Virtual Device</source> + <translation>アンドãƒã‚¤ãƒ‰ä»®æƒ³ãƒ‡ãƒã‚¤ã‚¹(AVD)ã®å‰Šé™¤</translation> + </message> + <message> + <source>Remove device "%1"? This cannot be undone.</source> + <translation>デãƒã‚¤ã‚¹ "%1" を削除ã—ã¾ã™ã‹? 削除ã—ãŸãƒ‡ãƒã‚¤ã‚¹ã¯å…ƒã«æˆ»ã›ã¾ã›ã‚“。</translation> + </message> + <message> + <source>Unsupported GDB</source> + <translation>サãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®GDB</translation> + </message> + <message> + <source>The GDB inside this NDK seems to not support Python. The Qt Project offers fixed GDB builds at: <a href="http://download.qt-project.org/official_releases/gdb/osx/">http://download.qt-project.org/official_releases/gdb/osx/</a></source> + <translation>ã“ã®NDKã«åŒæ¢±ã•ã‚Œã¦ã„ã‚‹GDBã¯Pythonをサãƒãƒ¼ãƒˆã—ã¦ã„ãªã„よã†ã§ã™ã€‚Qt Projectã§ã¯å¯¾å¿œã™ã‚‹GDBã®ãƒã‚¤ãƒŠãƒªã‚’準備ã—ã¦ã„ã¾ã™: <a href="http://download.qt-project.org/official_releases/gdb/osx/">http://download.qt-project.org/official_releases/gdb/osx/</a></translation> + </message> + <message> <source>Select Android SDK folder</source> <translation>Android SDK フォルダをé¸æŠž</translation> </message> @@ -12333,10 +12192,6 @@ Qt ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã‚ªãƒ—ションã‹ã‚‰ã€Œãƒ“ルドã¨å®Ÿè¡Œã€â†’「Qt ム<source>Select ant Script</source> <translation>ant スクリプトをé¸æŠž</translation> </message> - <message> - <source>Select OpenJDK Path</source> - <translation>OpenJDK パスをé¸æŠž</translation> - </message> </context> <context> <name>Android::Internal::AndroidToolChainFactory</name> @@ -12381,7 +12236,7 @@ Qt ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã‚ªãƒ—ションã‹ã‚‰ã€Œãƒ“ルドã¨å®Ÿè¡Œã€â†’「Qt ム<context> <name>Android::Internal::ChooseDirectoryPage</name> <message> - <source>The Android package source directory can not be the same as the project directory.</source> + <source>The Android package source directory cannot be the same as the project directory.</source> <translation>Android パッケージソースディレクトリをプãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨åŒã˜ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</translation> </message> <message> @@ -12528,8 +12383,8 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <context> <name>AutotoolsProjectManager::Internal::AutotoolsManager</name> <message> - <source>Failed opening project '%1': Project is not a file</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> + <source>Failed opening project "%1": Project is not a file</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> </message> </context> <context> @@ -12610,14 +12465,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <source>Make</source> <translation>Make</translation> </message> - <message> - <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>ビルドã™ã‚‹ç‚ºã«ã¯ã‚³ãƒ³ãƒ‘イラã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ã‚ットオプションã§ã‚³ãƒ³ãƒ‘イラを構æˆã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> </context> <context> <name>AutotoolsProjectManager::Internal::MakeStepConfigWidget</name> @@ -12639,31 +12486,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ </message> </context> <context> - <name>BareMetal::BareMetalDeviceConfigurationFactory</name> - <message> - <source>Bare Metal Device</source> - <translation>ベアメタルデãƒã‚¤ã‚¹</translation> - </message> -</context> -<context> - <name>BareMetal::BareMetalDeviceConfigurationWizard</name> - <message> - <source>New Bare Metal Device Configuration Setup</source> - <translation>æ–°ã—ã„ベアメタルデãƒã‚¤ã‚¹æ§‹æˆã®è¨å®š</translation> - </message> -</context> -<context> - <name>BareMetal::BareMetalDeviceConfigurationWizardSetupPage</name> - <message> - <source>Set up GDB Server or Hardware Debugger</source> - <translation>GDB サーãƒãƒ¼ã‚ã‚‹ã„ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‡ãƒãƒƒã‚¬ã®è¨å®š</translation> - </message> - <message> - <source>Bare Metal Device</source> - <translation>ベアメタルデãƒã‚¤ã‚¹</translation> - </message> -</context> -<context> <name>BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget</name> <message> <source>GDB commands:</source> @@ -12671,25 +12493,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ </message> </context> <context> - <name>BareMetal::BareMetalGdbCommandsDeployStep</name> - <message> - <source>GDB commands</source> - <translation>GDB コマンド</translation> - </message> -</context> -<context> - <name>BareMetal::BareMetalRunConfiguration</name> - <message> - <source>%1 (via GDB server or hardware debugger)</source> - <translation>%1 (GDBサーãƒãƒ¼ã‚ã‚‹ã„ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‡ãƒãƒƒã‚¬çµŒç”±)</translation> - </message> - <message> - <source>Run on GDB server or hardware debugger</source> - <extracomment>Bare Metal run configuration default run name</extracomment> - <translation>GDB サーãƒãƒ¼ã‚ã‚‹ã„ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‡ãƒãƒƒã‚¬ä¸Šã§å®Ÿè¡Œ</translation> - </message> -</context> -<context> <name>BareMetal::Internal::BareMetalRunConfigurationFactory</name> <message> <source>%1 (on GDB server or hardware debugger)</source> @@ -12697,29 +12500,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ </message> </context> <context> - <name>BareMetal::BareMetalRunConfigurationWidget</name> - <message> - <source>Executable:</source> - <translation>実行ファイル:</translation> - </message> - <message> - <source>Arguments:</source> - <translation>引数:</translation> - </message> - <message> - <source><default></source> - <translation><デフォルト></translation> - </message> - <message> - <source>Working directory:</source> - <translation>作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª:</translation> - </message> - <message> - <source>Unknown</source> - <translation>ä¸æ˜Ž</translation> - </message> -</context> -<context> <name>BareMetal::Internal::BareMetalRunControlFactory</name> <message> <source>Cannot debug: Kit has no device.</source> @@ -12991,14 +12771,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <source>Cloning started...</source> <translation>クãƒãƒ¼ãƒ³ã‚’開始ã—ã¾ã—ãŸ...</translation> </message> - <message> - <source>Clones a Bazaar branch and tries to load the contained project.</source> - <translation>Bazaar ブランãƒã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> - </message> - <message> - <source>Bazaar Clone (Or Branch)</source> - <translation>Bazaar クãƒãƒ¼ãƒ³ (ブランãƒ)</translation> - </message> </context> <context> <name>Bazaar::Internal::CloneWizardPage</name> @@ -13089,10 +12861,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <translation>Git アノテーションエディタ</translation> </message> <message> - <source>Git Diff Editor</source> - <translation>Git 差分 エディタ</translation> - </message> - <message> <source>Git Commit Editor</source> <translation>Git コミットエディタ</translation> </message> @@ -13355,8 +13123,8 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <translation>下ã«ç§»å‹•</translation> </message> <message> - <source>Edit Note</source> - <translation>ノートã®ç·¨é›†</translation> + <source>&Edit</source> + <translation>編集(&E)</translation> </message> <message> <source>&Remove</source> @@ -13378,13 +13146,17 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <context> <name>Bookmarks::Internal::BookmarkManager</name> <message> - <source>Edit Note</source> - <translation>ノートã®ç·¨é›†</translation> + <source>Edit Bookmark</source> + <translation>ブックマークã®ç·¨é›†</translation> </message> <message> <source>Note text:</source> <translation>ノートテã‚スト:</translation> </message> + <message> + <source>Line number:</source> + <translation>行番å·:</translation> + </message> </context> <context> <name>Bookmarks::Internal::BookmarkViewFactory</name> @@ -13448,8 +13220,8 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <translation>ドã‚ュメント内ã®æ¬¡ã®ãƒ–ックマークã«ç§»å‹•</translation> </message> <message> - <source>Edit Bookmark Note</source> - <translation>ブックマークノートã®</translation> + <source>Edit Bookmark</source> + <translation>ブックマークã®ç·¨é›†</translation> </message> </context> <context> @@ -13699,16 +13471,20 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <translation>コメントãƒã‚§ãƒƒã‚¯ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ファイルをãƒã‚§ãƒƒã‚¯ã‚¤ãƒ³ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <source>Do you want to undo the check out of '%1'?</source> - <translation>'%1' ã®ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ</translation> + <source>Do you want to undo the check out of "%1"?</source> + <translation>"%1" ã®ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <source>Undo Hijack File</source> - <translation>ãƒã‚¤ã‚¸ãƒ£ãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æˆ»ã™</translation> + <source>Do you want to undo hijack of "%1"?</source> + <translation>"%1" ã®ãƒã‚¤ã‚¸ãƒ£ãƒƒã‚¯ã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <source>Do you want to undo hijack of '%1'?</source> - <translation>'%1' ã®ãƒã‚¤ã‚¸ãƒ£ãƒƒã‚¯ã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ</translation> + <source>Updating ClearCase Index</source> + <translation>ClearCase インデックスã®æ›´æ–°ä¸</translation> + </message> + <message> + <source>Undo Hijack File</source> + <translation>ãƒã‚¤ã‚¸ãƒ£ãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æˆ»ã™</translation> </message> <message> <source>External diff is required to compare multiple files.</source> @@ -13782,10 +13558,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <source>Enter activity headline</source> <translation>アクティビティ ヘッドラインã«å…¥ã‚‹</translation> </message> - <message> - <source>CC Indexing</source> - <translation>CC 解æžä¸</translation> - </message> </context> <context> <name>ClearCase::Internal::ClearCaseSubmitEditor</name> @@ -13995,6 +13767,10 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <translation>%1 ã® cbp ファイルを更新ã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> + <source>The cached generator %1 is incompatible with the configured kits.</source> + <translation>ã‚ャッシュã•ã‚Œã¦ã„るジェãƒãƒ¬ãƒ¼ã‚¿ %1 ã¯æŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã‚ットã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> <source>No generator selected.</source> <translation>ジェãƒãƒ¬ãƒ¼ã‚¿ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> @@ -14010,8 +13786,8 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <context> <name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name> <message> - <source>Run cmake</source> - <translation>CMake ã®å®Ÿè¡Œ</translation> + <source>Run CMake...</source> + <translation>CMake ã®å®Ÿè¡Œ...</translation> </message> <message> <source>Reconfigure project:</source> @@ -14037,8 +13813,8 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <translation>CMake ã®å®Ÿè¡Œ</translation> </message> <message> - <source>Failed opening project '%1': Project is not a file</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> + <source>Failed opening project "%1": Project is not a file</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> </message> </context> <context> @@ -14101,14 +13877,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <extracomment>Default display name for the cmake make step.</extracomment> <translation>Make</translation> </message> - <message> - <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>ビルドã™ã‚‹ç‚ºã«ã¯ã‚³ãƒ³ãƒ‘イラã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ã‚ットオプションã§ã‚³ãƒ³ãƒ‘イラを構æˆã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> </context> <context> <name>CMakeProjectManager::Internal::MakeStepConfigWidget</name> @@ -14190,46 +13958,6 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ </message> </context> <context> - <name>Core::BaseFileWizard</name> - <message> - <source>File Generation Failure</source> - <translation>ファイル生æˆã‚¨ãƒ©ãƒ¼</translation> - </message> - <message> - <source>Existing files</source> - <translation>上書ã時ã®ã‚¨ãƒ©ãƒ¼</translation> - </message> - <message> - <source>Failed to open an editor for '%1'.</source> - <translation>'%1'をエディタã§é–‹ã‘ã¾ã›ã‚“。</translation> - </message> - <message> - <source>[read only]</source> - <translation>[èªå–専用]</translation> - </message> - <message> - <source>[folder]</source> - <translation>[フォルダ]</translation> - </message> - <message> - <source>[symbolic link]</source> - <translation>[シンボリックリンク]</translation> - </message> - <message> - <source>The project directory %1 contains files which cannot be overwritten: -%2.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª %1 内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’上書ãã§ãã¾ã›ã‚“: -%2.</translation> - </message> -</context> -<context> - <name>Core::StandardFileWizard</name> - <message> - <source>New %1</source> - <translation>%1 ã®æ–°è¦ä½œæˆ</translation> - </message> -</context> -<context> <name>Core</name> <message> <source>Qt</source> @@ -14252,6 +13980,16 @@ Android パッケージソースディレクトリã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ“ルドデ <comment>msgShowOptionsDialog</comment> <translation>...</translation> </message> + <message> + <source>Open Preferences dialog.</source> + <comment>msgShowOptionsDialogToolTip (mac version)</comment> + <translation>è¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’é–‹ã。</translation> + </message> + <message> + <source>Open Options dialog.</source> + <comment>msgShowOptionsDialogToolTip (non-mac version)</comment> + <translation>オプションダイアãƒã‚°ã‚’é–‹ã。</translation> + </message> </context> <context> <name>Core::DesignMode</name> @@ -14370,8 +14108,8 @@ Would you like to overwrite them?</source> <translation>上書ãã—ã¾ã™ã‹?</translation> </message> <message> - <source>An item named '%1' already exists at this location. Do you want to overwrite it?</source> - <translation>'%1' ã¨ã„ã†åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«åŒã˜ãƒ‘スã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚上書ãã—ã¾ã™ã‹?</translation> + <source>An item named "%1" already exists at this location. Do you want to overwrite it?</source> + <translation>"%1" ã¨ã„ã†åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«åŒã˜ãƒ‘スã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚上書ãã—ã¾ã™ã‹?</translation> </message> <message> <source>Save File As</source> @@ -14394,17 +14132,6 @@ Would you like to overwrite them?</source> </message> </context> <context> - <name>Core::DocumentModel</name> - <message> - <source><no document></source> - <translation><ドã‚ュメントãªã—></translation> - </message> - <message> - <source>No document is selected.</source> - <translation>ドã‚ュメントãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> - </message> -</context> -<context> <name>Core::EditorManager</name> <message> <source>Revert to Saved</source> @@ -14459,6 +14186,10 @@ Would you like to overwrite them?</source> <translation>Ctrl+W</translation> </message> <message> + <source>Alternative Close</source> + <translation>ã»ã‹ã‚’é–‰ã˜ã‚‹</translation> + </message> + <message> <source>Ctrl+F4</source> <translation>Ctrl+F4</translation> </message> @@ -14603,6 +14334,10 @@ Would you like to overwrite them?</source> <translation>ä»–ã®ã‚¨ãƒ‡ã‚£ã‚¿ã‚’é–‰ã˜ã‚‹</translation> </message> <message> + <source>Open With</source> + <translation>エディタを指定ã—ã¦é–‹ã</translation> + </message> + <message> <source>File Error</source> <translation>ファイルエラー</translation> </message> @@ -14768,16 +14503,16 @@ Would you like to overwrite them?</source> <context> <name>Core::Internal::ExternalToolRunner</name> <message> - <source>Could not find executable for '%1' (expanded '%2')</source> - <translation>実行ファイル '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ(展開後 '%2')</translation> + <source>Could not find executable for "%1" (expanded "%2")</source> + <translation>実行ファイル "%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ(展開後 "%2")</translation> </message> <message> - <source>Starting external tool '%1' %2</source> - <translation>外部ツール '%1' %2 を開始ã—ã¦ã„ã¾ã™</translation> + <source>Starting external tool "%1" %2</source> + <translation>外部ツール "%1" %2 ã‚’èµ·å‹•ã—ã¦ã„ã¾ã™</translation> </message> <message> - <source>'%1' finished</source> - <translation>'%1' ãŒçµ‚了ã—ã¾ã—ãŸ</translation> + <source>"%1" finished</source> + <translation>"%1" ãŒçµ‚了ã—ã¾ã—ãŸ</translation> </message> </context> <context> @@ -14885,10 +14620,10 @@ Would you like to overwrite them?</source> </translation> </message> <message> - <source>'%1' returned the following error: + <source>"%1" returned the following error: %2</source> - <translation>'%1' ã¯ä»¥ä¸‹ã®ã‚ˆã†ãªã‚¨ãƒ©ãƒ¼ã§çµ‚了ã—ã¾ã—ãŸ: + <translation>"%1" ã¯ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã§çµ‚了ã—ã¾ã—ãŸ: %2</translation> </message> @@ -14994,14 +14729,6 @@ Would you like to overwrite them?</source> <translation>Qt Creator</translation> </message> <message> - <source>Exit Full Screen</source> - <translation>全画é¢è¡¨ç¤ºã‚’ã‚„ã‚ã‚‹</translation> - </message> - <message> - <source>Enter Full Screen</source> - <translation>全画é¢è¡¨ç¤ºã«ã™ã‚‹</translation> - </message> - <message> <source>&File</source> <translation>ファイル(&F)</translation> </message> @@ -15022,6 +14749,10 @@ Would you like to overwrite them?</source> <translation>ヘルプ(&H)</translation> </message> <message> + <source>Return to Editor</source> + <translation>エディタã«æˆ»ã‚‹</translation> + </message> + <message> <source>&New File or Project...</source> <translation>ファイル/プãƒã‚¸ã‚§ã‚¯ãƒˆã®æ–°è¦ä½œæˆ(&N)...</translation> </message> @@ -15134,6 +14865,14 @@ Would you like to overwrite them?</source> <translation>ズーム</translation> </message> <message> + <source>Close Window</source> + <translation>ウィンドウを閉ã˜ã‚‹</translation> + </message> + <message> + <source>Ctrl+Meta+W</source> + <translation>Ctrl+Meta+W</translation> + </message> + <message> <source>Show Sidebar</source> <translation>サイドãƒãƒ¼ã‚’表示ã™ã‚‹</translation> </message> @@ -15421,8 +15160,8 @@ Would you like to overwrite them?</source> <context> <name>Core::VariableChooser</name> <message> - <source>Insert variable</source> - <translation>変数を挿入</translation> + <source>Variables</source> + <translation>変数</translation> </message> </context> <context> @@ -15663,6 +15402,10 @@ to version control (%2)</source> <source>The header and source file names will be derived from the class name</source> <translation>ヘッダーファイルã¨ã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã¯ã‚¯ãƒ©ã‚¹åã‚’å…ƒã«ã—ã¾ã™</translation> </message> + <message> + <source>Details</source> + <translation>詳細</translation> + </message> </context> <context> <name>CppEditor::Internal::CppClassWizardDialog</name> @@ -15670,10 +15413,6 @@ to version control (%2)</source> <source>C++ Class Wizard</source> <translation>C++ クラスウィザード</translation> </message> - <message> - <source>Details</source> - <translation>詳細</translation> - </message> </context> <context> <name>CppEditor::Internal::CppClassWizard</name> @@ -15685,10 +15424,6 @@ to version control (%2)</source> <context> <name>CppEditor::Internal::CPPEditorWidget</name> <message> - <source>Sort Alphabetically</source> - <translation>ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆé †ã«ã‚½ãƒ¼ãƒˆ</translation> - </message> - <message> <source>&Refactor</source> <translation>リファクター(&R)</translation> </message> @@ -16142,8 +15877,8 @@ to version control (%2)</source> <context> <name>CppTools::Internal::BuiltinIndexingSupport</name> <message> - <source>Parsing</source> - <translation>解æžä¸</translation> + <source>Parsing C/C++ Files</source> + <translation>C/C++ ファイルã®è§£æžä¸</translation> </message> </context> <context> @@ -16223,8 +15958,8 @@ to version control (%2)</source> <translation>C++ 出ç¾ç®‡æ‰€:</translation> </message> <message> - <source>Searching</source> - <translation>検索ä¸</translation> + <source>Searching for Usages</source> + <translation>使用方法ã®æ¤œç´¢ä¸</translation> </message> <message> <source>C++ Macro Usages:</source> @@ -16253,17 +15988,6 @@ to version control (%2)</source> </message> </context> <context> - <name>CppPreprocessor</name> - <message> - <source>%1: No such file or directory</source> - <translation>%1: ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚‚ã—ãã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã‚ã‚Šã¾ã›ã‚“</translation> - </message> - <message> - <source>%1: Could not get file contents</source> - <translation>%1: ファイルã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> -</context> -<context> <name>CppTools</name> <message> <source>Code Style</source> @@ -16332,8 +16056,8 @@ to version control (%2)</source> <translation>C++ シンボル</translation> </message> <message> - <source>Searching</source> - <translation>検索ä¸</translation> + <source>Searching for Symbol</source> + <translation>シンボルã®æ¤œç´¢ä¸</translation> </message> <message> <source>C++ Symbols:</source> @@ -16408,17 +16132,6 @@ Flags: %3</source> </message> </context> <context> - <name>Cvs::Internal::CheckoutWizard</name> - <message> - <source>Checks out a CVS repository and tries to load the contained project.</source> - <translation>CVS リãƒã‚¸ãƒˆãƒªã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> - </message> - <message> - <source>CVS Checkout</source> - <translation>CVS ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ</translation> - </message> -</context> -<context> <name>Cvs::Internal::CheckoutWizardPage</name> <message> <source>Location</source> @@ -16450,8 +16163,8 @@ Flags: %3</source> <context> <name>Cvs::Internal::CvsPlugin</name> <message> - <source>Cannot find repository for '%1'</source> - <translation>'%1' ã®ãƒªãƒã‚¸ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> + <source>Cannot find repository for "%1"</source> + <translation>"%1" ã®ãƒªãƒã‚¸ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> </message> <message> <source>Parsing of the log output failed</source> @@ -16678,12 +16391,16 @@ Flags: %3</source> <translation>変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>Would you like to discard your changes to the repository '%1'?</source> - <translation>リãƒã‚¸ãƒˆãƒª '%1' ã«åŠ ãˆãŸæœªä¿å˜ã®å¤‰æ›´å†…容をã™ã¹ã¦å…ƒã«æˆ»ã—ã¾ã™ã‹?</translation> + <source>Would you like to discard your changes to the repository "%1"?</source> + <translation>リãƒã‚¸ãƒˆãƒª "%1" ã«åŠ ãˆãŸæœªä¿å˜ã®å¤‰æ›´å†…容をã™ã¹ã¦ç ´æ£„ã—ã¾ã™ã‹?</translation> + </message> + <message> + <source>Would you like to discard your changes to the file "%1"?</source> + <translation>ファイル "%1" ã«åŠ ãˆãŸæœªä¿å˜ã®å¤‰æ›´å†…容をã™ã¹ã¦ç ´æ£„ã—ã¾ã™ã‹?</translation> </message> <message> - <source>Would you like to discard your changes to the file '%1'?</source> - <translation>ファイル '%1' ã«åŠ ãˆãŸæœªä¿å˜ã®å¤‰æ›´å†…容をã™ã¹ã¦å…ƒã«æˆ»ã—ã¾ã™ã‹?</translation> + <source>Could not find commits of id "%1" on %2.</source> + <translation>%2 以é™ã§ã€ID ㌠"%1" ã§ã‚るコミットãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>Project status</source> @@ -16698,10 +16415,6 @@ Flags: %3</source> <translation>åˆæœŸãƒªãƒ“ジョン %1 ã«èª¬æ˜Žã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>Could not find commits of id '%1' on %2.</source> - <translation>%2 以é™ã§ã€ID ㌠'%1' ã®ã‚³ãƒŸãƒƒãƒˆãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> <source>No cvs executable specified!</source> <translation>cvs 実行ファイルãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“!</translation> </message> @@ -17178,10 +16891,6 @@ This feature is only available for GDB.</source> <translation>ファイル内ã®ãƒ–レークãƒã‚¤ãƒ³ãƒˆã®å‰Šé™¤</translation> </message> <message> - <source>Adjust Column Widths to Contents</source> - <translation>内容ã«åˆã‚ã›ã¦åˆ—幅を調整</translation> - </message> - <message> <source>Edit Breakpoint...</source> <translation>ブレークãƒã‚¤ãƒ³ãƒˆã‚’編集...</translation> </message> @@ -17231,17 +16940,10 @@ This feature is only available for GDB.</source> </message> </context> <context> - <name>Debugger::Internal::BreakWindow</name> - <message> - <source>Breakpoints</source> - <translation>ブレークãƒã‚¤ãƒ³ãƒˆ</translation> - </message> -</context> -<context> <name>Debugger::Internal::CdbEngine</name> <message> - <source>The console process '%1' could not be started.</source> - <translation>コンソールプãƒã‚»ã‚¹ '%1' を開始ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>The console process "%1" could not be started.</source> + <translation>コンソールプãƒã‚»ã‚¹ "%1" ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>Debugger Error</source> @@ -17288,8 +16990,12 @@ This feature is only available for GDB.</source> <translation>スレッド %3 ã§ãƒˆãƒ¬ãƒ¼ã‚¹ãƒã‚¤ãƒ³ãƒˆ %1 (%2) ã«åˆ°é”ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Conditional breakpoint %1 (%2) in thread %3 triggered, examining expression '%4'.</source> - <translation>スレッド %3 ã§æ¡ä»¶ä»˜ãブレークãƒã‚¤ãƒ³ãƒˆ %1 (%2) ã«åˆ°é”ã—ãŸç‚ºã€å¼ '%4' を評価ã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Conditional breakpoint %1 (%2) in thread %3 triggered, examining expression "%4".</source> + <translation>スレッド %3 ã§æ¡ä»¶ä»˜ãブレークãƒã‚¤ãƒ³ãƒˆ %1 (%2) ã«åˆ°é”ã—ãŸç‚ºã€å¼ "%4" を評価ã—ã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>"Select Widget to Watch": Not supported in state "%1".</source> + <translation>"監視対象ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®é¸æŠž": 状態 "%1" ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> <source>Malformed stop response received.</source> @@ -17311,10 +17017,6 @@ This feature is only available for GDB.</source> <source>"Select Widget to Watch": Please stop the application first.</source> <translation>"監視対象ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®é¸æŠž": å…ˆã«ã‚¢ãƒ—リケーションをåœæ¢ã—ã¦ãã ã•ã„。</translation> </message> - <message> - <source>"Select Widget to Watch": Not supported in state '%1'.</source> - <translation>"監視対象ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®é¸æŠž": 状態 "%1" ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> - </message> </context> <context> <name>Debugger::Internal::CdbBreakEventWidget</name> @@ -17447,6 +17149,14 @@ This feature is only available for GDB.</source> <translation>"リリース" ビルドã®ãƒ‡ãƒãƒƒã‚°æ™‚ã«è¦å‘Šã™ã‚‹</translation> </message> <message> + <source>Keep editor stationary when stepping</source> + <translation>ステップ実行時ã«ã‚¨ãƒ‡ã‚£ã‚¿ã‚’å‹•ã‹ã•ãªã„</translation> + </message> + <message> + <source>Scrolls the editor only when it is necessary to keep the current line in view, instead of keeping the next statement centered at all times.</source> + <translation>ç¾åœ¨è¡Œã‚’表示ã—続ã‘ã‚‹ã®ã«å¿…è¦ãªå ´åˆã®ã¿ã‚¨ãƒ‡ã‚£ã‚¿ã‚’スクãƒãƒ¼ãƒ«ã—ã¾ã™ã€‚ãã†ã§ãªã‘ã‚Œã°æ¬¡ã®æ–‡ã‚’常ã«ä¸å¿ƒã«è¡¨ç¤ºã—ã¾ã™ã€‚</translation> + </message> + <message> <source>Maximum stack depth:</source> <translation>最大スタック深度:</translation> </message> @@ -17454,10 +17164,6 @@ This feature is only available for GDB.</source> <source><unlimited></source> <translation><無制é™></translation> </message> - <message> - <source>Maximum string length:</source> - <translation>最大文å—列長:</translation> - </message> </context> <context> <name>Debugger</name> @@ -17501,7 +17207,7 @@ This feature is only available for GDB.</source> <translation>デãƒãƒƒã‚¬ã®è¨å®š...</translation> </message> <message> - <source>Always Adjust Column Widths to Contents</source> + <source>Always Adjust View Column Widths to Contents</source> <translation>常ã«å†…容ã«åˆã‚ã›ã¦åˆ—幅を調整</translation> </message> <message> @@ -17509,6 +17215,10 @@ This feature is only available for GDB.</source> <translation>è¡Œã”ã¨ã«è‰²ã‚’変ãˆã‚‹</translation> </message> <message> + <source>Keep Editor Stationary When Stepping</source> + <translation>ステップ実行時ã«ã‚¨ãƒ‡ã‚£ã‚¿ã‚’å‹•ã‹ã•ãªã„</translation> + </message> + <message> <source>Debugger Font Size Follows Main Editor</source> <translation>デãƒãƒƒã‚¬ã®ãƒ•ã‚©ãƒ³ãƒˆã‚µã‚¤ã‚ºã‚’メインエディタã«é€£å‹•ã•ã›ã‚‹</translation> </message> @@ -17669,6 +17379,14 @@ This feature is only available for GDB.</source> <translation>事後検証デãƒãƒƒã‚°ã¨ã—ã¦ç™»éŒ²ã™ã‚‹</translation> </message> <message> + <source>The maximum length of string entries in the Locals and Expressions pane. Longer than that are cut off and displayed with an ellipsis attached.</source> + <translation>ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¨å¼ãƒšã‚¤ãƒ³ã§è¡¨ç¤ºã™ã‚‹æ–‡å—列ã®æœ€å¤§é•·ã§ã™ã€‚ã“ã®å€¤ã‚ˆã‚Šã‚‚é•·ã„æ–‡å—列ã¯çœç•¥è¨˜å·ã‚’付ã‘ã¦é€”ä¸ã¾ã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚</translation> + </message> + <message> + <source>The maximum length for strings in separated windows. Longer strings are cut off and displayed with an ellipsis attached.</source> + <translation>別ウィンドウã§è¡¨ç¤ºã™ã‚‹æ–‡å—列ã®æœ€å¤§é•·ã§ã™ã€‚ã“ã®å€¤ã‚ˆã‚Šã‚‚é•·ã„æ–‡å—列ã¯çœç•¥è¨˜å·ã‚’付ã‘ã¦é€”ä¸ã¾ã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚</translation> + </message> + <message> <source>Reload Full Stack</source> <translation>ã™ã¹ã¦ã®ã‚¹ã‚¿ãƒƒã‚¯ã®å†èªè¾¼</translation> </message> @@ -17846,8 +17564,8 @@ This feature is only available for GDB.</source> <context> <name>Debugger::DebuggerEngine</name> <message> - <source>Launching</source> - <translation>èµ·å‹•ä¸</translation> + <source>Launching Debugger</source> + <translation>デãƒãƒƒã‚¬ã®èµ·å‹•</translation> </message> <message> <source>Setup failed.</source> @@ -18005,6 +17723,10 @@ Setting breakpoints by file name and line number may fail.</source> <context> <name>Debugger::DebuggerEnginePrivate</name> <message> + <source>Debugged executable</source> + <translation>デãƒãƒƒã‚°ã™ã‚‹å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«</translation> + </message> + <message> <source>Attempting to interrupt.</source> <translation>ä¸æ–ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚</translation> </message> @@ -18101,12 +17823,12 @@ Setting breakpoints by file name and line number may fail.</source> <translation>デãƒãƒƒã‚¬ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <source>Debugger '%1' not found.</source> - <translation>デãƒãƒƒã‚¬ '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Debugger "%1" not found.</source> + <translation>デãƒãƒƒã‚¬ "%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <source>Debugger '%1' not executable.</source> - <translation>デãƒãƒƒã‚¬ '%1' ã¯å®Ÿè¡Œå¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> + <source>Debugger "%1" not executable.</source> + <translation>デãƒãƒƒã‚¬ "%1" ã¯å®Ÿè¡Œå¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> <source>The debugger location must be given as an absolute path (%1).</source> @@ -18183,16 +17905,16 @@ Setting breakpoints by file name and line number may fail.</source> <translation>デãƒãƒƒã‚°</translation> </message> <message> - <source>Option '%1' is missing the parameter.</source> - <translation>オプション '%1' ã«å¿…è¦ãªãƒ‘ラメータãŒä¸è¶³ã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Option "%1" is missing the parameter.</source> + <translation>オプション "%1" ã«å¿…è¦ãªãƒ‘ラメータãŒä¸è¶³ã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Only one executable allowed!</source> - <translation>許å¯ã•ã‚Œã¦ã„ã‚‹ã®ã¯1ã¤ã®å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã§ã™!</translation> + <source>The parameter "%1" of option "%2" does not match the pattern <handle>:<pid>.</source> + <translation>オプション "%2" ã®ãƒ‘ラメータ "%1" ãŒãƒ‘ターン(<handle>:<pid>)ã¨ä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <source>The parameter '%1' of option '%2' does not match the pattern <handle>:<pid>.</source> - <translation>オプション '%2' ã®ãƒ‘ラメータ '%1' ãŒãƒ‘ターン (<handle>:<pid>)ã¨ä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“。</translation> + <source>Only one executable allowed!</source> + <translation>許å¯ã•ã‚Œã¦ã„ã‚‹ã®ã¯1ã¤ã®å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã§ã™!</translation> </message> <message> <source>Invalid debugger option: %1</source> @@ -18352,8 +18074,8 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <translation>関数 "%1" を逆アセンブル</translation> </message> <message> - <source>Start '%1' and break at function 'main()'</source> - <translation>'%1' ã‚’èµ·å‹•ã—ã¦ã€'main()' 関数ã§åœæ¢ã—ã¾ã™</translation> + <source>Start "%1" and break at function "main()"</source> + <translation>"%1" ã‚’èµ·å‹•ã—ã¦ã€'main()' 関数ã§åœæ¢ã—ã¾ã™</translation> </message> <message> <source>Save Debugger Log</source> @@ -18376,6 +18098,38 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <translation>F5</translation> </message> <message> + <source>Breakpoints</source> + <translation>ブレークãƒã‚¤ãƒ³ãƒˆ</translation> + </message> + <message> + <source>Modules</source> + <translation>モジュール</translation> + </message> + <message> + <source>Registers</source> + <translation>レジスタ</translation> + </message> + <message> + <source>Stack</source> + <translation>スタック</translation> + </message> + <message> + <source>Source Files</source> + <translation>ソースファイル</translation> + </message> + <message> + <source>Threads</source> + <translation>スレッド</translation> + </message> + <message> + <source>Locals and Expressions</source> + <translation>ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¨å¼</translation> + </message> + <message> + <source>Snapshots</source> + <translation>スナップショット</translation> + </message> + <message> <source>Continue</source> <translation>続行</translation> </message> @@ -18400,6 +18154,14 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <translation>デãƒãƒƒã‚°ã‚’ä¸æ¢ã—ã¦ã€åˆæœŸçŠ¶æ…‹ã«æˆ»ã—ã¾ã™ã€‚</translation> </message> <message> + <source>Restart Debugging</source> + <translation>デãƒãƒƒã‚°ã®å†é–‹</translation> + </message> + <message> + <source>Restart the debugging session.</source> + <translation>デãƒãƒƒã‚°ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’å†é–‹ã™ã‚‹ã€‚</translation> + </message> + <message> <source>Step Over</source> <translation>ステップオーãƒãƒ¼</translation> </message> @@ -18520,6 +18282,10 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <translation>デãƒãƒƒã‚¬ã‚’リセット</translation> </message> <message> + <source>Shift+Ctrl+R</source> + <translation>Shift+Ctrl+R</translation> + </message> + <message> <source>Ctrl+Shift+O</source> <translation>Ctrl+Shift+O</translation> </message> @@ -18568,10 +18334,6 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <translation>F9</translation> </message> <message> - <source>Apply Changes on Save</source> - <translation>ä¿å˜æ™‚ã«å¤‰æ›´ã‚’é©ç”¨</translation> - </message> - <message> <source>Show Application on Top</source> <translation>アプリケーションを最å‰é¢ã«è¡¨ç¤ºã™ã‚‹</translation> </message> @@ -18731,10 +18493,6 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <context> <name>DebuggerPlugin</name> <message> - <source>Unable to create a debugger engine of the type '%1'</source> - <translation>'%1' タイプã®ãƒ‡ãƒãƒƒã‚¬ã‚¨ãƒ³ã‚¸ãƒ³ã‚’作æˆã§ãã¾ã›ã‚“</translation> - </message> - <message> <source>Install &Debug Information</source> <translation>デãƒãƒƒã‚°æƒ…å ±ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«(&I)</translation> </message> @@ -18742,6 +18500,10 @@ Qt Creator ã¯ã‚¢ã‚¿ãƒƒãƒã§ãã¾ã›ã‚“。</translation> <source>Tries to install missing debug information.</source> <translation>ä¸è¶³ã™ã‚‹ãƒ‡ãƒãƒƒã‚°æƒ…å ±ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’試ã¿ã‚‹ã€‚</translation> </message> + <message> + <source>Unable to create a debugger engine of the type "%1"</source> + <translation>"%1" タイプã®ãƒ‡ãƒãƒƒã‚¬ã‚¨ãƒ³ã‚¸ãƒ³ã‚’作æˆã§ãã¾ã›ã‚“</translation> + </message> </context> <context> <name>Debugger::Internal::DebuggerSourcePathMappingWidget</name> @@ -19038,8 +18800,12 @@ You can choose between waiting longer or aborting debugging.</source> <translation>アプリケーションã®çµ‚了ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> </message> <message> - <source>There is no GDB binary available for binaries in format '%1'</source> - <translation>'%1' フォーマットã®ãƒã‚¤ãƒŠãƒªã§ä½¿ç”¨å¯èƒ½ãª gdb ãƒã‚¤ãƒŠãƒªãŒã‚ã‚Šã¾ã›ã‚“</translation> + <source>There is no GDB binary available for binaries in format "%1"</source> + <translation>"%1" フォーマットã®ãƒã‚¤ãƒŠãƒªã§ä½¿ç”¨å¯èƒ½ãª GDB ã®ãƒã‚¤ãƒŠãƒªãŒã‚ã‚Šã¾ã›ã‚“</translation> + </message> + <message> + <source>The debugger settings point to a script file at "%1" which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source> + <translation>デãƒãƒƒã‚¬ã«è¨å®šã•ã‚ŒãŸã‚¹ã‚¯ãƒªãƒ—トファイル "%1" ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。スクリプトãŒä¸è¦ãªå ´åˆã€ã‚¹ã‚¯ãƒªãƒ—トファイルã®è¨å®šã‚’消去ã—ã¦ã¿ã¦ãã ã•ã„。ãã†ã™ã‚Œã°ã“ã®è¦å‘ŠãŒå‡ºã‚‹ã®ã‚’回é¿ã§ãã¾ã™ã€‚ </translation> </message> <message> <source>Running requested...</source> @@ -19134,10 +18900,6 @@ You can choose between waiting longer or aborting debugging.</source> <translation>デãƒãƒƒã‚¬åˆæœŸåŒ–スクリプトãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> </message> <message> - <source>The debugger settings point to a script file at '%1' which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source> - <translation>デãƒãƒƒã‚¬ã«è¨å®šã•ã‚ŒãŸã‚¹ã‚¯ãƒªãƒ—トファイル '%1' ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。もã—スクリプトファイルãŒä¸è¦ã§ã—ãŸã‚‰ã€ã‚¹ã‚¯ãƒªãƒ—トファイルã®è¨å®šã‚’消去ã—ã¦ã¿ã¦ãã ã•ã„。ãã†ã™ã‚Œã°ã“ã®è¦å‘ŠãŒå‡ºã‚‹ã®ã‚’回é¿ã§ãã¾ã™ã€‚ </translation> - </message> - <message> <source>GDB I/O Error</source> <translation>GDB I/O エラー</translation> </message> @@ -19384,6 +19146,14 @@ markers in the source code editor.</source> <translation><html><head/><body><p>ã“ã“ã«å…¥åŠ›ã•ã‚ŒãŸ GDB ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ Qt Creator ãŒãƒ‡ãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã‚’èªã¿è¾¼ã‚“ã§å®Œå…¨ã«åˆæœŸåŒ–ã—ãŸå¾Œã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚ã•ã‚‰ã«è¿½åŠ ã®ãƒ‡ãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã‚’èªã¿è¾¼ã‚“ã ã‚Šã€æ—¢å˜ã®ã‚‚ã®ã‚’ä¿®æ£ã—ãŸã‚Šã§ãã¾ã™ã€‚</p>%1</body></html></translation> </message> <message> + <source>Extra Debugging Helpers</source> + <translation>è¿½åŠ ã®ãƒ‡ãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘</translation> + </message> + <message> + <source>Path to a Python file containing additional data dumpers.</source> + <translation>è¿½åŠ ã™ã‚‹ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºæ©Ÿèƒ½ã‚’æŒã¤ Python ファイルã¸ã®ãƒ‘スã§ã™ã€‚</translation> + </message> + <message> <source>GDB</source> <translation>GDB</translation> </message> @@ -19754,12 +19524,12 @@ markers in the source code editor.</source> <context> <name>Debugger::Internal::RegisterMemoryView</name> <message> - <source>Memory at Register '%1' (0x%2)</source> - <translation>レジスタ '%1' (0x%2) ã®ãƒ¡ãƒ¢ãƒª</translation> + <source>Memory at Register "%1" (0x%2)</source> + <translation>レジスタ "%1" (0x%2) ã®æŒ‡ã™ãƒ¡ãƒ¢ãƒª</translation> </message> <message> - <source>Register '%1'</source> - <translation>レジスタ '%1'</translation> + <source>Register "%1"</source> + <translation>レジスタ "%1"</translation> </message> </context> <context> @@ -19909,13 +19679,6 @@ Stepping into the module or setting breakpoints by file and line is expected to </message> </context> <context> - <name>Debugger::Internal::ModulesWindow</name> - <message> - <source>Modules</source> - <translation>モジュール</translation> - </message> -</context> -<context> <name>Debugger::Internal::OutputCollector</name> <message> <source>Cannot create temporary file: %1</source> @@ -19933,10 +19696,6 @@ Stepping into the module or setting breakpoints by file and line is expected to <context> <name>Debugger::Internal::PdbEngine</name> <message> - <source>Unable to start pdb '%1': %2</source> - <translation>Pdb '%1' を開始ã§ãã¾ã›ã‚“: %2</translation> - </message> - <message> <source>Adapter start failed</source> <translation>アダプタã®é–‹å§‹ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> </message> @@ -19949,24 +19708,28 @@ Stepping into the module or setting breakpoints by file and line is expected to <translation>実行ã—よã†ã¨ã—ã¦ã„ã¾ã™...</translation> </message> <message> - <source>'%1' contains no identifier</source> - <translation>'%1' ã«è˜åˆ¥åãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> - </message> - <message> <source>String literal %1</source> <translation>æ–‡å—列リテラル %1</translation> </message> <message> - <source>Cowardly refusing to evaluate expression '%1' with potential side effects</source> - <translation>副作用ã®å¯èƒ½æ€§ãŒã‚る為ã€å¼ '%1' ã®è©•ä¾¡ã‚’è¡Œã„ã¾ã›ã‚“</translation> - </message> - <message> <source>Pdb I/O Error</source> <translation>Pdb I/O エラー</translation> </message> <message> - <source>The Pdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source> - <translation>Pdb プãƒã‚»ã‚¹ã®é–‹å§‹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚Pdb コマンド '%1' ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ã‚³ãƒžãƒ³ãƒ‰ã‚’èµ·å‹•ã™ã‚‹ç‚ºã®ãƒ‘ーミッションãŒãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> + <source>Unable to start pdb "%1": %2</source> + <translation>Pdb "%1" ã‚’èµ·å‹•ã§ãã¾ã›ã‚“: %2</translation> + </message> + <message> + <source>"%1" contains no identifier</source> + <translation>"%1" ã«è˜åˆ¥åãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> + </message> + <message> + <source>Cowardly refusing to evaluate expression "%1" with potential side effects</source> + <translation>副作用ãŒç™ºç”Ÿã™ã‚‹å¯èƒ½æ€§ãŒã‚る為ã€å¼ "%1" ã®è©•ä¾¡ã‚’è¡Œã„ã¾ã›ã‚“</translation> + </message> + <message> + <source>The Pdb process failed to start. Either the invoked program "%1" is missing, or you may have insufficient permissions to invoke the program.</source> + <translation>Pdb プãƒã‚»ã‚¹ã®èµ·å‹•ã«å¤±æ•—ã—ã¾ã—ãŸã€‚Pdb コマンド "%1" ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ã‚³ãƒžãƒ³ãƒ‰ã‚’èµ·å‹•ã™ã‚‹æ¨©é™ãŒãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> <source>The Pdb process crashed some time after starting successfully.</source> @@ -19990,38 +19753,6 @@ Stepping into the module or setting breakpoints by file and line is expected to </message> </context> <context> - <name>Debugger::Internal::QmlAdapter</name> - <message> - <source>Connecting to debug server %1:%2</source> - <translation>デãƒãƒƒã‚°ã‚µãƒ¼ãƒãƒ¼ %1:%2 ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™</translation> - </message> - <message> - <source>Error: (%1) %2</source> - <comment>%1=error code, %2=error message</comment> - <translation>エラー: (%1) %2</translation> - </message> - <message> - <source>Disconnected.</source> - <translation>切æ–ã•ã‚Œã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Resolving host.</source> - <translation>ホストåを解決ã—ã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>Connecting to debug server.</source> - <translation>デãƒãƒƒã‚°ã‚µãƒ¼ãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>Connected.</source> - <translation>接続ã•ã‚Œã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Closing.</source> - <translation>é–‰ã˜ã¦ã„ã¾ã™ã€‚</translation> - </message> -</context> -<context> <name>Debugger::Internal::QmlCppEngine</name> <message> <source>The slave debugging engine required for combined QML/C++-Debugging could not be created: %1</source> @@ -20063,8 +19794,8 @@ Do you want to retry?</source> <translation>QML デãƒãƒƒã‚¬: リモートホストãŒæŽ¥ç¶šã‚’é–‰ã˜ã¾ã—ãŸã€‚</translation> </message> <message> - <source>QML Debugger: Could not connect to service '%1'.</source> - <translation>QML デãƒãƒƒã‚¬: サービス '%1' ã«æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>QML Debugger: Could not connect to service "%1".</source> + <translation>QML デãƒãƒƒã‚¬: サービス "%1" ã«æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>JS Source for %1</source> @@ -20151,8 +19882,8 @@ Do you want to retry?</source> <translation><p>catch ã•ã‚Œã¦ã„ãªã„例外ãŒç™ºç”Ÿã—ã¾ã—ãŸ:</p><p>%1</p></translation> </message> <message> - <source><p>An uncaught exception occurred in '%1':</p><p>%2</p></source> - <translation><p>catch ã•ã‚Œã¦ã„ãªã„例外㌠'%1' ã§ç™ºç”Ÿã—ã¾ã—ãŸ:</p><p>%2</p></translation> + <source><p>An uncaught exception occurred in "%1":</p><p>%2</p></source> + <translation><p>catch ã•ã‚Œã¦ã„ãªã„例外㌠"%1" ã§ç™ºç”Ÿã—ã¾ã—ãŸ:</p><p>%2</p></translation> </message> <message> <source>Uncaught Exception</source> @@ -20226,13 +19957,6 @@ Do you want to retry?</source> </message> </context> <context> - <name>Debugger::Internal::RegisterWindow</name> - <message> - <source>Registers</source> - <translation>レジスタ</translation> - </message> -</context> -<context> <name>Debugger::Internal::CacheDirectoryDialog</name> <message> <source>Select Local Cache Folder</source> @@ -20247,16 +19971,16 @@ Do you want to retry?</source> <translation>æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã®é‡è¤‡</translation> </message> <message> - <source>A file named '%1' already exists.</source> - <translation>'%1' ã¨ã„ã†åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚</translation> + <source>A file named "%1" already exists.</source> + <translation>"%1" ã¨ã„ã†åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚</translation> </message> <message> - <source>Cannot Create</source> - <translation>作æˆä¸å¯</translation> + <source>The folder "%1" could not be created.</source> + <translation>フォルダ "%1" を作æˆã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>The folder '%1' could not be created.</source> - <translation>フォルダ '%1' を作æˆã§ãã¾ã›ã‚“。</translation> + <source>Cannot Create</source> + <translation>作æˆä¸å¯</translation> </message> </context> <context> @@ -20305,13 +20029,6 @@ Do you want to retry?</source> </message> </context> <context> - <name>Debugger::Internal::SnapshotWindow</name> - <message> - <source>Snapshots</source> - <translation>スナップショット</translation> - </message> -</context> -<context> <name>Debugger::Internal::SourceFilesHandler</name> <message> <source>Internal Name</source> @@ -20338,13 +20055,6 @@ Do you want to retry?</source> </message> </context> <context> - <name>Debugger::Internal::SourceFilesWindow</name> - <message> - <source>Source Files</source> - <translation>ソースファイル</translation> - </message> -</context> -<context> <name>Debugger::Internal::StackHandler</name> <message> <source>Address:</source> @@ -20495,13 +20205,6 @@ Do you want to retry?</source> </message> </context> <context> - <name>Debugger::Internal::StackWindow</name> - <message> - <source>Stack</source> - <translation>スタック</translation> - </message> -</context> -<context> <name>Debugger::Internal::ThreadsHandler</name> <message> <source>Thread&nbsp;id:</source> @@ -20573,13 +20276,6 @@ Do you want to retry?</source> </message> </context> <context> - <name>Debugger::Internal::ThreadsWindow</name> - <message> - <source>Threads</source> - <translation>スレッド</translation> - </message> -</context> -<context> <name>Debugger::Internal::WatchHandler</name> <message> <source>Name</source> @@ -20632,10 +20328,6 @@ Do you want to retry?</source> <translation>デãƒãƒƒã‚¬ - Qt Creator</translation> </message> <message> - <source><Edit></source> - <translation><編集></translation> - </message> - <message> <source><empty></source> <translation><空></translation> </message> @@ -20712,70 +20404,82 @@ Do you want to retry?</source> <translation>ツールãƒãƒƒãƒ—</translation> </message> <message> - <source><Edit></source> - <translation><編集></translation> + <source>Raw Data</source> + <translation>生データ</translation> </message> <message> - <source>returned value</source> - <translation>戻り値</translation> + <source>Latin1 String</source> + <translation>Latin1 æ–‡å—列</translation> </message> <message> - <source>Name</source> - <translation>åå‰</translation> + <source>UTF-8 String</source> + <translation>UTF-8 æ–‡å—列</translation> </message> <message> - <source>Value</source> - <translation>値</translation> + <source>Local 8-Bit String</source> + <translation>ãƒãƒ¼ã‚«ãƒ« 8bit æ–‡å—列</translation> </message> <message> - <source>Type</source> - <translation>åž‹</translation> + <source>UTF-16 String</source> + <translation>UTF-16 æ–‡å—列</translation> </message> - <message numerus="yes"> - <source>Array of %n items</source> - <translation> - <numerusform>%n 個ã®é…列</numerusform> - </translation> + <message> + <source>UCS-4 String</source> + <translation>UCS-4 æ–‡å—列</translation> </message> <message> - <source>Raw pointer</source> - <translation>生ãƒã‚¤ãƒ³ã‚¿</translation> + <source>Latin1 String in Separate Window</source> + <translation>別ウィンドウ㫠Latin1 æ–‡å—列</translation> </message> <message> - <source>Latin1 string</source> - <translation>Latin-1 æ–‡å—列</translation> + <source>UTF-8 String in Separate Window</source> + <translation>別ウィンドウ㫠UTF-8 æ–‡å—列</translation> </message> <message> - <source>UTF8 string</source> - <translation>UTF-8 æ–‡å—列</translation> + <source>Decimal Integer</source> + <translation>10進数</translation> </message> <message> - <source>Local 8bit string</source> - <translation>ãƒãƒ¼ã‚«ãƒ« 8bit æ–‡å—列</translation> + <source>Hexadecimal Integer</source> + <translation>16進数</translation> </message> <message> - <source>UTF16 string</source> - <translation>UTF-16 æ–‡å—列</translation> + <source>Binary Integer</source> + <translation>2進数</translation> </message> <message> - <source>UCS4 string</source> - <translation>UCS-4 æ–‡å—列</translation> + <source>Octal Integer</source> + <translation>8進数</translation> </message> <message> - <source>Decimal</source> - <translation>10進数</translation> + <source>Compact Float</source> + <translation>実数</translation> </message> <message> - <source>Hexadecimal</source> - <translation>16進数</translation> + <source>Scientific Float</source> + <translation>実数(科å¦è¡¨è¨˜æ³•)</translation> </message> <message> - <source>Binary</source> - <translation>2進数</translation> + <source>returned value</source> + <translation>戻り値</translation> </message> <message> - <source>Octal</source> - <translation>8進数</translation> + <source>Name</source> + <translation>åå‰</translation> + </message> + <message> + <source>Value</source> + <translation>値</translation> + </message> + <message> + <source>Type</source> + <translation>åž‹</translation> + </message> + <message numerus="yes"> + <source>Array of %n items</source> + <translation> + <numerusform>%n 個ã®é…列</numerusform> + </translation> </message> </context> <context> @@ -20835,10 +20539,38 @@ Do you want to retry?</source> <translation>å¼ã‚¨ãƒãƒªãƒ¥ã‚¨ãƒ¼ã‚¿ "%1" を削除</translation> </message> <message> + <source>Add Data Breakpoint at Pointer's Address</source> + <translation>ãƒã‚¤ãƒ³ã‚¿ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã«ãƒ‡ãƒ¼ã‚¿ãƒ–レークãƒã‚¤ãƒ³ãƒˆã‚’è¿½åŠ </translation> + </message> + <message> + <source>Add New Expression Evaluator...</source> + <translation>æ–°ã—ã„å¼ã‚¨ãƒãƒªãƒ¥ã‚¨ãƒ¼ã‚¿ã‚’è¿½åŠ ...</translation> + </message> + <message> <source>Change Local Display Format...</source> <translation>局所的ãªè¡¨ç¤ºå½¢å¼ã‚’変更...</translation> </message> <message> + <source>Copy View Contents to Clipboard</source> + <translation>表示内容をクリップボードã«ã‚³ãƒ”ー</translation> + </message> + <message> + <source>Open View Contents in Editor</source> + <translation>表示内容をエディタã§é–‹ã</translation> + </message> + <message> + <source>New Evaluated Expression</source> + <translation>æ–°ã—ã„評価済ã¿å¼</translation> + </message> + <message> + <source>Enter an expression to evaluate.</source> + <translation>評価ã™ã‚‹å¼ã‚’入力ã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Note: Evaluators will be re-evaluated after each step. For details check the <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">documentation</a>.</source> + <translation>注: å¼ã¯å„ステップ実行ã”ã¨ã«å†è©•ä¾¡ã•ã‚Œã¾ã™ã€‚詳細㯠<a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">ドã‚ュメント</a> ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</translation> + </message> + <message> <source>Treat All Characters as Printable</source> <translation>ã™ã¹ã¦ã®æ–‡å—ã‚’å°åˆ·å¯èƒ½æ–‡å—ã¨ã—ã¦æ‰±ã†</translation> </message> @@ -20875,10 +20607,6 @@ Do you want to retry?</source> <translation>自動</translation> </message> <message> - <source>Change Display for Type or Item...</source> - <translation>åž‹ã¾ãŸã¯é …ç›®ã®è¡¨ç¤ºå½¢å¼ã‚’変更...</translation> - </message> - <message> <source>Add Data Breakpoint...</source> <translation>データブレークãƒã‚¤ãƒ³ãƒˆã‚’è¿½åŠ ...</translation> </message> @@ -20911,18 +20639,10 @@ Do you want to retry?</source> <translation>å¼ã«ãƒ‡ãƒ¼ã‚¿ãƒ–レークãƒã‚¤ãƒ³ãƒˆã‚’è¨å®šã™ã‚‹ã¨ã€å¼ã«ã‚ˆã£ã¦å¾—られるアドレスã®ãƒ‡ãƒ¼ã‚¿ãŒå¤‰æ›´ã•ã‚ŒãŸæ™‚ã«ãƒ—ãƒã‚°ãƒ©ãƒ ãŒåœæ¢ã—ã¾ã™ã€‚</translation> </message> <message> - <source>Insert New Expression Evaluator</source> - <translation>æ–°ã—ã„å¼ã‚¨ãƒãƒªãƒ¥ã‚¨ãƒ¼ã‚¿ã‚’挿入</translation> - </message> - <message> <source>Select Widget to Add into Expression Evaluator</source> <translation>å¼ã‚¨ãƒãƒªãƒ¥ã‚¨ãƒ¼ã‚¿ã«è¿½åŠ ã™ã‚‹ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®é¸æŠž</translation> </message> <message> - <source>Remove All Expression Evaluators</source> - <translation>ã™ã¹ã¦ã®å¼ã‚¨ãƒãƒªãƒ¥ã‚¨ãƒ¼ã‚¿ã‚’削除</translation> - </message> - <message> <source>Open Memory Editor...</source> <translation>メモリエディタを開ã...</translation> </message> @@ -20963,56 +20683,21 @@ Do you want to retry?</source> <translation>表示ã—ã¦ã„るスタックレイアウトをメモリエディタã§é–‹ã</translation> </message> <message> - <source>Copy Contents to Clipboard</source> - <translation>内容をクリップボードã«ã‚³ãƒ”ー</translation> - </message> - <message> <source>Copy Value to Clipboard</source> <translation>値をクリップボードã«ã‚³ãƒ”ー</translation> </message> <message> - <source>Show View Contents in Editor</source> - <translation>エディタ上ã§å†…容を表示ã™ã‚‹</translation> - </message> - <message> <source>Close Editor Tooltips</source> <translation>エディタã®ãƒ„ールãƒãƒƒãƒ—ã‚’é–‰ã˜ã‚‹</translation> </message> <message> - <source>Enter Expression for Evaluator</source> - <translation>å¼ã‚¨ãƒãƒªãƒ¥ã‚¨ãƒ¼ã‚¿ã‚’入力</translation> - </message> - <message> - <source>Expression:</source> - <translation>å¼:</translation> - </message> - <message> <source>Locals & Expressions</source> <translation>ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¨å¼</translation> </message> </context> <context> - <name>Debugger::Internal::WatchWindow</name> - <message> - <source>Locals and Expressions</source> - <translation>ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¨å¼</translation> - </message> -</context> -<context> <name>Designer</name> <message> - <source>The generated header of the form '%1' could not be found. -Rebuilding the project might help.</source> - <translation>フォーム'%1' å‘ã‘ã«ç”Ÿæˆã•ã‚ŒãŸãƒ˜ãƒƒãƒ€ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ -プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªãƒ“ルドをãŠå¥¨ã‚ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>The generated header '%1' could not be found in the code model. -Rebuilding the project might help.</source> - <translation>フォーム'%1' å‘ã‘ã«ç”Ÿæˆã•ã‚ŒãŸãƒ˜ãƒƒãƒ€ãƒ¼ãŒã‚³ãƒ¼ãƒ‰ãƒ¢ãƒ‡ãƒ«å†…ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ -プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªãƒ“ルドをãŠå¥¨ã‚ã—ã¾ã™ã€‚</translation> - </message> - <message> <source>Form Editor</source> <translation>フォームエディタ</translation> </message> @@ -21024,6 +20709,18 @@ Rebuilding the project might help.</source> <source>Class Generation</source> <translation>クラス 生æˆ</translation> </message> + <message> + <source>The generated header of the form "%1" could not be found. +Rebuilding the project might help.</source> + <translation>フォーム"%1" ã‹ã‚‰ç”Ÿæˆã•ã‚ŒãŸãƒ˜ãƒƒãƒ€ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ +プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªãƒ“ルドをãŠå¥¨ã‚ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>The generated header "%1" could not be found in the code model. +Rebuilding the project might help.</source> + <translation>生æˆã•ã‚ŒãŸãƒ˜ãƒƒãƒ€ãƒ¼ãƒ•ã‚¡ã‚¤ãƒ« "%1" ãŒã‚³ãƒ¼ãƒ‰ãƒ¢ãƒ‡ãƒ«å†…ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ +プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªãƒ“ルドをãŠå¥¨ã‚ã—ã¾ã™ã€‚</translation> + </message> </context> <context> <name>Designer::Internal::FormClassWizardDialog</name> @@ -21031,14 +20728,6 @@ Rebuilding the project might help.</source> <source>Qt Designer Form Class</source> <translation>Qt Designer フォームクラス</translation> </message> - <message> - <source>Form Template</source> - <translation>フォームテンプレート</translation> - </message> - <message> - <source>Class Details</source> - <translation>クラスã®è©³ç´°</translation> - </message> </context> <context> <name>Designer::Internal::FormEditorFactory</name> @@ -21192,6 +20881,10 @@ Rebuilding the project might help.</source> <translation>フォームテンプレートをé¸æŠžã—ã¦ãã ã•ã„</translation> </message> <message> + <source>Form Template</source> + <translation>フォームテンプレート</translation> + </message> + <message> <source>%1 - Error</source> <translation>%1 - エラー</translation> </message> @@ -21202,24 +20895,13 @@ Rebuilding the project might help.</source> <source>Qt Designer Form</source> <translation>Qt Designer フォーム</translation> </message> - <message> - <source>Form Template</source> - <translation>フォームテンプレート</translation> - </message> -</context> -<context> - <name>Designer::Internal::FormFileWizardDialog</name> - <message> - <source>Location</source> - <translation>パス</translation> - </message> </context> <context> <name>Designer::Internal::QtCreatorIntegration</name> <message> - <source>The class containing '%1' could not be found in %2. + <source>The class containing "%1" could not be found in %2. Please verify the #include-directives.</source> - <translation>クラス '%1' 㯠%2 ã§è¦‹ã¤ã‘られã¾ã›ã‚“ã§ã—ãŸã€‚ + <translation>クラス "%1" ã‚’ %2 ã§è¦‹ã¤ã‘られã¾ã›ã‚“ã§ã—ãŸã€‚ #include ディレクティブを確èªã—ã¦ãã ã•ã„。</translation> </message> <message> @@ -21227,9 +20909,9 @@ Please verify the #include-directives.</source> <translation>スãƒãƒƒãƒˆã®æ¤œç´¢ä¸ã¾ãŸã¯è¿½åŠ ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>No documents matching '%1' could be found. + <source>No documents matching "%1" could be found. Rebuilding the project might help.</source> - <translation>'%1' ã«é©åˆã™ã‚‹ãƒ‰ã‚ュメントãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªãƒ“ルドã§å•é¡ŒãŒè§£æ±ºã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> + <translation>"%1" ã«é©åˆã™ã‚‹ãƒ‰ã‚ュメントãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªãƒ“ルドã§å•é¡ŒãŒè§£æ±ºã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> <source>Unable to add the method definition.</source> @@ -21239,6 +20921,10 @@ Rebuilding the project might help.</source> <context> <name>DiffEditor::DiffEditor</name> <message> + <source>Could not parse patch file "%1". The contents is not of unified diff format.</source> + <translation>パッãƒãƒ•ã‚¡ã‚¤ãƒ« "%1" を解æžã§ãã¾ã›ã‚“ã§ã—ãŸã€‚コンテンツãŒãƒ¦ãƒ‹ãƒ•ã‚¡ã‚¤ãƒ‰ diff フォーマットã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> <source>Ignore Whitespace</source> <translation>空白を無視</translation> </message> @@ -21247,6 +20933,10 @@ Rebuilding the project might help.</source> <translation>コンテã‚スト行:</translation> </message> <message> + <source>Reload Editor</source> + <translation>å†èªè¾¼æ™‚ã®ã‚¨ãƒ©ãƒ¼</translation> + </message> + <message> <source>Synchronize Horizontal Scroll Bars</source> <translation>水平スクãƒãƒ¼ãƒ«ãƒãƒ¼ã‚’åŒæœŸã™ã‚‹</translation> </message> @@ -21270,6 +20960,14 @@ Rebuilding the project might help.</source> <source>Show Change Description</source> <translation>差分ã®è¨˜è¿°ã‚’表示ã™ã‚‹</translation> </message> + <message> + <source>Switch to Side By Side Diff Editor</source> + <translation>サイドãƒã‚¤ã‚µã‚¤ãƒ‰ã®å·®åˆ†ã‚¨ãƒ‡ã‚£ã‚¿ã«åˆ‡ã‚Šæ›¿ãˆã‚‹</translation> + </message> + <message> + <source>Switch to Unified Diff Editor</source> + <translation>ユニファイド形å¼ã®å·®åˆ†ã‚¨ãƒ‡ã‚£ã‚¿ã«åˆ‡ã‚Šæ›¿ãˆã‚‹</translation> + </message> </context> <context> <name>DiffEditor</name> @@ -21294,7 +20992,6 @@ Rebuilding the project might help.</source> </message> <message> <source>Diff "%1", "%2"</source> - <extracomment>Editor title</extracomment> <translation>"%1†㨠"%2" ã®å·®åˆ†</translation> </message> </context> @@ -21324,8 +21021,8 @@ Rebuilding the project might help.</source> <translation>引数ã¯æ£ã®æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“: %1=%2</translation> </message> <message> - <source>Mark '%1' not set.</source> - <translation>'%1' ã¯ãƒžãƒ¼ã‚¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> + <source>Mark "%1" not set.</source> + <translation>"%1" ã¯ãƒžãƒ¼ã‚¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> <source>%1%2%</source> @@ -21565,14 +21262,14 @@ Rebuilding the project might help.</source> <numerusform>%n 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“</numerusform> </translation> </message> - <message> - <source>FakeVim Information</source> - <translation type="obsolete">FakeVim æƒ…å ±</translation> - </message> </context> <context> <name>GenericProjectManager::Internal::FilesSelectionWizardPage</name> <message> + <source>Files</source> + <translation>ファイル</translation> + </message> + <message> <source>Hide files matching:</source> <translation>éžè¡¨ç¤ºã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒ‘ターン:</translation> </message> @@ -21631,8 +21328,8 @@ Rebuilding the project might help.</source> <context> <name>GenericProjectManager::Internal::Manager</name> <message> - <source>Failed opening project '%1': Project is not a file</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> + <source>Failed opening project "%1": Project is not a file.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> </context> <context> @@ -21664,14 +21361,6 @@ Rebuilding the project might help.</source> <source>File Selection</source> <translation>ファイルé¸æŠž</translation> </message> - <message> - <source>Location</source> - <translation>パス</translation> - </message> - <message> - <source>Files</source> - <translation>ファイル</translation> - </message> </context> <context> <name>GenericProjectManager::Internal::GenericProjectWizard</name> @@ -21709,14 +21398,6 @@ Rebuilding the project might help.</source> <source>Cloning started...</source> <translation>クãƒãƒ¼ãƒ³ã‚’開始ã—ã¾ã—ãŸ...</translation> </message> - <message> - <source>Clones a Git repository and tries to load the contained project.</source> - <translation>Git リãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> - </message> - <message> - <source>Git Repository Clone</source> - <translation>Git リãƒã‚¸ãƒˆãƒªã‚¯ãƒãƒ¼ãƒ³</translation> - </message> </context> <context> <name>Git::CloneWizardPage</name> @@ -21811,18 +21492,6 @@ Rebuilding the project might help.</source> <translation>æ›´æ–°(&R)</translation> </message> <message> - <source>&Show...</source> - <translation>表示(&S)...</translation> - </message> - <message> - <source>Cherry &Pick...</source> - <translation>Cherry &Pick...</translation> - </message> - <message> - <source>&Checkout...</source> - <translation>ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ(&C)...</translation> - </message> - <message> <source>&Show</source> <translation>表示(&S)</translation> </message> @@ -21842,10 +21511,6 @@ Rebuilding the project might help.</source> <context> <name>Gerrit::Internal::GerritModel</name> <message> - <source><html><head/><body><table><tr><td>Subject</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>Owner</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Project</td><td>%5 (%6)</td></tr><tr><td>Status</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html></source> - <translation><html><head/><body><table><tr><td>件å</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>オーナー</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>プãƒã‚¸ã‚§ã‚¯ãƒˆ</td><td>%5 (%6)</td></tr><tr><td>ステータス</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html></translation> - </message> - <message> <source>Subject</source> <translation>件å</translation> </message> @@ -21870,23 +21535,43 @@ Rebuilding the project might help.</source> <translation>ステータス</translation> </message> <message> - <source>Parse error: '%1' -> %2</source> - <translation>解æžã‚¨ãƒ©ãƒ¼: '%1' -> %2</translation> + <source>Number</source> + <translation>番å·</translation> </message> <message> - <source>Parse error: '%1'</source> - <translation>解æžã‚¨ãƒ©ãƒ¼: '%1'</translation> + <source>Patch set</source> + <translation>パッãƒã‚»ãƒƒãƒˆ</translation> </message> <message> - <source>Parse error in line '%1'</source> - <translation>'%1' 行目ã§è§£æžã‚¨ãƒ©ãƒ¼</translation> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <source>Depends on</source> + <translation>ä¾å˜å…ˆ</translation> + </message> + <message> + <source>Needed by</source> + <translation>派生先</translation> + </message> + <message> + <source>Parse error: "%1" -> %2</source> + <translation>解æžã‚¨ãƒ©ãƒ¼: "%1" -> %2</translation> + </message> + <message> + <source>Parse error: "%1"</source> + <translation>解æžã‚¨ãƒ©ãƒ¼: "%1"</translation> + </message> + <message> + <source>Parse error in line "%1"</source> + <translation>"%1" 行目ã§è§£æžã‚¨ãƒ©ãƒ¼</translation> </message> </context> <context> <name>Gerrit::Internal::QueryContext</name> <message> - <source>Gerrit</source> - <translation>Gerrit</translation> + <source>Querying Gerrit</source> + <translation>Gerrit ã¸å•ã„åˆã‚ã›ä¸</translation> </message> <message> <source>Error running %1: %2</source> @@ -21935,10 +21620,6 @@ Would you like to terminate it?</source> <translation>HTTPS</translation> </message> <message> - <source>Always prompt for repository folder</source> - <translation>常ã«ãƒªãƒã‚¸ãƒˆãƒªãƒ•ã‚©ãƒ«ãƒ€ã®ç¢ºèªã‚’è¡Œã†</translation> - </message> - <message> <source>&Host:</source> <translation>ホスト(&H):</translation> </message> @@ -21951,23 +21632,6 @@ Would you like to terminate it?</source> <translation>SSH(&s):</translation> </message> <message> - <source>&Repository:</source> - <translation>リãƒã‚¸ãƒˆãƒª(&R):</translation> - </message> - <message> - <source>Default repository where patches will be applied.</source> - <translation>パッãƒã‚’é©ç”¨ã™ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒªãƒã‚¸ãƒˆãƒªã§ã™ã€‚</translation> - </message> - <message> - <source>Pr&ompt:</source> - <translation>プãƒãƒ³ãƒ—ト(&O):</translation> - </message> - <message> - <source>If checked, user will always be -asked to confirm the repository path.</source> - <translation>ãƒã‚§ãƒƒã‚¯ã—ãŸå ´åˆã€å¸¸ã«ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‘スã®ç¢ºèªã‚’è¡Œã„ã¾ã™ã€‚</translation> - </message> - <message> <source>&Port:</source> <translation>ãƒãƒ¼ãƒˆ(&P):</translation> </message> @@ -21985,8 +21649,8 @@ asked to confirm the repository path.</source> <context> <name>Gerrit::Internal::FetchContext</name> <message> - <source>Gerrit Fetch</source> - <translation>Gerrit Fetch</translation> + <source>Fetching from Gerrit</source> + <translation>Gerrit ã‹ã‚‰å–å¾—ä¸</translation> </message> <message> <source>%1 crashed.</source> @@ -22046,32 +21710,13 @@ were not verified among remotes in %3. Select different folder?</source> ã¯ãã‚Œãžã‚Œ %3 ã§ã¯æœªæ¤œè¨¼ã®ãƒªãƒ¢ãƒ¼ãƒˆã§ã™ã€‚別ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¾ã™ã‹?</translation> </message> <message> - <source>Enter Local Repository for '%1' (%2)</source> - <translation>'%1' (%2) ã®ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã‚’入力</translation> - </message> -</context> -<context> - <name>Git::Internal::GitDiffSwitcher</name> - <message> - <source>Switch to Text Diff Editor</source> - <translation>テã‚スト差分エディタã«åˆ‡ã‚Šæ›¿ãˆã‚‹</translation> - </message> - <message> - <source>Switch to Side By Side Diff Editor</source> - <translation>サイドãƒã‚¤ã‚µã‚¤ãƒ‰ã®å·®åˆ†ã‚¨ãƒ‡ã‚£ã‚¿ã«åˆ‡ã‚Šæ›¿ãˆã‚‹</translation> + <source>Enter Local Repository for "%1" (%2)</source> + <translation>"%1" (%2) ã®ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã‚’入力</translation> </message> </context> <context> <name>Git::Internal::GitDiffHandler</name> <message> - <source>Working tree</source> - <translation>作æ¥ãƒ„リー</translation> - </message> - <message> - <source>Index</source> - <translation>インデックス</translation> - </message> - <message> <source>Waiting for data...</source> <translation>データ待機ä¸...</translation> </message> @@ -22096,37 +21741,6 @@ were not verified among remotes in %3. Select different folder?</source> </message> </context> <context> - <name>Git::Internal::GitShowArgumentsWidget</name> - <message> - <source>oneline</source> - <translation>1è¡Œ</translation> - </message> - <message> - <source>short</source> - <translation>çŸã‚</translation> - </message> - <message> - <source>medium</source> - <translation>普通</translation> - </message> - <message> - <source>full</source> - <translation>全部</translation> - </message> - <message> - <source>fuller</source> - <translation>完全ã«å…¨éƒ¨</translation> - </message> - <message> - <source>email</source> - <translation>email ã®ã¿</translation> - </message> - <message> - <source>raw</source> - <translation>ç”»åƒãƒ‡ãƒ¼ã‚¿</translation> - </message> -</context> -<context> <name>Git::Internal::GitBlameArgumentsWidget</name> <message> <source>Omit Date</source> @@ -22187,10 +21801,6 @@ were not verified among remotes in %3. Select different folder?</source> <translation>データ待機ä¸...</translation> </message> <message> - <source>Git Diff</source> - <translation>Git 差分表示</translation> - </message> - <message> <source>Git Diff "%1"</source> <translation>Git 差分表示 "%1"</translation> </message> @@ -22264,7 +21874,7 @@ were not verified among remotes in %3. Select different folder?</source> </message> <message> <source>Invalid revision</source> - <translation>ä¸æ£ãªãƒªãƒ“ジョン</translation> + <translation>無効ãªãƒªãƒ“ジョン</translation> </message> <message> <source>Detached HEAD</source> @@ -22395,6 +22005,34 @@ Commit now?</source> <source>Cannot retrieve last commit data of repository "%1".</source> <translation>リãƒã‚¸ãƒˆãƒª "%1" ã®æœ€å¾Œã®ã‚³ãƒŸãƒƒãƒˆãƒ‡ãƒ¼ã‚¿ã‚’å—ä¿¡ã§ãã¾ã›ã‚“。</translation> </message> + <message> + <source>Stage Chunk</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’ステージã«è¿½åŠ </translation> + </message> + <message> + <source>Unstage Chunk</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’ステージã‹ã‚‰å‰Šé™¤</translation> + </message> + <message> + <source>Chunk successfully unstaged</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’ステージã‹ã‚‰å‰Šé™¤ã—ã¾ã—ãŸ</translation> + </message> + <message> + <source>Chunk successfully staged</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’ステージã«è¿½åŠ ã—ã¾ã—ãŸ</translation> + </message> + <message> + <source>Git Diff Projects</source> + <translation>Git プãƒã‚¸ã‚§ã‚¯ãƒˆã®å·®åˆ†</translation> + </message> + <message> + <source>Git Diff Repository</source> + <translation>Git リãƒã‚¸ãƒˆãƒªã®å·®åˆ†</translation> + </message> + <message> + <source>Git Diff Files</source> + <translation>Git ファイルã®å·®åˆ†</translation> + </message> <message numerus="yes"> <source>Committed %n file(s).</source> <translation> @@ -22511,11 +22149,11 @@ Commit now?</source> </message> <message> <source>Discard</source> - <translation>廃棄</translation> + <translation>ç ´æ£„</translation> </message> <message> <source>Discard (reset) local changes and execute %1.</source> - <translation>ãƒãƒ¼ã‚«ãƒ«ã®å¤‰æ›´ã‚’廃棄(リセット)ã—㦠%1 を実行ã—ã¾ã™ã€‚</translation> + <translation>ãƒãƒ¼ã‚«ãƒ«ã®å¤‰æ›´ã‚’ç ´æ£„(リセット)ã—㦠%1 を実行ã—ã¾ã™ã€‚</translation> </message> <message> <source>Execute %1 with local changes in working directory.</source> @@ -22576,12 +22214,12 @@ Commit now?</source> <context> <name>Gitorious::Internal::Gitorious</name> <message> - <source>Error parsing reply from '%1': %2</source> - <translation>'%1' ã‹ã‚‰ã®å¿œç”解æžä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> + <source>Error parsing reply from "%1": %2</source> + <translation>"%1" ã‹ã‚‰ã®å¿œç”解æžä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> </message> <message> - <source>Request failed for '%1': %2</source> - <translation>'%1' ã¸ã®è¦æ±‚ã«å¤±æ•—: %2</translation> + <source>Request failed for "%1": %2</source> + <translation>"%1" ã¸ã®è¦æ±‚ã«å¤±æ•—: %2</translation> </message> <message> <source>Open source projects that use Git.</source> @@ -22591,12 +22229,12 @@ Commit now?</source> <context> <name>Gitorious::Internal::GitoriousCloneWizard</name> <message> - <source>Clones a Gitorious repository and tries to load the contained project.</source> - <translation>Gitorious リãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + <source>Cloning</source> + <translation>クãƒãƒ¼ãƒ³ä¸</translation> </message> <message> - <source>Gitorious Repository Clone</source> - <translation>Gitorious リãƒã‚¸ãƒˆãƒªã‚¯ãƒãƒ¼ãƒ³</translation> + <source>Cloning started...</source> + <translation>クãƒãƒ¼ãƒ³ã‚’開始ã—ã¾ã—ãŸ...</translation> </message> </context> <context> @@ -22617,8 +22255,8 @@ Commit now?</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ</translation> </message> <message> - <source>Choose a project from '%1'</source> - <translation>'%1' ã‹ã‚‰ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é¸æŠž</translation> + <source>Choose a project from "%1"</source> + <translation>"%1" ã‹ã‚‰ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é¸æŠž</translation> </message> </context> <context> @@ -23083,8 +22721,8 @@ Commit now?</source> <context> <name>Git::Internal::GitSettings</name> <message> - <source>The binary '%1' could not be located in the path '%2'</source> - <translation>パス '%2' ã‹ã‚‰å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ« '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> + <source>The binary "%1" could not be located in the path "%2"</source> + <translation>パス "%2" ã‹ã‚‰å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ« "%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> </message> </context> <context> @@ -23207,10 +22845,10 @@ Commit now?</source> <translation>マージã®è¡çª</translation> </message> <message> - <source>%1 merge conflict for '%2' + <source>%1 merge conflict for "%2" Local: %3 Remote: %4</source> - <translation>%1 マージ㯠'%2' ã§è¡çªã—ã¾ã—㟠+ <translation>%1 マージ㯠"%2" ã§è¡çªã—ã¾ã—㟠ãƒãƒ¼ã‚«ãƒ«: %3 リモート: %4</translation> </message> @@ -23254,11 +22892,11 @@ Remote: %4</source> <context> <name>Git::Internal::SettingsPageWidget</name> <message> - <source>Set the environment variable HOME to '%1' + <source>Set the environment variable HOME to "%1" (%2). This causes msysgit to look for the SSH-keys in that location instead of its installation directory when run outside git bash.</source> - <translation>環境変数 HOME ã‚’ '%1' ã«è¨å®šã—ã¦ãã ã•ã„。 + <translation>環境変数 HOME ã‚’ "%1" ã«è¨å®šã—ã¦ãã ã•ã„。 (%2) msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã®ä»£ã‚ã‚Šã« ãã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†…㧠SSH éµã‚’探索ã™ã‚‹ã‹ã‚‰ã§ã™ã€‚</translation> @@ -23268,8 +22906,8 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>è¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> <message> - <source>currently set to '%1'</source> - <translation>ç¾åœ¨ã¯ '%1' ã«ã•ã‚Œã¦ã„ã¾ã™</translation> + <source>currently set to "%1"</source> + <translation>ç¾åœ¨ã¯ "%1" ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™</translation> </message> <message> <source>Git Repository Browser Command</source> @@ -23338,21 +22976,26 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ </message> </context> <context> - <name>Help::Internal::ExternalHelpWindow</name> + <name>Help</name> <message> - <source>Show Sidebar</source> - <translation>サイドãƒãƒ¼ã‚’表示ã™ã‚‹</translation> + <source>Help</source> + <translation>ヘルプ</translation> </message> <message> - <source>Qt Creator Offline Help</source> - <translation>Qt Creator オフラインヘルプ</translation> + <source>Error loading page</source> + <translation>ページèªã¿è¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼</translation> </message> -</context> -<context> - <name>Help</name> <message> - <source>Help</source> - <translation>ヘルプ</translation> + <source><p>Check that you have the corresponding documentation set installed.</p></source> + <translation><p>対応ã™ã‚‹ãƒ‰ã‚ュメントセットãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。</p></translation> + </message> + <message> + <source>Error loading: %1</source> + <translation>èªã¿è¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %1</translation> + </message> + <message> + <source>The page could not be found</source> + <translation>ページãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> </message> </context> <context> @@ -23508,18 +23151,6 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>フィルタãªã—</translation> </message> <message> - <source>Go to Help Mode</source> - <translation>ヘルプモードã«ç§»è¡Œ</translation> - </message> - <message> - <source>Previous</source> - <translation>戻る</translation> - </message> - <message> - <source>Next</source> - <translation>次ã¸</translation> - </message> - <message> <source><html><head><title>No Documentation</title></head><body><br/><center><b>%1</b><br/>No documentation available.</center></body></html></source> <translation><html><head><title>ドã‚ュメントãŒã‚ã‚Šã¾ã›ã‚“</title></head><body><br/><center><b>%1</b><br/>使用å¯èƒ½ãªãƒ‰ã‚ュメントãŒã‚ã‚Šã¾ã›ã‚“。</center></body></html></translation> </message> @@ -23539,70 +23170,11 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <context> <name>Help::Internal::HelpViewer</name> <message> - <source><title>about:blank</title></source> - <translation><title>about:blank</title></translation> - </message> - <message> - <source><html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br/><br/><h1>The page could not be found</h1><br/><h3>'%1'</h3></div></body></html></source> - <translation><html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>エラー 404...</title></head><body><div align="center"><br/><br/><h1>ページãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</h1><br/><h3>'%1'</h3></div></body></html></translation> - </message> - <message> - <source>Open Link</source> - <translation>リンクを開ã</translation> - </message> - <message> - <source>Open Link as New Page</source> - <translation>リンクを新ã—ã„ページã§é–‹ã</translation> - </message> - <message> - <source>Copy Link</source> - <translation>リンクをコピー</translation> - </message> - <message> - <source>Copy</source> - <translation>コピー</translation> - </message> - <message> - <source>Reload</source> - <translation>å†èªè¾¼</translation> - </message> - <message> - <source>Error loading: %1</source> - <translation>èªã¿è¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %1</translation> - </message> - <message> - <source>Unknown or unsupported Content!</source> + <source>Unknown or unsupported content!</source> <translation>ä¸æ˜Žã‹ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã§ã™ï¼</translation> </message> </context> <context> - <name>HelpViewer</name> - <message> - <source>Error 404...</source> - <translation>エラー 404...</translation> - </message> - <message> - <source>The page could not be found!</source> - <translation>ページãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼</translation> - </message> - <message> - <source><li>Check that you have one or more documentation sets installed.</li></source> - <translation><li>1ã¤ä»¥ä¸Šã®ãƒ‰ã‚ュメントセットãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。</li></translation> - </message> - <message> - <source><li>Check that you have installed the appropriate browser plug-in to support the file your loading.</li></source> - <translation><li>èªã¿è¾¼ã‚€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’サãƒãƒ¼ãƒˆã—ãŸé©åˆ‡ãªãƒ–ラウザプラグインãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。</li></translation> - </message> - <message> - <source><li>If you try to access a public URL, make sure to have a network connection.</li></source> - <translation><li>公開ã•ã‚Œã¦ã„ã‚‹ URL ã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹å ´åˆã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。</li></translation> - </message> - <message> - <source><li>If your computer or network is protected by a firewall or proxy, make sure the application is permitted to access the network.</li></source> - <translation><li>コンピュータã‚ã‚‹ã„ã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãŒãƒ•ã‚¡ã‚¤ãƒ¤ãƒ¼ã‚¦ã‚©ãƒ¼ãƒ«ã‚„プãƒã‚ã‚·ã§ä¿è·ã•ã‚Œã¦ã„ã‚‹å ´åˆã€ã‚¢ãƒ—リケーションãŒãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹æ¨©é™ãŒã‚ã‚‹ã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„。</li></translation> - </message> -</context> -<context> <name>Help::Internal::OpenPagesManager</name> <message> <source>Copy Full Path to Clipboard</source> @@ -23637,12 +23209,8 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <context> <name>Help::Internal::SearchWidget</name> <message> - <source>Indexing</source> - <translation>解æžä¸</translation> - </message> - <message> - <source>Indexing Documentation...</source> - <translation>ドã‚ュメント解æžä¸...</translation> + <source>Indexing Documentation</source> + <translation>ドã‚ュメントã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ä½œæˆä¸</translation> </message> <message> <source>Open Link</source> @@ -23795,8 +23363,12 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>無効ãªãƒ—ãƒã‚»ã‚¹ ID ã‚’å–å¾—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Run failed unexpectedly.</source> - <translation>予期ã›ãšå®Ÿè¡Œã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Run ended with error.</source> + <translation>エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Run ended.</source> + <translation>実行ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> </context> <context> @@ -23839,6 +23411,10 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <source>The Info.plist might be incorrect.</source> <translation>Info.plist ãŒæ£ã—ããªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</translation> </message> + <message> + <source>The provisioning profile "%1" (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source> + <translation>アプリケーションã®ç½²åã«ä½¿ç”¨ã™ã‚‹ãŸã‚ã«æº–å‚™ã•ã‚ŒãŸãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ« "%1" (%2) ãŒãƒ‡ãƒã‚¤ã‚¹ %3 (%4) ã‚’ã‚«ãƒãƒ¼ã—ã¦ã„ã¾ã›ã‚“。デプãƒã‚¤ã¯å¤±æ•—ã™ã‚‹ã§ã—ょã†ã€‚</translation> + </message> </context> <context> <name>Ios::Internal::IosDeployStepFactory</name> @@ -23848,13 +23424,6 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ </message> </context> <context> - <name>Ios::Internal::IosDeployStepWidget</name> - <message> - <source><b>Deploy to %1</b></source> - <translation><b>%1 ã«ãƒ‡ãƒ—ãƒã‚¤</b></translation> - </message> -</context> -<context> <name>Ios::Internal::IosDevice</name> <message> <source>iOS</source> @@ -23928,8 +23497,8 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>%2 㧠%1 を実行</translation> </message> <message> - <source>The .pro file '%1' is currently being parsed.</source> - <translation>.pro ファイル '%1' ã‚’ç¾åœ¨è§£æžã—ã¦ã„ã¾ã™ã€‚</translation> + <source>The .pro file "%1" is currently being parsed.</source> + <translation>.pro ファイル "%1" ã‚’ç¾åœ¨è§£æžã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> <source>Kit has incorrect device type for running on iOS devices.</source> @@ -23978,8 +23547,12 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>リモートプãƒã‚»ã‚¹ã‚’èµ·å‹•ã—ã¾ã™ã€‚</translation> </message> <message> - <source>Run ended unexpectedly.</source> - <translation>予期ã›ãšå®Ÿè¡ŒãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> + <source>Run ended with error.</source> + <translation>エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Run ended.</source> + <translation>実行ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> </context> <context> @@ -24115,14 +23688,6 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <source>Cloning started...</source> <translation>クãƒãƒ¼ãƒ³ã‚’開始ã—ã¾ã—ãŸ...</translation> </message> - <message> - <source>Clones a Mercurial repository and tries to load the contained project.</source> - <translation>Mercurial リãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> - </message> - <message> - <source>Mercurial Clone</source> - <translation>Mercurial クãƒãƒ¼ãƒ³</translation> - </message> </context> <context> <name>Mercurial::Internal::CloneWizardPage</name> @@ -24710,8 +24275,8 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>p4 ファイルãƒã‚° %1</translation> </message> <message> - <source>Could not start perforce '%1'. Please check your settings in the preferences.</source> - <translation>perforce '%1' を開始ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚è¨å®šã‚’確èªã—ã¦ãã ã•ã„。</translation> + <source>Could not start perforce "%1". Please check your settings in the preferences.</source> + <translation>perforce "%1" を開始ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚è¨å®šã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> <message> <source>Perforce did not respond within timeout limit (%1 ms).</source> @@ -24834,6 +24399,10 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <context> <name>ProjectExplorer::AbstractProcessStep</name> <message> + <source>Configuration is faulty. Check the Issues view for details.</source> + <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> + </message> + <message> <source>Starting: "%1" %2</source> <translation>èµ·å‹•ä¸: "%1" %2</translation> </message> @@ -24943,10 +24512,6 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <context> <name>ProjectExplorer::BaseProjectWizardDialog</name> <message> - <source>Location</source> - <translation>パス</translation> - </message> - <message> <source>untitled</source> <extracomment>File path suggestion for a new project. If you choose to translate it, make sure it is a valid path name without blanks and using only ascii chars.</extracomment> <translation>ç„¡é¡Œ</translation> @@ -25024,8 +24589,8 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ %1 ã®ãƒ“ルド・デプãƒã‚¤ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(ã‚ット %2)</translation> </message> <message> - <source>When executing step '%1'</source> - <translation>ステップ '%1' 実行ä¸</translation> + <source>When executing step "%1"</source> + <translation>ステップ "%1" 実行ä¸</translation> </message> <message> <source>Running steps for project %1...</source> @@ -25225,8 +24790,8 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>ç¾åœ¨ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆ</translation> </message> <message> - <source>Project '%1':</source> - <translation>'%1' プãƒã‚¸ã‚§ã‚¯ãƒˆ:</translation> + <source>Project "%1":</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1":</translation> </message> </context> <context> @@ -25330,11 +24895,6 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <context> <name>ProjectExplorer::CustomWizard</name> <message> - <source>Details</source> - <comment>Default short title for custom wizard page to be shown in the progress pane of the wizard.</comment> - <translation>詳細</translation> - </message> - <message> <source>Creates an application descriptor file.</source> <translation>アプリケーション記述ファイルを作æˆã—ã¾ã™ã€‚</translation> </message> @@ -25956,7 +25516,11 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <translation>"%1" ã‚’é–‹ã</translation> </message> <message> - <source>Open with</source> + <source>Open Project in "%1"</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’ "%1" ã§é–‹ã</translation> + </message> + <message> + <source>Open With</source> <translation>エディタを指定ã—ã¦é–‹ã</translation> </message> <message> @@ -26185,6 +25749,14 @@ msysgit ãŒã€git bash 外ã§å®Ÿè¡Œã•ã‚ŒãŸæ™‚ã«è‡ªèº«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ <context> <name>ProjectExplorer::Internal::KitManagerConfigWidget</name> <message> + <source><html><head/><body><p>The name of the kit suitable for generating directory names. This value is used for the variable <i>%1</i>, which for example determines the name of the shadow build directory.</p></body></html></source> + <translation><html><head/><body><p>ã‚ットã®åå‰ã¯ç”Ÿæˆã•ã‚Œã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåã«å¯¾å¿œã—ã¾ã™ã€‚ã“ã®å€¤ã¯å¤‰æ•° <i>%1</i> ã«ä½¿ç”¨ã•ã‚Œã€ä¾‹ãˆã°ã‚·ãƒ£ãƒ‰ã‚¦ãƒ“ルドディレクトリã®åå‰ã‚’決定ã™ã‚‹ã®ã«ç”¨ã„られã¾ã™ã€‚</p></body></html></translation> + </message> + <message> + <source>File system name:</source> + <translation>ファイルシステムå:</translation> + </message> + <message> <source>Kit name and icon.</source> <translation>ã‚ットã¨åå‰ã®ã‚¢ã‚¤ã‚³ãƒ³ã§ã™ã€‚</translation> </message> @@ -26708,8 +26280,24 @@ Please close all running instances of your application before starting a build.< <translation>ç¾åœ¨æœ‰åŠ¹ãªã‚ットã®ãƒ‡ãƒã‚¤ã‚¹ã§å®šç¾©ã—ã¦ã„ã‚‹ SSH ã®ãƒãƒ¼ãƒˆç•ªå·ã§ã™ã€‚</translation> </message> <message> - <source>The user name with which to log into the device in the currently active kit.</source> - <translation>ç¾åœ¨æœ‰åŠ¹ãªã‚ットã®ãƒ‡ãƒã‚¤ã‚¹ã«ãƒã‚°ã‚¤ãƒ³ã™ã‚‹éš›ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã§ã™ã€‚</translation> + <source>Building "%1" is disabled: %2<br></source> + <translation>"%1" ã¯ãƒ“ルドã§ãã¾ã›ã‚“: %2<br></translation> + </message> + <message> + <source>Building "%1" is disabled: %2</source> + <translation>"%1" ã®ãƒ“ルドã¯ç„¡åŠ¹ã§ã™: %2</translation> + </message> + <message> + <source>The project "%1" has no active kit.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ã«ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ットãŒã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>The kit "%1" for the project "%2" has no active run configuration.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%2" 用ã®ã‚ット "%1" ã«ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªå®Ÿè¡Œæ§‹æˆãŒã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>Cannot run "%1".</source> + <translation>"%1" を実行ã§ãã¾ã›ã‚“。</translation> </message> <message> <source>The private key file with which to authenticate when logging into the device in the currently active kit.</source> @@ -26740,22 +26328,6 @@ Please close all running instances of your application before starting a build.< <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Failed opening project '%1': Project already open.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆã¯æ—¢ã«é–‹ã„ã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <source>Failed opening project '%1': Settings could not be restored.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: è¨å®šãŒå¾©å…ƒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Failed opening project '%1': No plugin can open project type '%2'.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: 種類㌠'%2' ã§ã‚るプãƒã‚¸ã‚§ã‚¯ãƒˆã«å¯¾å¿œã—ãŸãƒ—ラグインãŒã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>Failed opening project '%1': Unknown project type.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: 未知ã®ç¨®é¡žã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã™ã€‚</translation> - </message> - <message> <source>Ignore All Errors?</source> <translation>ã™ã¹ã¦ã®ã‚¨ãƒ©ãƒ¼ã‚’無視ã—ã¾ã™ã‹?</translation> </message> @@ -26784,6 +26356,10 @@ Please close all running instances of your application before starting a build.< <translation>デãƒãƒƒã‚°</translation> </message> <message> + <source>The username with which to log into the device in the currently active kit.</source> + <translation>ç¾åœ¨æœ‰åŠ¹ãªã‚ットã®ãƒ‡ãƒã‚¤ã‚¹ã«ãƒã‚°ã‚¤ãƒ³ã™ã‚‹éš›ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã§ã™ã€‚</translation> + </message> + <message> <source>release</source> <translation>リリース</translation> </message> @@ -26792,6 +26368,19 @@ Please close all running instances of your application before starting a build.< <translation>ä¸æ˜Ž</translation> </message> <message> + <source>Project File Factory</source> + <comment>ProjectExplorer::ProjectFileFactory display name.</comment> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ãƒ•ã‚¡ã‚¯ãƒˆãƒª</translation> + </message> + <message> + <source>Failed to open project</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> + </message> + <message> + <source>All Projects</source> + <translation>ã™ã¹ã¦ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆ</translation> + </message> + <message> <source>New Project</source> <comment>Title of dialog</comment> <translation>æ–°ã—ã„プãƒã‚¸ã‚§ã‚¯ãƒˆ</translation> @@ -26801,6 +26390,22 @@ Please close all running instances of your application before starting a build.< <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> </message> <message> + <source>Failed opening project "%1": Project already open.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: æ—¢ã«ä½¿ç”¨ä¸ã§ã™ã€‚</translation> + </message> + <message> + <source>Failed opening project "%1": Settings could not be restored.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: è¨å®šãŒå¾©å…ƒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>Failed opening project "%1": No plugin can open project type "%2".</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: 種類㌠"%2" ã§ã‚るプãƒã‚¸ã‚§ã‚¯ãƒˆã«å¯¾å¿œã—ãŸãƒ—ラグインãŒã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>Failed opening project "%1": Unknown project type.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: 未知ã®ç¨®é¡žã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã™ã€‚</translation> + </message> + <message> <source>Unknown error</source> <translation>ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼</translation> </message> @@ -26856,10 +26461,6 @@ Do you want to ignore them?</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã«ãƒ“ルドè¨å®šãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>Building '%1' is disabled: %2<br></source> - <translation>'%1' ã¯ãƒ“ルドã§ãã¾ã›ã‚“: %2<br></translation> - </message> - <message> <source>No project loaded</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãŒèªã¿è¾¼ã¾ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> @@ -26872,10 +26473,6 @@ Do you want to ignore them?</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã«ãƒ“ルドè¨å®šãŒã‚ã‚Šã¾ã›ã‚“</translation> </message> <message> - <source>Building '%1' is disabled: %2</source> - <translation>'%1' ã®ãƒ“ルドã¯ç„¡åŠ¹ã§ã™: %2</translation> - </message> - <message> <source>Cancel Build && Close</source> <translation>ビルドをä¸æ¢ã—ã¦é–‰ã˜ã‚‹</translation> </message> @@ -26900,18 +26497,6 @@ Do you want to ignore them?</source> <translation>アクティブプãƒã‚¸ã‚§ã‚¯ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>The project '%1' has no active kit.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ã«ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ットãŒã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>The kit '%1' for the project '%2' has no active run configuration.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%2' 用ã®ã‚ット '%1' ã«ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªå®Ÿè¡Œæ§‹æˆãŒã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>Cannot run '%1'.</source> - <translation>'%1' を実行ã§ãã¾ã›ã‚“。</translation> - </message> - <message> <source>A build is still in progress.</source> <translation>ã¾ã ビルドä¸ã§ã™ã€‚</translation> </message> @@ -26984,16 +26569,7 @@ Do you want to ignore them?</source> <context> <name>ProjectExplorer::Internal::ProjectFileWizardExtension</name> <message> - <source><Implicitly Add></source> - <translation><自動的ã«è¿½åŠ ></translation> - </message> - <message> - <source>The files are implicitly added to the projects:</source> - <translation>ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è‡ªå‹•çš„ã«ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«è¿½åŠ ã•ã‚Œã¾ã™:</translation> - </message> - <message> <source><None></source> - <extracomment>No project selected</extracomment> <translation><ãªã—></translation> </message> <message> @@ -27005,24 +26581,24 @@ Do you want to ignore them?</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®å¤±æ•—</translation> </message> <message> - <source>Failed to add subproject '%1' -to project '%2'.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%2' ã«ã‚µãƒ–プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ã‚’ + <source>Failed to add subproject "%1" +to project "%2".</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%2" ã«ã‚µãƒ–プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ã‚’ è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>Failed to add one or more files to project -'%1' (%2).</source> - <translation>1ã¤ä»¥ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ã«è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—㟠+"%1" (%2).</source> + <translation>1ã¤ä»¥ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ã«è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—㟠(%2).</translation> </message> <message> - <source>A version control system repository could not be created in '%1'.</source> - <translation>'%1' ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ リãƒã‚¸ãƒˆãƒªã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>A version control system repository could not be created in "%1".</source> + <translation>"%1" ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <source>Failed to add '%1' to the version control system.</source> - <translation>'%1' ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã«è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Failed to add "%1" to the version control system.</source> + <translation>"%1" ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã«è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> </context> <context> @@ -27200,6 +26776,15 @@ to project '%2'.</source> <translation>é¸æŠžã•ã‚ŒãŸæ§‹æˆã‚’複製(&C)</translation> </message> <message> + <source>Clone Configuration</source> + <extracomment>Title of a the cloned RunConfiguration window, text of the window</extracomment> + <translation>構æˆã‚’クãƒãƒ¼ãƒ³</translation> + </message> + <message> + <source>New configuration name:</source> + <translation>æ–°ã—ã„構æˆå:</translation> + </message> + <message> <source>Remove Run Configuration?</source> <translation>実行構æˆã‚’削除ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> @@ -27295,8 +26880,8 @@ to project '%2'.</source> <translation>セッション %1 を復元ã§ãã¾ã›ã‚“</translation> </message> <message> - <source>Session</source> - <translation>セッション</translation> + <source>Loading Session</source> + <translation>セッションèªè¾¼ä¸</translation> </message> </context> <context> @@ -27306,37 +26891,13 @@ to project '%2'.</source> <translation>セッションã®åå‰ã‚’入力ã—ã¦ãã ã•ã„:</translation> </message> <message> - <source>Switch to</source> + <source>Switch To</source> <translation>切替</translation> </message> </context> <context> <name>ProjectExplorer::SettingsAccessor</name> <message> - <source>No valid .user file found for '%1'</source> - <translation>'%1' 用ã®æœ‰åŠ¹ãªãƒ¦ãƒ¼ã‚¶ãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> - </message> - <message> - <source><p>No valid settings file could be found for this installation of Qt Creator.</p><p>All settings files were either too new or too old to be read.</p></source> - <translation><p>ã“ã® Qt Creator ã®æœ‰åŠ¹ãªè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</p><p>ã™ã¹ã¦ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒå¤ã™ãŽã‚‹ã‹æ–°ã—ã™ãŽã‚‹ã‹ã®ã©ã¡ã‚‰ã‹ã§ã™ã€‚</p></translation> - </message> - <message> - <source>Settings File for '%1' from a different Environment?</source> - <translation>è¨å®šãƒ•ã‚¡ã‚¤ãƒ« '%1' ã¯ä»–ã®ç’°å¢ƒç”±æ¥ã®ã‚‚ã®ã§ã™ã‹?</translation> - </message> - <message> - <source><p>No .user settings file created by this instance of Qt Creator was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file '%1'?</p></source> - <translation><p>ã“ã® Qt Creator ã§ä½œæˆã•ã‚ŒãŸ .user è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</p><p>ä»–ã®ãƒžã‚·ãƒ³ä¸Šã§ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ä½œæ¥ã‚’è¡Œã£ãŸã‹ã€ä»¥å‰ã¯ç•°ãªã‚‹ãƒ‘スã§ã“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—ã¦ã„ã¾ã—ãŸã‹?</p><p>ã“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ« '%1' ã‚’èªã¿è¾¼ã¿ã¾ã™ã‹?</p></translation> - </message> - <message> - <source>Using Old Settings File for '%1'</source> - <translation>'%1' 用ã®å¤ã„è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ä½¿ç”¨</translation> - </message> - <message> - <source><p>The versioned backup '%1' of the .user settings file is used, because the non-versioned file was created by an incompatible version of Qt Creator.</p><p>Project settings changes made since the last time this version of Qt Creator was used with this project are ignored, and changes made now will <b>not</b> be propagated to the newer version.</p></source> - <translation><p>.user è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒäº’æ›æ€§ã®ãªã„ Qt Creator ã§ä½œæˆã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ä»˜ãã§ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã•ã‚Œã¦ã„㟠.user è¨å®šãƒ•ã‚¡ã‚¤ãƒ« '%1' を使用ã—ã¾ã™ã€‚</p><p>以å‰ã«ã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Creator ã§å¤‰æ›´ã•ã‚ŒãŸã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®è¨å®šã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ã“ã® Qt Creator ã§å¤‰æ›´ã—ãŸãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®è¨å®šã¯ã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯<b>é©ç”¨ã•ã‚Œã¾ã›ã‚“</b>。</p></translation> - </message> - <message> <source>Unsupported Shared Settings File</source> <translation>共有è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯æœªã‚µãƒãƒ¼ãƒˆ</translation> </message> @@ -27540,6 +27101,10 @@ to project '%2'.</source> <translation>ã‚ットã®é¸æŠž</translation> </message> <message> + <source>Kits</source> + <translation>ã‚ット</translation> + </message> + <message> <source>Qt Creator can use the following kits for project <b>%1</b>:</source> <comment>%1: Project name</comment> <translation>Qt Creator ã¯ä»¥ä¸‹ã®ã‚ットをプãƒã‚¸ã‚§ã‚¯ãƒˆ <b>%1</b> ã§ä½¿ç”¨ã§ãã¾ã™:</translation> @@ -27759,6 +27324,10 @@ to project '%2'.</source> <source>The source file name will be derived from the class name</source> <translation>ソースファイルã®åå‰ã¯ã‚¯ãƒ©ã‚¹åã‚’å…ƒã«ã—ã¾ã™</translation> </message> + <message> + <source>Details</source> + <translation>詳細</translation> + </message> </context> <context> <name>PythonEditor::Internal::ClassWizardDialog</name> @@ -27766,10 +27335,6 @@ to project '%2'.</source> <source>Python Class Wizard</source> <translation>Python クラスウィザード</translation> </message> - <message> - <source>Details</source> - <translation>詳細</translation> - </message> </context> <context> <name>QbsProjectManager::Internal::QbsBuildConfiguration</name> @@ -27853,8 +27418,8 @@ to project '%2'.</source> <translation>検出ã—㟠gcc プラットフォーム'%1' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <source>Architecture '%1' of compiler at '%1' not understood.</source> - <translation>'%2' ã®ã‚³ãƒ³ãƒ‘イラ㌠'%1' アーã‚テクãƒãƒ£ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。</translation> + <source>Architecture of compiler for platform '%1' at '%2' not understood.</source> + <translation>プラットフォーム'%1' 用ã®ã‚³ãƒ³ãƒ‘イラ('%2')ã®ã‚¢ãƒ¼ã‚テクãƒãƒ£ãŒä¸æ˜Žã§ã™ã€‚</translation> </message> <message> <source>Profile '%1' created for '%2'.</source> @@ -27877,6 +27442,10 @@ to project '%2'.</source> <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' をデフォルトã«ã—ã¾ã—ãŸã€‚</translation> </message> <message> + <source>Compiler '%1' not found</source> + <translation>コンパイラ '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> + </message> + <message> <source>Cannot create profile: MSVC toolchains can only be created via the auto-detection mechanism.</source> <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒä½œæˆã§ãã¾ã›ã‚“: MSVC ツールãƒã‚§ã‚¤ãƒ³ã¯è‡ªå‹•æ¤œå‡ºæ©Ÿèƒ½ã§ã®ã¿ä½œæˆã•ã‚Œã¾ã™ã€‚</translation> </message> @@ -27889,6 +27458,10 @@ to project '%2'.</source> <translation>'%1' を削除ã—ã¾ã™ã€‚</translation> </message> <message> + <source>Cleaning up was canceled.</source> + <translation>クリーンアップãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚</translation> + </message> + <message> <source> for configuration %1</source> <translation>æ§‹æˆ %1</translation> </message> @@ -27905,6 +27478,10 @@ to project '%2'.</source> <translation>空ディレクトリ '%1' ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> + <source>The working directory '%1' for process '%2' is invalid.</source> + <translation>プãƒã‚»ã‚¹ '%2' ã®ä½œæ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª '%1' ãŒä¸æ£ã§ã™ã€‚</translation> + </message> + <message> <source>Cannot create response file '%1'.</source> <translation>レスãƒãƒ³ã‚¹ãƒ•ã‚¡ã‚¤ãƒ« '%1' ãŒä½œæˆã§ãã¾ã›ã‚“。</translation> </message> @@ -27923,24 +27500,8 @@ to project '%2'.</source> <translation>プãƒã‚»ã‚¹ '%1' を開始ã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>The process '%1' crashed.</source> - <translation>プãƒã‚»ã‚¹ "%1" ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>The process '%1' timed out.</source> - <translation>プãƒã‚»ã‚¹ '%1' ãŒã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Error reading process output from '%1'.</source> - <translation>'%1' プãƒã‚»ã‚¹ã®å‡ºåŠ›èªè¾¼ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Error writing to process '%1'.</source> - <translation>プãƒã‚»ã‚¹ '%1' ã¸ã®æ›¸è¾¼ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Unknown process error running '%1'.</source> - <translation>'%1' プãƒã‚»ã‚¹ã®å®Ÿè¡Œä¸ã«æœªçŸ¥ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + <source>Process crashed.</source> + <translation>プãƒã‚»ã‚¹ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> </message> <message> <source>Process failed with exit code %1.</source> @@ -28097,6 +27658,10 @@ Usage: %2</source> <translation>使用方法: %1</translation> </message> <message> + <source>No profile specified and no default profile exists.</source> + <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒæŒ‡å®šã•ã‚Œã¦ãŠã‚‰ãšã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚‚å˜åœ¨ã—ã¾ã›ã‚“。</translation> + </message> + <message> <source>No such product '%1'.</source> <translation>プãƒãƒ€ã‚¯ãƒˆ '%1' ãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> @@ -28654,9 +28219,9 @@ Usage: %2</source> </translation> </message> <message> - <source> %1 [%3 <settings directory>] <compiler path> <profile name> + <source> %1 [%2 <settings directory>] <path to qmake> <profile name> </source> - <translation> %1 [%3 <è¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª>] <コンパイラã®ãƒ‘ス> <プãƒãƒ•ã‚¡ã‚¤ãƒ«å> + <translation> %1 [%2 <è¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª>] <qmake ã®ãƒ‘ス> <プãƒãƒ•ã‚¡ã‚¤ãƒ«å> </translation> </message> <message> @@ -28743,6 +28308,10 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation> 検出ã•ã‚ŒãŸ MSVC ã¯æœªçŸ¥ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 ã§ã™ã€‚</translation> </message> <message> + <source>Detecting the build environment from '%1' failed.</source> + <translation>'%1' ã‹ã‚‰ã®ãƒ“ルド環境ã®æ¤œå‡ºã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + </message> + <message> <source> MSVC detected: version %1 installed in %2</source> @@ -28841,6 +28410,10 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>グループã®ãƒ—レフィックスãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> + <source>Cannot update: Group prefix depends on properties.</source> + <translation>æ›´æ–°ã§ãã¾ã›ã‚“: グループプレフィックスã¯ãƒ—ãƒãƒ‘ティã«ä¾å˜ã—ã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> <source>File '%1' appears more than once.</source> <translation>ファイル '%1' ãŒäºŒå›žä»¥ä¸Šä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> @@ -28853,6 +28426,10 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>ファイル '%1' ã¯æ—¢ã«ã‚°ãƒ«ãƒ¼ãƒ— '%2' ã«å˜åœ¨ã—ã¾ã™ã€‚</translation> </message> <message> + <source>The following files cannot be removed from the project file, because they match wildcard patterns: %1</source> + <translation>以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ãƒ‘ターンã«åˆè‡´ã™ã‚‹ãŸã‚ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“: %1</translation> + </message> + <message> <source>The following files are not known to qbs: %1</source> <translation>ã“れら㯠qbs ã§ã¯æœªçŸ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™: %1</translation> </message> @@ -28921,8 +28498,16 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>%1 ã®ãƒ“ルドãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>The following products could not be built%1: %2.</source> - <translation>ã“れらã¯%1ã§ã¯ãƒ“ルドã•ã‚Œãªã„プãƒãƒ€ã‚¯ãƒˆã§ã™: %2.</translation> + <source>The following products could not be built%1:</source> + <translation>以下ã®ãƒ—ãƒãƒ€ã‚¯ãƒˆã¯%1ã§ã¯ãƒ“ルドã§ãã¾ã›ã‚“ã§ã—ãŸ:</translation> + </message> + <message> + <source> %1</source> + <translation> %1</translation> + </message> + <message> + <source> (for profile '%1')</source> + <translation> (プãƒãƒ•ã‚¡ã‚¤ãƒ«'%1'用)</translation> </message> <message> <source>Build canceled%1.</source> @@ -28941,30 +28526,26 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>プãƒãƒ€ã‚¯ãƒˆ '%1' 㯠'%2' ã«ä¾å˜ã—ã¦ã„ã¾ã™ãŒã€'%2' ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Can't find artifact '%0' in the list of source files.</source> - <translation>ソースファイルã®ä¸ã« artifact '%0' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>Cannot find artifact '%0' in the list of source files.</source> + <translation>ソースファイルã®ãƒªã‚¹ãƒˆã« artifact '%0' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>There's a transformer without commands.</source> + <source>There is a transformer without commands.</source> <translation>コマンドã®ãªã„ transformer ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> - <source>There's a rule without commands: %1.</source> - <translation>コマンドã®ãªã„ルールãŒã‚ã‚Šã¾ã™: %1.</translation> - </message> - <message> - <source>Error in Rule.Artifact fileName: </source> - <translation>Rule.Artifact fileName ã®ã‚¨ãƒ©ãƒ¼: </translation> - </message> - <message> <source>Conflicting rules for producing %1 %2 </source> <translation>%1 %2 を生æˆã™ã‚‹ãƒ«ãƒ¼ãƒ«ãŒè¡çªã—ã¦ã„ã¾ã™ </translation> </message> <message> - <source>The input artifacts are: %1</source> - <translation>入力ã•ã‚ŒãŸ artifact: %1</translation> + <source>There is a rule without commands: %1.</source> + <translation>コマンドã®ãªã„ルールãŒã‚ã‚Šã¾ã™: %1.</translation> + </message> + <message> + <source>Error in Rule.Artifact fileName at %1: %2</source> + <translation>Rule.Artifact fileName ã®ã‚¨ãƒ©ãƒ¼: %1: %2</translation> </message> <message> <source>Error while calling Rule.outputArtifacts: %1</source> @@ -28975,6 +28556,10 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>Rule.outputArtifacts ã¯ã‚ªãƒ–ジェクトã®é…列を返ã•ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“。</translation> </message> <message> + <source>Cannot set module property %1 on artifact %2.</source> + <translation>artifact %2 ã«ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãƒ—ãƒãƒ‘ティ %1 ã‚’è¨å®šã§ãã¾ã›ã‚“。</translation> + </message> + <message> <source>Build canceled.</source> <translation>ビルドãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚</translation> </message> @@ -29025,8 +28610,8 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>'%1' ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆä¸ã«ãƒ«ãƒ¼ãƒ—を検出ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Couldn't open '%1'.</source> - <translation>'%1' ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Cannot open '%1'.</source> + <translation>'%1' ã‚’é–‹ã‘ã¾ã›ã‚“。</translation> </message> <message> <source>No root item found in %1.</source> @@ -29057,16 +28642,16 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>import ã® URI ãŒç„¡åŠ¹ã§ã™ã€‚</translation> </message> <message> - <source>Can't import into the same name more than once.</source> - <translation>åŒã˜åå‰ã§å†ã³ import ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</translation> - </message> - <message> <source>Cannot reuse the name of built-in extension '%1'.</source> <translation>ビルトインエクステンションã®åå‰ '%1' ã¯å†åˆ©ç”¨ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Can't find imported file %0.</source> - <translation>import ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ« '%0' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>Cannot import into the same name more than once.</source> + <translation>åŒã˜åå‰ã«è¤‡æ•°å›ž import ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Cannot find imported file %0.</source> + <translation>import ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ« %0 ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> <source>Can only import .qbs and .js files</source> @@ -29113,8 +28698,8 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>アイテムã§ã¯ãªã„プãƒãƒ‘ティã«ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Incompatible qbs version %1. This is qbs %2.</source> - <translation>qbs ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 ã«äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。ã“ã® qbs 㯠%2 ã§ã™ã€‚</translation> + <source>Incompatible qbs language version %1. This is version %2.</source> + <translation>qbs ã®è¨€èªžãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ %2 ã§ã™ã€‚</translation> </message> <message> <source>Incompatible value type in unconditional value at %1.</source> @@ -29161,6 +28746,14 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>"references" ã«ã‚るファイルã®ãƒˆãƒƒãƒ—レベルアイテム㌠"%1" ã§ã™ãŒã€Product ã‹ Project ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> + <source>The 'profiles' property cannot be an empty list.</source> + <translation>'profiles' プãƒãƒ‘ティã¯ç©ºã«ã¯ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>The profile '%1' appears in the 'profiles' list twice, which is not allowed.</source> + <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ㌠'profiles' ã«è¤‡æ•°å€‹å˜åœ¨ã—ã¾ã™ã€‚é‡è¤‡ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> + </message> + <message> <source>Cycle detected while loading subproject file '%1'.</source> <translation>サブプãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®èªè¾¼ä¸ã«å¾ªç’°ã‚’検出ã—ã¾ã—ãŸã€‚</translation> </message> @@ -29189,6 +28782,10 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>複数ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’æŒã¤ Depends アイテム㫠id ãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> + <source>Empty 'profiles' list not allowed in 'Depends' item.</source> + <translation>'Depend' アイテム㮠'profiles' ã¯ç©ºã«ã¯ã§ãã¾ã›ã‚“。</translation> + </message> + <message> <source>Module %1 could not be loaded.</source> <translation>モジュール %1 ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> @@ -29233,26 +28830,34 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>二ã¤ç›®ã®ãƒ—ãƒãƒ€ã‚¯ãƒˆå®šç¾©ã®ä½ç½®ã€‚</translation> </message> <message> - <source>The product name '%1' collides with a module name.</source> - <translation>プãƒãƒ€ã‚¯ãƒˆå '%1' ãŒãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«åã¨è¡çªã—ã¦ã„ã¾ã™ã€‚</translation> + <source>The value of Project.minimumQbsVersion is not a valid version string.</source> + <translation>Project.minimumQbsVersion ã®å€¤ãŒç„¡åŠ¹ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³æ–‡å—列ã§ã™ã€‚</translation> </message> <message> - <source>The 'additionalFileTags' property is deprecated. Please use 'type' instead.</source> - <translation>'additionalFileTags' プãƒãƒ‘ティã®ä½¿ç”¨ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。代ã‚ã‚Šã« 'type' を使用ã—ã¦ãã ã•ã„。</translation> + <source>The project requires at least qbs version %1, but this is qbs version %2.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãŒè¦æ±‚ã™ã‚‹ qbs ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ %1 以上ã§ã™ãŒã€ã“ã® qbs ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ %2 ã§ã™ã€‚</translation> </message> <message> - <source>The 'additionalProductFileTags' property is deprecated. Please use 'additionalProductTypes' instead.</source> - <translation>'additionalProductFileTags' プãƒãƒ‘ティã®ä½¿ç”¨ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。代ã‚ã‚Šã« 'additionalProductTypes' を使用ã—ã¦ãã ã•ã„。</translation> + <source>The product name '%1' collides with a module name.</source> + <translation>プãƒãƒ€ã‚¯ãƒˆå '%1' ãŒãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«åã¨è¡çªã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> <source>Group.files and Group.fileTagsFilters are exclusive.</source> <translation>Group.files 㨠Group.fileTagsFilters ã¯æŽ’ä»–çš„ãªé …ç›®ã§ã™ã€‚</translation> </message> <message> + <source>Conflicting fileTagsFilter in Group items.</source> + <translation>Group アイテム㮠fileTagsFilter ãŒè¡çªã—ã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> <source>Group without files is not allowed.</source> <translation>ファイルã®å«ã¾ã‚Œãªã„グループã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> + <source>Duplicate source file '%1' at %2 and %3.</source> + <translation>ソースファイル '%1' ㌠%2 㨠%3 ã«é‡è¤‡ã—ã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> <source>Group %1</source> <translation>グループ %1</translation> </message> @@ -29273,12 +28878,28 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>Rule.outputArtifacts を指定ã—ãŸå ´åˆã¯ã€Rule.outputFileTags も指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> + <source>Artifact.condition is deprecated. If you need dynamic artifacts, use the outputArtifacts script instead of Artifact items.</source> + <translation>æ¡ä»¶ä»˜ã artifact ã®ä½¿ç”¨ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。動的㪠artifact ãŒå¿…è¦ãªå ´åˆã€Artifact アイテムã§ã¯ãªã outputArtifacts スクリプトを使用ã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Artifact.fileName and Artifact.filePath cannot both be set.</source> + <translation>Artifact.fileName 㨠Artifact.filePath ã®åŒæ–¹ã‚’åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>The property Artifact.fileName is deprecated. Please use Artifact.filePath instead.</source> + <translation>Artifact.fileName ã®ä½¿ç”¨ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。代ã‚ã‚Šã« Artifact.filePath を使用ã—ã¦ãã ã•ã„。</translation> + </message> + <message> <source>FileTagger.fileTags must not be empty.</source> <translation>FileTagger.fileTags を空ã«ã¯ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>The 'pattern' property is deprecated. Please use 'patterns' instead.</source> - <translation>'pattern' プãƒãƒ‘ティã®ä½¿ç”¨ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。代ã‚ã‚Šã« 'patterns' を使用ã—ã¦ãã ã•ã„。</translation> + <source>Artifact.filePath must not be empty.</source> + <translation>Artifact.filePath を空ã«ã¯ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Product dependency '%1' not found for profile '%2'.</source> + <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ« '%2' ã«ãƒ—ãƒãƒ€ã‚¯ãƒˆã®ä¾å˜é–¢ä¿‚ '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> <source>FileTagger.patterns must be a non-empty list.</source> @@ -29293,10 +28914,6 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>Transformer: '%0' ã¯ç„¡åŠ¹ãªåž‹ã®åã©ã‚‚ã§ã™ã€‚</translation> </message> <message> - <source>Artifact fileName must not be empty.</source> - <translation>Artifact ã® fileName を空ã«ã¯ã§ãã¾ã›ã‚“。</translation> - </message> - <message> <source>Product dependency '%1' not found.</source> <translation>プãƒãƒ€ã‚¯ãƒˆã®ä¾å˜é–¢ä¿‚ '%1' ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> </message> @@ -29333,12 +28950,12 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>ビルドグラフã®ã‚·ãƒªã‚¢ãƒ©ã‚¤ã‚ºã«å¤±æ•—ã—ã¾ã—ãŸ: %1</translation> </message> <message> - <source>pluginmanager: couldn't load plugin '%1': %2</source> - <translation>pluginmanager: プラグイン '%1' ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: %2</translation> + <source>Pluginmanager: Cannot load plugin '%1': %2</source> + <translation>pluginmanager: プラグイン '%1' ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“: %2</translation> </message> <message> - <source>pluginmanager: couldn't resolve symbol in '%1'.</source> - <translation>pluginmanager: '%1' ã®ã‚·ãƒ³ãƒœãƒ«ã‚’解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Pluginmanager: Cannot resolve symbol in '%1'.</source> + <translation>pluginmanager: '%1' ã®ã‚·ãƒ³ãƒœãƒ«ã‚’解決ã§ãã¾ã›ã‚“。</translation> </message> <message> <source>pluginmanager: no scanners returned from '%1'.</source> @@ -29361,18 +28978,6 @@ In case the compiler has an unusual file name, you may need to provide the &apos <translation>'%1' ã¯ç„¡åŠ¹ãªãƒ“ルドãƒãƒªã‚¨ãƒ¼ã‚·ãƒ§ãƒ³ã§ã™ã€‚'debug' ã‹ 'release' を使用ã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>No profile given and no default profile set. -Either set the configuration value 'defaultProfile' to a valid profile name -or specify the profile with the command line parameter 'profile:name'. -The following profiles are available: -%1</source> - <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒæœªæŒ‡å®šã§ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚‚è¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。 -è¨å®šã® 'defaultProfile' ã«æœ‰åŠ¹ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«åã‚’è¨å®šã™ã‚‹ã‹ã€ -コマンドライン引数㮠'profile:name' ã§ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¦ãã ã•ã„。 -以下ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒåˆ©ç”¨å¯èƒ½ã§ã™: -%1</translation> - </message> - <message> <source>Unknown or empty profile '%1'.</source> <translation>'%1' ã¯æœªçŸ¥ã‚ã‚‹ã„ã¯ç©ºã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚</translation> </message> @@ -29425,8 +29030,8 @@ The output is intended to be processed by other tools and has little value for h <translation>%1個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å‰Šé™¤ãŒè¦æ±‚ã•ã‚Œã¾ã—ãŸãŒã€ãƒªã‚¹ãƒˆã«ã¯ä¸€ã¤ã—ã‹ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>File '1' could not be found in the 'files' list.</source> - <translation>ファイル '1' ㌠'files' リストã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>File '%1' could not be found in the 'files' list.</source> + <translation>ファイル '%1' ㌠'files' ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>The project file parser failed to find the group item.</source> @@ -29501,32 +29106,56 @@ The output is intended to be processed by other tools and has little value for h <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: ディレクトリ '%2' を作æˆã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Setting up Qt profile '%1' failed: Cannot copy file '%2' into directory '%3' (%4).</source> - <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: ファイル '%2' をディレクトリ '%3' ã«ã‚³ãƒ”ーã§ãã¾ã›ã‚“(%4)。</translation> + <source>Setting up Qt profile '%1' failed: Cannot open '%1' (%2).</source> + <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: ファイル '%1' ã‚’é–‹ã‘ã¾ã›ã‚“(%2)。</translation> + </message> + <message> + <source>Could not determine whether Qt is a static build.</source> + <translation>Qt ãŒã‚¹ã‚¿ãƒ†ã‚£ãƒƒã‚¯ãƒ“ルドã•ã‚Œã¦ã„ã‚‹ã‹æ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>Error reading qconfig.h; could not determine whether Qt is using Cocoa or Carbon</source> + <translation>qconfig.h ã®èªè¾¼ä¸ã®ã‚¨ãƒ©ãƒ¼ã€‚Qt ㌠Cocoa 㨠Carbon ã®ã©ã¡ã‚‰ã‚’使用ã—ã¦ã„ã‚‹ã‹æ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> </message> <message> - <source>Setting up Qt profile '%1' failed: Cannot set write permission on file '%2' (%3).</source> - <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: ファイル '%2' ã«æ›¸è¾¼æ¨©é™ã‚’付与ã§ãã¾ã›ã‚“(%3)。</translation> + <source>Cannot find '%1'.</source> + <translation>'%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>Setting up Qt profile '%1' failed: Cannot open file '%1' (%2).</source> - <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%3' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: ファイル '%1' ã‚’é–‹ã‘ã¾ã›ã‚“(%2)。</translation> + <source>Cannot open temporary file '%1' for writing.</source> + <translation>書ãè¾¼ã¿ç”¨ä¸€æ™‚ファイル '%1' ã‚’é–‹ã‘ã¾ã›ã‚“。</translation> </message> <message> - <source>Setting up Qt profile '%1' failed: Could not remove the existing profile of the same name (%2).</source> - <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: åŒåã®æ—¢å˜ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã§ãã¾ã›ã‚“ã§ã—ãŸ(%2)。</translation> + <source>Failed to start '%1'.</source> + <translation>'%1' ã‚’èµ·å‹•ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Setting up Qt profile '%1' failed: Cannot adapt module file '%2' (%3).</source> - <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: モジュールファイル '%2' ãŒå¤‰æ›´ã§ãã¾ã›ã‚“(%3)。</translation> + <source>Process '%1' did not exit normally.</source> + <translation>プãƒã‚»ã‚¹ '%1' ã¯æ£å¸¸ã«çµ‚了ã—ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <source>Could not determine whether Qt is a static build.</source> - <translation>Qt ãŒã‚¹ã‚¿ãƒ†ã‚£ãƒƒã‚¯ãƒ“ルドã•ã‚Œã¦ã„ã‚‹ã‹æ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Failed to detect Visual Studio environment.</source> + <translation>Visual Studio 環境ã®æ¤œå‡ºã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Error reading qconfig.h; could not determine whether Qt is using Cocoa or Carbon</source> - <translation>qconfig.h ã®èªè¾¼ä¸ã®ã‚¨ãƒ©ãƒ¼ã€‚Qt ㌠Cocoa 㨠Carbon ã®ã©ã¡ã‚‰ã‚’使用ã—ã¦ã„ã‚‹ã‹æ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> + <source>Cannot lock build graph file '%1': Failed to create directory.</source> + <translation>ビルドグラフファイル '%1' ãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“: ディレクトリã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Cannot lock build graph file '%1': Already locked by '%2' (PID %3).</source> + <translation>ビルドグラフファイル '%1' ãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“: 既㫠'%2' ã«ã‚ˆã£ã¦ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™(PID %3)。</translation> + </message> + <message> + <source>Cannot lock build graph file '%1': Permission denied.</source> + <translation>ビルドグラフファイル '%1' ãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“: 権é™ãŒã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>Cannot lock build graph file '%1' (reason unknown).</source> + <translation>ビルドグラフファイル '%1' ãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“: (åŽŸå› ã¯ä¸æ˜Žã§ã™)。</translation> + </message> + <message> + <source>Setting up Qt profile '%1' failed: Cannot open file '%2' (%3).</source> + <translation>Qt プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸ: ファイル '%2' ã‚’é–‹ã‘ã¾ã›ã‚“(%3)。</translation> </message> </context> <context> @@ -29553,8 +29182,8 @@ The output is intended to be processed by other tools and has little value for h <context> <name>QbsProjectManager::Internal::QbsProject</name> <message> - <source>Evaluating</source> - <translation>評価ä¸</translation> + <source>Reading Project "%1"</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ã®èªè¾¼ä¸</translation> </message> </context> <context> @@ -29667,18 +29296,6 @@ The output is intended to be processed by other tools and has little value for h <source>Add Library</source> <translation>ライブラリã®è¿½åŠ </translation> </message> - <message> - <source>Type</source> - <translation>åž‹</translation> - </message> - <message> - <source>Details</source> - <translation>詳細</translation> - </message> - <message> - <source>Summary</source> - <translation>概è¦</translation> - </message> </context> <context> <name>QmakeProjectManager::Internal::LibraryTypePage</name> @@ -29728,10 +29345,18 @@ Neither the path to the library nor the path to its includes is added to the .pr <source>Links to a system library using pkg-config.</source> <translation>pkg-config を用ã„ã¦ã‚·ã‚¹ãƒ†ãƒ ライブラリをリンクã—ã¾ã™ã€‚</translation> </message> + <message> + <source>Type</source> + <translation>タイプ</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::DetailsPage</name> <message> + <source>Details</source> + <translation>詳細</translation> + </message> + <message> <source>Internal Library</source> <translation>内部ライブラリ</translation> </message> @@ -29807,14 +29432,6 @@ Neither the path to the library nor the path to its includes is added to the .pr <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source> <translation>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ Qt Designer カスタムウィジェットã‚ã‚‹ã„㯠Qt Designer カスタムウィジェットコレクションプãƒã‚¸ã‚§ã‚¯ãƒˆã‚’生æˆã—ã¾ã™ã€‚</translation> </message> - <message> - <source>Custom Widgets</source> - <translation>カスタムウィジェット</translation> - </message> - <message> - <source>Plugin Details</source> - <translation>プラグインã®è©³ç´°</translation> - </message> </context> <context> <name>QmakeProjectManager::Internal::PluginGenerator</name> @@ -29826,8 +29443,8 @@ Neither the path to the library nor the path to its includes is added to the .pr <context> <name>QmakeProjectManager::Internal::DesktopQmakeRunConfiguration</name> <message> - <source>The .pro file '%1' is currently being parsed.</source> - <translation>.pro ファイル '%1' ã‚’ç¾åœ¨è§£æžã—ã¦ã„ã¾ã™ã€‚</translation> + <source>The .pro file "%1" is currently being parsed.</source> + <translation>.pro ファイル "%1" ã‚’ç¾åœ¨è§£æžã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> <source>Qt Run Configuration</source> @@ -29930,14 +29547,6 @@ Neither the path to the library nor the path to its includes is added to the .pr <translation>Make</translation> </message> <message> - <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>ビルドã™ã‚‹ç‚ºã«ã¯ã‚³ãƒ³ãƒ‘イラã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ã‚ットオプションã§ã‚³ãƒ³ãƒ‘イラを構æˆã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> - <message> <source>Cannot find Makefile. Check your build settings.</source> <translation>Makefile ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。ビルドè¨å®šã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> @@ -30084,8 +29693,8 @@ Neither the path to the library nor the path to its includes is added to the .pr <translation>ファイル %1 ã®è§£æžä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚é™å‚ã—ã¾ã™ã€‚</translation> </message> <message> - <source>Could not find .pro file for sub dir '%1' in '%2'</source> - <translation>'%2' 㫠サブディレクトリ '%1' 用 .pro ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> + <source>Could not find .pro file for sub dir "%1" in "%2"</source> + <translation>"%2" 㫠サブディレクトリ "%1" 用 .pro ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> </message> </context> <context> @@ -30099,8 +29708,8 @@ Neither the path to the library nor the path to its includes is added to the .pr <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ<br><br>%1<br<br>以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã„ã‹ç·¨é›†ã•ã‚Œã¦ã„ã¾ã™ã€‚<br><br>%2<br><br>Qt Creator ã§ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ›´æ–°ã—ã¾ã™ã‹ã€‚変更内容ã¯å¤±ã‚ã‚Œã¾ã™ã€‚</translation> </message> <message> - <source>Failed opening project '%1': Project is not a file</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> + <source>Failed opening project "%1": Project is not a file</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> </message> <message> <source>QMake</source> @@ -30111,24 +29720,24 @@ Neither the path to the library nor the path to its includes is added to the .pr <context> <name>QmakeProjectManager::QmakeProject</name> <message> - <source>Evaluating</source> - <translation>評価ä¸</translation> + <source>Reading Project "%1"</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ã®èªè¾¼ä¸</translation> </message> <message> <source>No Qt version set in kit.</source> <translation>ã‚ット㫠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <source>The .pro file '%1' does not exist.</source> - <translation>.pro ファイル '%1' ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> + <source>The .pro file "%1" does not exist.</source> + <translation>.pro ファイル "%1" ãŒå˜åœ¨ã—ã¾ã›ã‚“。</translation> </message> <message> - <source>The .pro file '%1' is not part of the project.</source> - <translation>.pro ファイル '%1' ã¯ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«å±žã—ã¦ã„ã¾ã›ã‚“。</translation> + <source>The .pro file "%1" is not part of the project.</source> + <translation>.pro ファイル â€%1" ã¯ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«å±žã—ã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <source>The .pro file '%1' could not be parsed.</source> - <translation>.pro ファイル '%1' ã¯è§£æžã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>The .pro file "%1" could not be parsed.</source> + <translation>.pro ファイル "%1" を解æžã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> </context> <context> @@ -30221,10 +29830,6 @@ Neither the path to the library nor the path to its includes is added to the .pr <translation>qmake</translation> </message> <message> - <source>Configuration is faulty, please check the Issues view for details.</source> - <translation>構æˆãŒä¸å®Œå…¨ã§ã™ã€‚詳細ã¯å•é¡Œãƒšã‚¤ãƒ³ã§ç¢ºèªã—ã¦ãã ã•ã„。</translation> - </message> - <message> <source>Configuration unchanged, skipping qmake step.</source> <translation>構æˆãŒå¤‰æ›´ã•ã‚Œã¦ã„ãªã„為ã€qmake ステップをスã‚ップã—ã¾ã™ã€‚</translation> </message> @@ -30359,13 +29964,6 @@ Neither the path to the library nor the path to its includes is added to the .pr </message> </context> <context> - <name>QmakeProjectManager::AbstractMobileAppWizardDialog</name> - <message> - <source>Kits</source> - <translation>ã‚ット</translation> - </message> -</context> -<context> <name>QmakeProjectManager::Internal::ConsoleAppWizard</name> <message> <source>Qt Console Application</source> @@ -30408,6 +30006,10 @@ Preselects a desktop Qt for building the application if available.</source> <source>Specify basic information about the classes for which you want to generate skeleton source code files.</source> <translation>ソースコードã®ã‚¹ã‚±ãƒ«ãƒˆãƒ³ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ãŸã„クラスã®åŸºæœ¬çš„ãªæƒ…å ±ã‚’æŒ‡å®šã—ã¦ãã ã•ã„。</translation> </message> + <message> + <source>Details</source> + <translation>詳細</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::GuiAppWizard</name> @@ -30430,54 +30032,6 @@ Preselects a desktop Qt for building the application if available.</source> <source>This wizard generates a Qt Widgets Application project. The application derives by default from QApplication and includes an empty widget.</source> <translation>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ Qt ウイジェットアプリケーションプãƒã‚¸ã‚§ã‚¯ãƒˆã‚’生æˆã—ã¾ã™ã€‚アプリケーションã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ QApplication を使用ã—ã€ç©ºã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’æŒã¡ã¾ã™ã€‚</translation> </message> - <message> - <source>Details</source> - <translation>詳細</translation> - </message> -</context> -<context> - <name>QmakeProjectManager::AbstractMobileApp</name> - <message> - <source>Could not open template file '%1'.</source> - <translation>テンプレートファイル '%1' ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> -</context> -<context> - <name>QmakeProjectManager::Internal::Html5AppWizardDialog</name> - <message> - <source>New HTML5 Application</source> - <translation>æ–°ã—ã„ HTML5 アプリケーション</translation> - </message> - <message> - <source>This wizard generates a HTML5 Application project.</source> - <translation>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ HTML5 アプリケーションプãƒã‚¸ã‚§ã‚¯ãƒˆã‚’生æˆã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>HTML Options</source> - <translation>HTML オプション</translation> - </message> -</context> -<context> - <name>QmakeProjectManager::Internal::Html5AppWizard</name> - <message> - <source>HTML5 Application</source> - <translation>HTML5 アプリケーション</translation> - </message> - <message> - <source>Creates an HTML5 application project that can contain both HTML5 and C++ code and includes a WebKit view. - -You can build the application and deploy it on desktop and mobile target platforms.</source> - <translation>HTML5 㨠WebKit ã®è¡¨ç¤ºéƒ¨ã§ã‚ã‚‹ C++ コードをæŒã¤ HTML5 アプリケーションプãƒã‚¸ã‚§ã‚¯ãƒˆã‚’作æˆã—ã¾ã™ã€‚ - -デスクトップã¨ãƒ¢ãƒã‚¤ãƒ«ãƒ—ラットフォームをターゲットã¨ã—ã¦ã‚¢ãƒ—リケーションã®ãƒ“ルドã¨ãƒ‡ãƒ—ãƒã‚¤ãŒè¡Œãˆã¾ã™ã€‚</translation> - </message> -</context> -<context> - <name>QmakeProjectManager::Internal::Html5AppWizardOptionsPage</name> - <message> - <source>Select HTML File</source> - <translation>HTML ファイルã®é¸æŠž</translation> - </message> </context> <context> <name>QmakeProjectManager::Internal::LibraryWizard</name> @@ -30527,6 +30081,10 @@ You can build the application and deploy it on desktop and mobile target platfor <source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã§ä½¿ç”¨ã—ãŸã„モジュールをé¸æŠžã—ã¦ãã ã•ã„。デフォルトã§ã¯ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«æŽ¨å¥¨ã™ã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> + <message> + <source>Modules</source> + <translation>モジュール</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::QtQuickAppWizardDialog</name> @@ -30538,10 +30096,6 @@ You can build the application and deploy it on desktop and mobile target platfor <source>This wizard generates a Qt Quick Application project.</source> <translation>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ Qt QUick アプリケーションプãƒã‚¸ã‚§ã‚¯ãƒˆã‚’生æˆã—ã¾ã™ã€‚</translation> </message> - <message> - <source>Component Set</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚»ãƒƒãƒˆ</translation> - </message> </context> <context> <name>QmakeProjectManager::Internal::QtQuickAppWizard</name> @@ -30564,16 +30118,9 @@ You can build the application and deploy it on desktop and mobile target platfor <source>Qt Quick component set:</source> <translation>Qt Quick コンãƒãƒ¼ãƒãƒ³ãƒˆã‚»ãƒƒãƒˆ:</translation> </message> -</context> -<context> - <name>QmakeProjectManager::Internal::BaseQmakeProjectWizardDialog</name> <message> - <source>Modules</source> - <translation>モジュール</translation> - </message> - <message> - <source>Kits</source> - <translation>ã‚ット</translation> + <source>Component Set</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚»ãƒƒãƒˆ</translation> </message> </context> <context> @@ -30617,10 +30164,6 @@ You can build the application and deploy it on desktop and mobile target platfor <source>This wizard generates a Qt Unit Test consisting of a single source file with a test class.</source> <translation>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ãƒ†ã‚¹ãƒˆã‚¯ãƒ©ã‚¹ã‚’æŒã¤å˜ä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã§æ§‹æˆã•ã‚Œã‚‹ Qt ユニットテストを生æˆã—ã¾ã™ã€‚</translation> </message> - <message> - <source>Details</source> - <translation>詳細</translation> - </message> </context> <context> <name>QmlDesignerContextMenu</name> @@ -30768,6 +30311,10 @@ You can build the application and deploy it on desktop and mobile target platfor <source>Select parent: %1</source> <translation>親をé¸æŠž: %1</translation> </message> + <message> + <source>Step into: %1</source> + <translation>ステップイン: %1</translation> + </message> </context> <context> <name>TabViewToolAction</name> @@ -30775,16 +30322,9 @@ You can build the application and deploy it on desktop and mobile target platfor <source>Add Tab...</source> <translation>タブã®è¿½åŠ ...</translation> </message> -</context> -<context> - <name>QmlDesigner::TabViewDesignerAction</name> <message> - <source>Naming Error</source> - <translation>命åエラー</translation> - </message> - <message> - <source>Component already exists.</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Step into Tab</source> + <translation>タブã«ã‚¹ãƒ†ãƒƒãƒ—イン</translation> </message> </context> <context> @@ -30866,6 +30406,10 @@ You can build the application and deploy it on desktop and mobile target platfor <translation>SignalHandlerProperties ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ:</translation> </message> <message> + <source>Node selected:</source> + <translation>é¸æŠžã•ã‚ŒãŸãƒŽãƒ¼ãƒ‰:</translation> + </message> + <message> <source>Properties removed:</source> <translation>プãƒãƒ‘ティãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ:</translation> </message> @@ -31050,14 +30594,6 @@ You can build the application and deploy it on desktop and mobile target platfor <source>%1 already exists.</source> <translation>%1 ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚</translation> </message> - <message> - <source>Warning</source> - <translation>è¦å‘Š</translation> - </message> - <message> - <source>Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆ %2 ãŒå‰Šé™¤ã•ã‚Œã‚‹ã¨ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ %1 ã®è¦ªå関係ãŒå¤‰æ›´ã•ã‚Œã¾ã™ã€‚処ç†ã‚’続行ã—ã¾ã™ã‹ï¼Ÿ</translation> - </message> </context> <context> <name>QmlDesigner::NavigatorWidget</name> @@ -31067,12 +30603,12 @@ You can build the application and deploy it on desktop and mobile target platfor <translation>ナビゲータ</translation> </message> <message> - <source>Become first sibling of parent (CTRL + Left).</source> - <translation>親ã®æœ€åˆã®å…„弟ã«ã—ã¾ã™(CTRL + Left)。</translation> + <source>Become last sibling of parent (CTRL + Left).</source> + <translation>親ã®æœ€å¾Œã®å…„弟ã«ã—ã¾ã™(CTRL + Left)。</translation> </message> <message> - <source>Become child of first sibling (CTRL + Right).</source> - <translation>最åˆã®å…„弟ã®åã«ã—ã¾ã™(CTRL + Right)。</translation> + <source>Become child of last sibling (CTRL + Right).</source> + <translation>最後ã®å…„弟ã®åã«ã—ã¾ã™(CTRL + Right)。</translation> </message> <message> <source>Move down (CTRL + Down).</source> @@ -31207,57 +30743,20 @@ Ids must begin with a lowercase letter.</source> <context> <name>QmlDesigner::NodeInstanceServerProxy</name> <message> - <source>Cannot Start QML Puppet Executable</source> - <translation>QML Puppet ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> + <source>Cannot Start QML Emulation Layer (QML Puppet)</source> + <translation>QML エミュレーション層(QML パペット)ã‚’èµ·å‹•ã§ãã¾ã›ã‚“</translation> </message> <message> - <source>The executable of the QML Puppet process (%1) cannot be started. Please check your installation. QML Puppet is a process which runs in the background to render the items.</source> - <translation>QML Puppet プãƒã‚»ã‚¹ (%1) ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒèµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚インストールã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。QML Puppet ã¯ãƒãƒƒã‚¯ã‚°ãƒ©ãƒ³ãƒ‰ã§å‹•ä½œã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®æ画を行ã†ãƒ—ãƒã‚»ã‚¹ã§ã™ã€‚</translation> + <source>The executable of the QML emulation layer (QML Puppet) process cannot be started or does not respond.</source> + <translation>QML エミュレーション層(QML パペット)ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒèµ·å‹•ã§ããªã„ã‹ã€å¿œç”ã—ã¾ã›ã‚“。</translation> </message> <message> - <source>Wrong QML Puppet Executable Version</source> - <translation>ç•°ãªã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® QML Puppet</translation> + <source>QML Emulation Layer (QML Puppet) Crashed</source> + <translation>QML エミュレーション層(QML パペット)ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸ</translation> </message> <message> - <source>The QML Puppet version is incompatible with the Qt Creator version.</source> - <translation>QML Puppet ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ Qt Creator ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>Cannot Find QML Puppet Executable</source> - <translation>QML Puppet ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <source>The executable of the QML Puppet process (<code>%1</code>) cannot be found. Check your installation. QML Puppet is a process which runs in the background to render the items.</source> - <translation>QML Puppet プãƒã‚»ã‚¹ (%1) ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚インストールã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。QML Puppet ã¯ãƒãƒƒã‚¯ã‚°ãƒ©ãƒ³ãƒ‰ã§å‹•ä½œã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®æ画を行ã†ãƒ—ãƒã‚»ã‚¹ã§ã™ã€‚</translation> - </message> - <message> - <source>You can build <code>%1</code> yourself with Qt 5.2.0 or higher. The source can be found in <code>%2</code>.</source> - <extracomment>%1 Puppet binary name ("qmlpuppet", "qml2puppet"), %2 source path.</extracomment> - <translation><code>%1</code> 㯠Qt 5.2.0 以é™ã§ãƒ“ルドã§ãã¾ã™ã€‚ソース㯠<code>%2</code> ã«ã‚ã‚Šã¾ã™ã€‚</translation> - </message> - <message> - <source><code>%1</code> will be installed to the <code>bin</code> directory of your Qt version. Qt Quick Designer will check the <code>bin</code> directory of the currently active Qt version of your project.</source> - <translation><code>%1</code> ã¯å„ Qt ã® <code>bin</code> ディレクトリã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚Qt Quick Designer ã¯ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ç¾åœ¨æœ‰åŠ¹ãª Qt ã® <code>bin</code> ディレクトリを確èªã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>You can build <code>qml2puppet</code> yourself with Qt 5.2.0 or higher. The source can be found in <code>%1</code>.</source> - <translation type="obsolete"><code>qml2puppet</code> 㯠Qt 5.2.0 以é™ã§ãƒ“ルドã§ãã¾ã™ã€‚ソース㯠<code>%1</code> ã«ã‚ã‚Šã¾ã™ã€‚</translation> - </message> - <message> - <source><code>qml2puppet</code> will be installed to the <code>bin</code> directory of your Qt version. Qt Quick Designer will check the <code>bin</code> directory of the currently active Qt version of your project.</source> - <translation type="obsolete"><code>qml2puppet</code> ã¯å„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt ã® <code>bin</code> ディレクトリã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚Qt Quick Designer ã¯ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ç¾åœ¨æœ‰åŠ¹ãª Qt ã® <code>bin</code> ディレクトリを確èªã—ã¾ã™ã€‚</translation> - </message> - <message> - <source><code>qmlpuppet</code> will be installed to the <code>bin</code> directory of your Qt version. Qt Quick Designer will check the <code>bin</code> directory of the currently active Qt version of your project.</source> - <translation type="obsolete"><code>qml2puppet</code> ã¯å„ Qt ã® <code>bin</code> ディレクトリã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚Qt Quick Designer ã¯ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ç¾åœ¨æœ‰åŠ¹ãª Qt ã® <code>bin</code> ディレクトリを確èªã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>QML Puppet Crashed</source> - <translation>QML Puppet ã®ã‚¯ãƒ©ãƒƒã‚·ãƒ¥</translation> - </message> - <message> - <source>You are recording a puppet stream and the puppet crashed. It is recommended to reopen the Qt Quick Designer and start again.</source> - <translation>パペットãŒå‡ºåŠ›ã®å–å¾—ä¸ã«ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚Qt Quick Designer ã‚’å†åº¦é–‹ãã®ã‚’推奨ã—ã¾ã™ã€‚</translation> + <source>You are recording a puppet stream and the emulations layer crashed. It is recommended to reopen the Qt Quick Designer and start again.</source> + <translation>パペットã‹ã‚‰ã®å‡ºåŠ›ã®å–å¾—ä¸ã«ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å±¤ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚Qt Quick Designer ã‚’å†åº¦é–‹ãã®ã‚’推奨ã—ã¾ã™ã€‚</translation> </message> </context> <context> @@ -31349,10 +30848,6 @@ Ids must begin with a lowercase letter.</source> <source>Unsupported QtQuick version</source> <translation>サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® QtQuick</translation> </message> - <message> - <source>This .qml file contains features which are not supported by Qt Quick Designer</source> - <translation>ã“ã® .qml ファイル㯠Qt Quick Designer ã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„機能をå«ã‚“ã§ã„ã¾ã™</translation> - </message> </context> <context> <name>QmlDesigner::Internal::DocumentWarningWidget</name> @@ -31450,8 +30945,8 @@ Ids must begin with a lowercase letter.</source> <translation>ã™ã¹ã¦ã® "%1" ã‚’é¸æŠž</translation> </message> <message> - <source>Toggle Full Screen</source> - <translation>全画é¢è¡¨ç¤ºã®åˆ‡æ›¿</translation> + <source>Toggle Sidebars</source> + <translation>サイドãƒãƒ¼è¡¨ç¤ºã®åˆ‡æ›¿</translation> </message> <message> <source>&Restore Default View</source> @@ -31613,8 +31108,8 @@ QML コンãƒãƒ¼ãƒãƒ³ãƒˆã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚ªãƒ–ジェクトã¨ãã®ãƒ—ãƒã <translation>QML/JS 出ç¾ç®‡æ‰€:</translation> </message> <message> - <source>Searching</source> - <translation>検索ä¸</translation> + <source>Searching for Usages</source> + <translation>使用方法ã®æ¤œç´¢ä¸</translation> </message> </context> <context> @@ -31701,13 +31196,13 @@ QML コンãƒãƒ¼ãƒãƒ³ãƒˆã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚ªãƒ–ジェクトã¨ãã®ãƒ—ãƒã // コンãƒãƒ¼ãƒãƒ³ãƒˆã®ãƒ«ãƒ¼ãƒˆã‚¨ãƒ¬ãƒ¡ãƒ³ãƒˆå†…ã®ã™ã¹ã¦ã® 'parent' ã®ä½¿ç”¨ã‚’確èªã™ã‚‹ã€‚</translation> </message> <message> - <source>// Rename all outer uses of the id '%1' to '%2.item'.</source> - <translation>// id '%1' ã®å¤–部ã§ã®ä½¿ç”¨ã‚’ã™ã¹ã¦ ’%2.item' ã«å¤‰æ›´ã™ã‚‹ã€‚</translation> + <source>// Rename all outer uses of the id "%1" to "%2.item".</source> + <translation>// 外部ã§ã® id "%1" ã®ä½¿ç”¨ã‚’ã™ã¹ã¦ "%2.item" ã«å¤‰æ›´ã™ã‚‹ã€‚</translation> </message> <message> - <source>// Rename all outer uses of the id '%1' to '%2.item.%1'. + <source>// Rename all outer uses of the id "%1" to "%2.item.%1". </source> - <translation>// id '%1' ã®å¤–部ã§ã®ä½¿ç”¨ã‚’ã™ã¹ã¦ ’%2.item.%1' ã«å¤‰æ›´ã™ã‚‹ã€‚ + <translation>// 外部ã§ã® id "%1" ã®ä½¿ç”¨ã‚’ã™ã¹ã¦ "%2.item.%1" ã«å¤‰æ›´ã™ã‚‹ã€‚ </translation> </message> </context> @@ -31850,12 +31345,16 @@ Do you want to retry?</source> å†è©¦è¡Œã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <source>QML Profiler: Connecting to %1:%2 ...</source> - <translation>QML Profiler: %1:%2 ã«æŽ¥ç¶šä¸...</translation> + <source>Debug connection opened</source> + <translation>デãƒãƒƒã‚°æŽ¥ç¶šã‚’é–‹ãã¾ã—ãŸ</translation> </message> <message> - <source>QML Profiler: connected and running</source> - <translation>QML Profiler: 接続ã—動作ä¸</translation> + <source>Debug connection closed</source> + <translation>デãƒãƒƒã‚°æŽ¥ç¶šã‚’切æ–ã—ã¾ã—ãŸ</translation> + </message> + <message> + <source>Failed to connect!</source> + <translation>接続ã«å¤±æ•—ã—ã¾ã—ãŸ!</translation> </message> </context> <context> @@ -31877,35 +31376,6 @@ Do you want to retry?</source> </message> </context> <context> - <name>QmlProfiler::Internal::QmlProfilerEventsModelProxy</name> - <message> - <source><program></source> - <translation><プãƒã‚°ãƒ©ãƒ ></translation> - </message> - <message> - <source>Main Program</source> - <translation>メインプãƒã‚°ãƒ©ãƒ </translation> - </message> -</context> -<context> - <name>QmlProfiler::Internal::QmlProfilerEventParentsModelProxy</name> - <message> - <source><program></source> - <translation><プãƒã‚°ãƒ©ãƒ ></translation> - </message> - <message> - <source>Main Program</source> - <translation>メインプãƒã‚°ãƒ©ãƒ </translation> - </message> -</context> -<context> - <name>QmlProfiler::Internal::QmlProfilerEventChildrenModelProxy</name> - <message> - <source><program></source> - <translation><プãƒã‚°ãƒ©ãƒ ></translation> - </message> -</context> -<context> <name>QmlProfiler::Internal::QmlProfilerEventsWidget</name> <message> <source>Copy Row</source> @@ -31956,6 +31426,22 @@ references to elements in other files, loops, and so on.)</source> <translation>ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã¯æœ€é©åŒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“(代入や他ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¨ãƒ¬ãƒ¡ãƒ³ãƒˆã¸ã®å‚ç…§ã€ãƒ«ãƒ¼ãƒ—ãªã©ãŒå‰¯ä½œç”¨ã¨ãªã‚Šã¾ã™)</translation> </message> <message> + <source><program></source> + <translation><プãƒã‚°ãƒ©ãƒ ></translation> + </message> + <message> + <source>Main Program</source> + <translation>メインプãƒã‚°ãƒ©ãƒ </translation> + </message> + <message> + <source><bytecode></source> + <translation><ãƒã‚¤ãƒˆã‚³ãƒ¼ãƒ‰></translation> + </message> + <message> + <source>Source code not available</source> + <translation>ソースコードãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> + </message> + <message> <source>Paint</source> <translation>æç”»</translation> </message> @@ -31983,6 +31469,14 @@ references to elements in other files, loops, and so on.)</source> <context> <name>QmlProfiler::Internal::QmlProfilerEventRelativesView</name> <message> + <source><bytecode></source> + <translation><ãƒã‚¤ãƒˆã‚³ãƒ¼ãƒ‰></translation> + </message> + <message> + <source>Source code not available</source> + <translation>ソースコードãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> + </message> + <message> <source>Part of binding loop.</source> <translation>ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸€éƒ¨ã§ã™ã€‚</translation> </message> @@ -32012,10 +31506,6 @@ references to elements in other files, loops, and so on.)</source> <context> <name>QmlProfiler::Internal::PaintEventsModelProxy</name> <message> - <source>Painting</source> - <translation>æç”»</translation> - </message> - <message> <source>Animations</source> <translation>アニメーション</translation> </message> @@ -32156,26 +31646,6 @@ Please use the stop button instead.</source> <context> <name>QmlProfiler::Internal::QmlProfilerTraceView</name> <message> - <source>Jump to previous event.</source> - <translation>å‰ã®ã‚¤ãƒ™ãƒ³ãƒˆã«ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>Jump to next event.</source> - <translation>次ã®ã‚¤ãƒ™ãƒ³ãƒˆã«ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>Show zoom slider.</source> - <translation>ズームスライダーを表示ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>Select range.</source> - <translation>範囲をé¸æŠžã—ã¾ã™ã€‚</translation> - </message> - <message> - <source>View event information on mouseover.</source> - <translation>マウスオーãƒãƒ¼æ™‚ã«ã‚¤ãƒ™ãƒ³ãƒˆæƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚</translation> - </message> - <message> <source>Limit Events Pane to Current Range</source> <translation>ç¾åœ¨ã®ç¯„囲ã§ã‚¤ãƒ™ãƒ³ãƒˆãƒšã‚¤ãƒ³ã‚’制é™</translation> </message> @@ -32231,10 +31701,6 @@ Please use the stop button instead.</source> <source>This wizard generates a Qt Quick UI project.</source> <translation>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ Qt Quick UI プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’生æˆã—ã¾ã™ã€‚</translation> </message> - <message> - <source>Component Set</source> - <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚»ãƒƒãƒˆ</translation> - </message> </context> <context> <name>QmlProjectManager::Internal::QmlApplicationWizard</name> @@ -32257,6 +31723,10 @@ Please use the stop button instead.</source> <source>Qt Quick component set:</source> <translation>Qt Quick コンãƒãƒ¼ãƒãƒ³ãƒˆã‚»ãƒƒãƒˆ:</translation> </message> + <message> + <source>Component Set</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã‚»ãƒƒãƒˆ</translation> + </message> </context> <context> <name>QmlProjectManager::QmlProject</name> @@ -32291,8 +31761,8 @@ Please use the stop button instead.</source> <context> <name>QmlProjectManager::Internal::Manager</name> <message> - <source>Failed opening project '%1': Project is not a file</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“</translation> + <source>Failed opening project "%1": Project is not a file.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> </context> <context> @@ -32570,7 +32040,7 @@ Please use the stop button instead.</source> <translation>確èª</translation> </message> <message> - <source>The device runtime version(%1) does not match the API level version(%2). + <source>The device runtime version (%1) does not match the API level version (%2). This may cause unexpected behavior when debugging. Do you want to continue anyway?</source> <translation>デãƒã‚¤ã‚¹ã®ãƒ©ãƒ³ã‚¿ã‚¤ãƒ ãƒãƒ¼ã‚¸ãƒ§ãƒ³(%1)㌠API レベルã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³(%2)ã¨ä¸€è‡´ã—ã¾ã›ã‚“。 @@ -32602,8 +32072,8 @@ Do you want to continue anyway?</source> <translation>bar パッケージマニフェストãŒèªã‚ã¾ã›ã‚“。</translation> </message> <message> - <source>Internal error: Cannot create temporary manifest file '%1'</source> - <translation>内部エラー: 一時マニフェストファイル '%1' を作æˆã§ãã¾ã›ã‚“</translation> + <source>Internal error: Cannot create temporary manifest file "%1"</source> + <translation>内部エラー: 一時マニフェストファイル "%1" を作æˆã§ãã¾ã›ã‚“</translation> </message> <message> <source>Cannot set command line arguments.</source> @@ -32628,8 +32098,8 @@ Do you want to continue anyway?</source> <translation>パッケージã®ä½œæˆ</translation> </message> <message> - <source>Could not find packager command '%1' in the build environment.</source> - <translation>ビルド環境ã«ãƒ‘ッケージ用コマンド '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Could not find packager command "%1" in the build environment.</source> + <translation>ビルド環境ã«ãƒ‘ッケージ用コマンド "%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> <source>No packages enabled for deployment.</source> @@ -32644,24 +32114,48 @@ Do you want to continue anyway?</source> <translation>パッケージãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。デプãƒã‚¤è¨å®šã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Could not create build directory '%1'.</source> - <translation>ビルドディレクトリ '%1' を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Could not create build directory "%1".</source> + <translation>ビルドディレクトリ "%1" を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <source>Missing passwords for signing packages.</source> - <translation>パッケージ署å用パスワードãŒã‚ã‚Šã¾ã›ã‚“。</translation> + <source>In order to link to the correct Qt library specified in the deployment settings Qt Creator needs to update the Qt environment variables in the BAR application file as follows: + +<env var="LD_LIBRARY_PATH" value="%1"/> +<env var="QT_PLUGIN_PATH" value="%2"/> +<env var="QML_IMPORT_PATH" value="%3"/> +</source> + <translation>デプãƒã‚¤è¨å®šã§æŒ‡å®šã•ã‚ŒãŸ Qt ライブラリã«æ£ã—ãリンクã™ã‚‹ãŸã‚ã«ã¯ã€BAR アプリケーションファイル㮠Qt 環境変数ã®è¨˜è¿°ã‚’以下ã®ã‚ˆã†ã«æ›´æ–°ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™: + +<env var="LD_LIBRARY_PATH" value="%1"/> +<env var="QT_PLUGIN_PATH" value="%2"/> +<env var="QML_IMPORT_PATH" value="%3"/> +</translation> </message> <message> - <source>Error preparing BAR application descriptor file.</source> - <translation>BAR アプリケーション記述ファイルã®æº–å‚™ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + <source> +Do you want to update it?</source> + <translation> +æ›´æ–°ã—ã¾ã™ã‹?</translation> </message> <message> - <source>Error opening BAR application descriptor file '%1' - %2</source> - <translation>BAR アプリケーション記述ファイル '%1' ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—㟠- %2</translation> + <source>Confirmation</source> + <translation>確èª</translation> </message> <message> - <source>Error saving prepared BAR application descriptor file '%1' - %2</source> - <translation>準備ã—㟠BAR アプリケーション記述ファイル '%1' ã®ä¿å˜ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠- %2</translation> + <source>Error saving BAR application descriptor file "%1" - %2</source> + <translation>BAR アプリケーション記述ファイル "%1" ã®ä¿å˜ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠- %2</translation> + </message> + <message> + <source>Missing passwords for signing packages.</source> + <translation>パッケージ署å用パスワードãŒã‚ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>Error opening BAR application descriptor file "%1" - %2</source> + <translation>BAR アプリケーション記述ファイル "%1" ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—㟠- %2</translation> + </message> + <message> + <source>Error preparing BAR application descriptor file.</source> + <translation>BAR アプリケーション記述ファイルã®æº–å‚™ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> </context> <context> @@ -32677,32 +32171,6 @@ Do you want to continue anyway?</source> <source>Deploy to BlackBerry Device</source> <translation>BlackBerry デãƒã‚¤ã‚¹ã«ãƒ‡ãƒ—ãƒã‚¤</translation> </message> - <message> - <source>Setup Application Descriptor File</source> - <translation>アプリケーション記述ファイルã®è¨å®š</translation> - </message> - <message> - <source>You need to set up a BAR descriptor file to enable packaging. -Do you want Qt Creator to generate it for your project (%1)?</source> - <translation>パッケージングを行ã†ã«ã¯ BAR 記述ファイルã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ -プãƒã‚¸ã‚§ã‚¯ãƒˆ(%1)用㫠Qt Creator ã§ç”Ÿæˆã—ã¾ã™ã‹?</translation> - </message> - <message> - <source>Do not ask again for this project</source> - <translation>ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ä»Šå¾Œã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ãªã„</translation> - </message> - <message> - <source>Reading the BAR descriptor template failed.</source> - <translation>BAR 記述テンプレートã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Writing the BAR descriptor file failed.</source> - <translation>BAR 記述ファイルã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Cannot Set up Application Descriptor File</source> - <translation>アプリケーション記述ファイルãŒè¨å®šã§ãã¾ã›ã‚“</translation> - </message> </context> <context> <name>Qnx::Internal::BlackBerryDeployConfigurationFactory</name> @@ -32733,8 +32201,8 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>パッケージをデプãƒã‚¤</translation> </message> <message> - <source>Could not find deploy command '%1' in the build environment</source> - <translation>ビルド環境ã«ã€ãƒ‡ãƒ—ãƒã‚¤ã‚³ãƒžãƒ³ãƒ‰ '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> + <source>Could not find deploy command "%1" in the build environment</source> + <translation>ビルド環境ã«ã€ãƒ‡ãƒ—ãƒã‚¤ã‚³ãƒžãƒ³ãƒ‰ "%1" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ</translation> </message> <message> <source>No hostname specified for device</source> @@ -32745,8 +32213,8 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>デプãƒã‚¤å¯èƒ½ãªãƒ‘ッケージãŒã‚ã‚Šã¾ã›ã‚“</translation> </message> <message> - <source>Package '%1' does not exist. Create the package first.</source> - <translation>パッケージ '%1' ã¯æ¨©è¥¿ã—ã¾ã›ã‚“。先ã«ãƒ‘ッケージを作æˆã—ã¦ãã ã•ã„。</translation> + <source>Package "%1" does not exist. Create the package first.</source> + <translation>パッケージ "%1" ã¯å˜åœ¨ã—ã¾ã›ã‚“。先ã«ãƒ‘ッケージを作æˆã—ã¦ãã ã•ã„。</translation> </message> </context> <context> @@ -32994,8 +32462,8 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>ç”»åƒã‚¢ã‚»ãƒƒãƒˆã®å®šç¾©ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: <%1></translation> </message> <message> - <source>Error parsing XML file '%1': %2</source> - <translation>XML ファイル '%1' ã®è§£æžä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> + <source>Error parsing XML file "%1": %2</source> + <translation>XML ファイル "%1" ã®è§£æžä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> </message> </context> <context> @@ -33013,10 +32481,6 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆåã¨ãƒ‘ス</translation> </message> <message> - <source>Momentics</source> - <translation>Momentics</translation> - </message> - <message> <source>Qt Creator</source> <translation>Qt Creator</translation> </message> @@ -33032,8 +32496,8 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>QNX Momentics IDE ã§å‰Šé™¤ã•ã‚ŒãŸæ—¢å˜ã® Cascades プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’インãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã£ã¦ãã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆãŒ Qt Creator ã§åˆ©ç”¨ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚</translation> </message> <message> - <source>Error generating file '%1': %2</source> - <translation>ファイル '%1' ã®ç”Ÿæˆä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> + <source>Error generating file "%1": %2</source> + <translation>ファイル "%1" ã®ç”Ÿæˆä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> </message> </context> <context> @@ -33053,8 +32517,8 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <context> <name>ProjectFileConverter</name> <message> - <source>File '%1' not listed in '%2' file, should it be?</source> - <translation>ファイル '%1' ㌠ファイル '%2' ã«ãƒªã‚¹ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。ã‚ã‚‹ã¹ãã§ã™ã‹?</translation> + <source>File "%1" not listed in "%2" file, should it be?</source> + <translation>ファイル "%1" ãŒãƒ•ã‚¡ã‚¤ãƒ« "%2" ã«ãƒªã‚¹ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。ã‚ã‚‹ã¹ãã§ã™ã‹?</translation> </message> </context> <context> @@ -33129,6 +32593,10 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <source>QNX</source> <translation>QNX</translation> </message> + <message> + <source>Deploy Qt libraries...</source> + <translation>Qt ライブラリã®ãƒ‡ãƒ—ãƒã‚¤...</translation> + </message> </context> <context> <name>Qnx::Internal::QnxDeviceConfigurationFactory</name> @@ -33292,29 +32760,29 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>インストールã•ã‚Œã¦ã„ãªã„プレフィックスビルドã®åˆ©ç”¨ã¯å†…部開発専用ã§ã™ã€‚</translation> </message> <message> - <source>Cannot start '%1': %2</source> - <translation>'%1' を開始ã§ãã¾ã›ã‚“: %2</translation> + <source>Cannot start "%1": %2</source> + <translation>"%1" を開始ã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>Timeout running '%1' (%2 ms).</source> - <translation>'%1' ã®å®Ÿè¡Œä¸ã«ã‚¿ã‚¤ãƒ アウト(%2 ms)ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + <source>Timeout running "%1" (%2 ms).</source> + <translation>"%1" ã®å®Ÿè¡Œä¸ã«ã‚¿ã‚¤ãƒ アウト(%2 ms)ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>'%1' crashed.</source> - <translation>'%1' ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> + <source>"%1" crashed.</source> + <translation>"%1" ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>qmake '%1' is not an executable.</source> - <translation>qmake '%1' ã¯å®Ÿè¡Œå¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> + <source>qmake "%1" is not an executable.</source> + <translation>qmake "%1" ã¯å®Ÿè¡Œå¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>Cannot determine the installation path for Qt version '%1'.</source> - <translation>Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ '%1' ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãƒ‘スを検出ã§ãã¾ã›ã‚“。</translation> + <source>Cannot determine the installation path for Qt version "%1".</source> + <translation>Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ "%1" ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãƒ‘スを検出ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Building helper(s) with toolchain '%1'... + <source>Building helper(s) with toolchain "%1"... </source> - <translation>ツールãƒã‚§ã‚¤ãƒ³ '%1' ã§ãƒ˜ãƒ«ãƒ‘をビルドä¸... + <translation>ツールãƒã‚§ã‚¤ãƒ³ "%1" ã§ãƒ˜ãƒ«ãƒ‘をビルドä¸... </translation> </message> <message> @@ -33357,12 +32825,12 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <context> <name>BaseQtVersion</name> <message> - <source>The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4).</source> - <translation>コンパイラ '%1' (%2) ã¯ã€Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ '%3' (%4) 用ã®ã‚³ãƒ¼ãƒ‰ã‚’生æˆã§ãã¾ã›ã‚“。</translation> + <source>The compiler "%1" (%2) cannot produce code for the Qt version "%3" (%4).</source> + <translation>コンパイラ "%1" (%2) ã¯ã€Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ "%3" (%4) 用ã®ã‚³ãƒ¼ãƒ‰ã‚’生æˆã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>The compiler '%1' (%2) may not produce code compatible with the Qt version '%3' (%4).</source> - <translation>コンパイラ '%1' (%2) 㯠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ '%3' (%4) ã¨äº’æ›æ€§ã®ã‚るコードを生æˆã—ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> + <source>The compiler "%1" (%2) may not produce code compatible with the Qt version "%3" (%4).</source> + <translation>コンパイラ "%1" (%2) 㯠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ "%3" (%4) ã¨äº’æ›æ€§ã®ã‚るコードを生æˆã—ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</translation> </message> <message> <source>Name:</source> @@ -33409,8 +32877,8 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation>Qt 4.8.0 以é™ãŒå¿…è¦ã§ã™ã€‚</translation> </message> <message> - <source>Building helpers</source> - <translation>ヘルパビルドä¸</translation> + <source>Building Debugging Helpers</source> + <translation>デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã®ãƒ“ルドä¸</translation> </message> </context> <context> @@ -33576,8 +33044,8 @@ Reason: %2</source> <context> <name>QmlDumpBuildTask</name> <message> - <source>Building helper</source> - <translation>ï¾ï¾™ï¾Šï¾Ÿï¾‹ï¾žï¾™ï¾„ﾞä¸</translation> + <source>Building QML Helpers</source> + <translation>QML ヘルパã®ãƒ“ルドä¸</translation> </message> </context> <context> @@ -33649,14 +33117,6 @@ Reason: %2</source> <translation>次㮠ABI ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™:<ul><li>%1</li></ul></translation> </message> <message> - <source>Building helpers</source> - <translation>ヘルパビルドä¸</translation> - </message> - <message> - <source>Debugging Helper Build Log for '%1'</source> - <translation>'%1' 用ã®ãƒ‡ãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã®ãƒ“ルドãƒã‚°</translation> - </message> - <message> <source>Select a qmake Executable</source> <translation>qmake 実行ファイルã®é¸æŠž</translation> </message> @@ -33706,6 +33166,14 @@ Reason: %2</source> <translation><i>å¿…è¦ã‚ã‚Šã¾ã›ã‚“。</i></translation> </message> <message> + <source>Building Helpers</source> + <translation>ヘルパã®ãƒ“ルドä¸</translation> + </message> + <message> + <source>Debugging Helper Build Log for "%1"</source> + <translation>"%1" 用ã®ãƒ‡ãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã®ãƒ“ルドãƒã‚°</translation> + </message> + <message> <source><i>Cannot be compiled.</i></source> <translation><i>コンパイルã§ãã¾ã›ã‚“。</i></translation> </message> @@ -33762,8 +33230,8 @@ Reason: %2</source> <context> <name>QtSupport::QtVersionFactory</name> <message> - <source>No factory found for qmake: '%1'</source> - <translation>qmake 用ファクトリãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: '%1'</translation> + <source>No factory found for qmake: "%1"</source> + <translation>qmake 用ファクトリãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: "%1"</translation> </message> </context> <context> @@ -33845,36 +33313,36 @@ Reason: %2</source> <translation>SFTP åˆæœŸåŒ–失敗: %1</translation> </message> <message> - <source>Upload of file '%1' failed. The server said: '%2'.</source> - <translation>ファイル '%1' ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒãƒ¼ã‹ã‚‰ã®å¿œç”: '%2' 。</translation> + <source>Upload of file "%1" failed. The server said: "%2".</source> + <translation>ファイル "%1" ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒãƒ¼ã‹ã‚‰ã®å¿œç”: "%2"。</translation> </message> <message> - <source>If '%1' is currently running on the remote host, you might need to stop it first.</source> - <translation>'%1' ãŒãƒªãƒ¢ãƒ¼ãƒˆãƒ›ã‚¹ãƒˆä¸Šã§å®Ÿè¡Œä¸ã®å ´åˆã€å…ˆã«ãれをåœæ¢ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</translation> + <source>If "%1" is currently running on the remote host, you might need to stop it first.</source> + <translation>"%1" ãŒãƒªãƒ¢ãƒ¼ãƒˆãƒ›ã‚¹ãƒˆä¸Šã§æ—¢ã«å®Ÿè¡Œä¸ã®å ´åˆã€å…ˆã«ãれをåœæ¢ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</translation> </message> <message> - <source>Failed to upload file '%1'.</source> - <translation>ファイル '%1' ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Failed to upload file "%1".</source> + <translation>ファイル "%1" ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Failed to set executable flag.</source> - <translation>実行権é™ã®ä»˜åŠ ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Failed to upload file "%1": Could not open for reading.</source> + <translation>ファイル "%1" ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—ãŸ: ファイルをèªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <source>Failed to upload file '%1': Could not open for reading.</source> - <translation>ファイル '%1' ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒå¤±æ•—ã—ã¾ã—ãŸ: ファイルをèªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Warning: No remote path set for local file "%1". Skipping upload.</source> + <translation>è¦å‘Š: ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ« "%1" ã«å¯¾ã™ã‚‹ãƒªãƒ¢ãƒ¼ãƒˆãƒ‘スãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。アップãƒãƒ¼ãƒ‰ã‚’スã‚ップã—ã¾ã™ã€‚</translation> </message> <message> - <source>All files successfully deployed.</source> - <translation>ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‡ãƒ—ãƒã‚¤ãŒæˆåŠŸã—ã¾ã—ãŸã€‚</translation> + <source>Uploading file "%1"...</source> + <translation>ファイル "%1" ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸...</translation> </message> <message> - <source>Warning: No remote path set for local file '%1'. Skipping upload.</source> - <translation>è¦å‘Š: ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒ‘スãŒã‚ã‚Šã¾ã›ã‚“。アップãƒãƒ¼ãƒ‰ã‚’ä¸æ¢ã—ã¾ã™ã€‚</translation> + <source>Failed to set executable flag.</source> + <translation>実行権é™ã®ä»˜åŠ ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Uploading file '%1'...</source> - <translation>ファイル '%1' をアップãƒãƒ¼ãƒ‰ä¸...</translation> + <source>All files successfully deployed.</source> + <translation>ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‡ãƒ—ãƒã‚¤ãŒæˆåŠŸã—ã¾ã—ãŸã€‚</translation> </message> </context> <context> @@ -34067,8 +33535,12 @@ In addition, device connectivity will be tested.</source> <translation>リモートプãƒã‚»ã‚¹ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Unexpected output from remote process: '%1'.</source> - <translation>リモートプãƒã‚»ã‚¹ã‹ã‚‰ã®äºˆæœŸã›ã¬å‡ºåŠ›: '%1'。</translation> + <source>Unexpected output from remote process: "%1"</source> + <translation>リモートプãƒã‚»ã‚¹ã‹ã‚‰ã®äºˆæœŸã›ã¬å‡ºåŠ›: "%1"</translation> + </message> + <message> + <source>Cannot check for free disk space: "%1" is not an absolute path.</source> + <translation>ディスクã®ç©ºã容é‡ãŒç¢ºèªã§ãã¾ã›ã‚“: "%1" ãŒçµ¶å¯¾ãƒ‘スã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message numerus="yes"> <source>The remote file system has only %n megabytes of free space, but %1 megabytes are required.</source> @@ -34082,10 +33554,6 @@ In addition, device connectivity will be tested.</source> <numerusform>リモートã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 㯠%n MBytes ã®ç©ºã容é‡ãŒã‚ã‚Šã¾ã™ã®ã§ã€ç¶šè¡Œã—ã¾ã™ã€‚</numerusform> </translation> </message> - <message> - <source>Cannot check for free disk space: '%1' is not an absolute path.</source> - <translation>空ã容é‡ç¢ºèªä¸å¯: '%1' ãŒçµ¶å¯¾ãƒ‘スã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> - </message> </context> <context> <name>RemoteLinux::Internal::RemoteLinuxCheckForFreeDiskSpaceStepWidget</name> @@ -34115,8 +33583,8 @@ In addition, device connectivity will be tested.</source> <translation>コマンドラインãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <source>Starting remote command '%1'...</source> - <translation>リモートコマンド '%1' を開始ã—ã¦ã„ã¾ã™...</translation> + <source>Starting remote command "%1"...</source> + <translation>リモートコマンド "%1" ã‚’èµ·å‹•ã—ã¦ã„ã¾ã™...</translation> </message> <message> <source>Remote process failed to start.</source> @@ -34158,17 +33626,6 @@ In addition, device connectivity will be tested.</source> </message> </context> <context> - <name>RemoteLinux::RemoteLinuxDeploymentDataModel</name> - <message> - <source>Local File Path</source> - <translation>ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス</translation> - </message> - <message> - <source>Remote Directory</source> - <translation>リモートディレクトリ</translation> - </message> -</context> -<context> <name>RemoteLinux::RemoteLinuxEnvironmentAspect</name> <message> <source>Clean Environment</source> @@ -34296,6 +33753,10 @@ In addition, device connectivity will be tested.</source> <source>Cannot debug: Not enough free ports available.</source> <translation>デãƒãƒƒã‚°ä¸å¯: 充分ãªç©ºããƒãƒ¼ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> + <message> + <source>Cannot debug: Local executable is not set.</source> + <translation>デãƒãƒƒã‚°ä¸å¯: ãƒãƒ¼ã‚«ãƒ«å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> + </message> </context> <context> <name>RemoteLinux::RemoteLinuxSignalOperation</name> @@ -34357,28 +33818,28 @@ In addition, device connectivity will be tested.</source> <translation>エラー: tar ファイル %1 ã‚’é–‹ã‘ã¾ã›ã‚“ (%2)。</translation> </message> <message> - <source>No remote path specified for file '%1', skipping.</source> - <translation>ファイル '%1' ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒ‘スãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ã€ã‚¹ã‚ップã—ã¾ã™ã€‚</translation> + <source>No remote path specified for file "%1", skipping.</source> + <translation>ファイル "%1" ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒ‘スãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ã€ã‚¹ã‚ップã—ã¾ã™ã€‚</translation> </message> <message> - <source>Error writing tar file '%1': %2.</source> - <translation>tar ファイル '%1' ã®æ›¸ãè¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %2。</translation> + <source>Error writing tar file "%1": %2.</source> + <translation>tar ファイル "%1" ã®æ›¸ãè¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %2。</translation> </message> <message> - <source>Error reading file '%1': %2.</source> - <translation>ファイル '%1' ã®èªã¿è¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %2。</translation> + <source>Error reading file "%1": %2.</source> + <translation>ファイル "%1" ã®èªã¿è¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %2。</translation> </message> <message> - <source>Adding file '%1' to tarball...</source> - <translation>tarball ã«ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã‚’è¿½åŠ ä¸...</translation> + <source>Adding file "%1" to tarball...</source> + <translation>tar アーカイブã«ãƒ•ã‚¡ã‚¤ãƒ« "%1" ã‚’è¿½åŠ ã—ã¦ã„ã¾ã™...</translation> </message> <message> - <source>Cannot add file '%1' to tar-archive: path too long.</source> - <translation>ファイル '%1' ã‚’ tar アーカイブã«è¿½åŠ ã§ãã¾ã›ã‚“: パスãŒé•·ã™ãŽã¾ã™ã€‚</translation> + <source>Cannot add file "%1" to tar-archive: path too long.</source> + <translation>ファイル "%1" ã‚’ tar アーカイブã«è¿½åŠ ã§ãã¾ã›ã‚“: パスãŒé•·ã™ãŽã¾ã™ã€‚</translation> </message> <message> - <source>Error writing tar file '%1': %2</source> - <translation>tar ファイル '%1' ã®æ›¸ãè¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> + <source>Error writing tar file "%1": %2</source> + <translation>tar ファイル "%1" ã®æ›¸ãè¾¼ã¿ä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> </message> <message> <source>Create tarball</source> @@ -34415,7 +33876,7 @@ In addition, device connectivity will be tested.</source> </message> <message> <source>Invalid file location</source> - <translation>ä¸æ£ãªãƒ•ã‚¡ã‚¤ãƒ«ãƒ‘ス</translation> + <translation>無効ãªãƒ•ã‚¡ã‚¤ãƒ«ãƒ‘ス</translation> </message> <message> <source>Copy</source> @@ -34468,10 +33929,6 @@ In addition, device connectivity will be tested.</source> <source>The <RCC> root element is missing.</source> <translation><RCC> ã«ãƒ«ãƒ¼ãƒˆè¦ç´ ãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> - <message> - <source>Cannot write file. Disk full?</source> - <translation>ファイルを書ã‘ã¾ã›ã‚“。ディスクフルã§ã¯ã‚ã‚Šã¾ã›ã‚“ã‹ï¼Ÿ</translation> - </message> </context> <context> <name>ResourceEditor::Internal::ResourceView</name> @@ -34535,6 +33992,14 @@ In addition, device connectivity will be tested.</source> <translation>テã‚ストエディタã§é–‹ã</translation> </message> <message> + <source>Copy path "%1"</source> + <translation>パス "%1" をコピー</translation> + </message> + <message> + <source>Copy url "%1"</source> + <translation>URL "%1" をコピー</translation> + </message> + <message> <source>Add Prefix</source> <translation>プレフィックスã®è¿½åŠ </translation> </message> @@ -34579,17 +34044,6 @@ In addition, device connectivity will be tested.</source> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> - <message> - <source>Checks out a Subversion repository and tries to load the contained project.</source> - <translation>Subversion リãƒã‚¸ãƒˆãƒªã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> - </message> - <message> - <source>Subversion Checkout</source> - <translation>Subversion ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ</translation> - </message> -</context> -<context> <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Location</source> @@ -34863,32 +34317,10 @@ In addition, device connectivity will be tested.</source> </message> </context> <context> - <name>TaskList::Internal::TaskFileFactory</name> - <message> - <source>Task file reader</source> - <translation>タスクファイルリーダー</translation> - </message> - <message> - <source>File Error</source> - <translation>ファイルエラー</translation> - </message> -</context> -<context> - <name>TaskList::TaskListPlugin</name> - <message> - <source>Cannot open task file %1: %2</source> - <translation>タスクファイル %1 ã‚’é–‹ã‘ã¾ã›ã‚“: %2</translation> - </message> - <message> - <source>My Tasks</source> - <translation>タスク</translation> - </message> -</context> -<context> <name>TextEditor::BaseFileFind</name> <message> - <source>Search</source> - <translation>検索</translation> + <source>Searching</source> + <translation>検索ä¸</translation> </message> <message> <source>List of comma separated wildcard filters</source> @@ -34909,8 +34341,8 @@ In addition, device connectivity will be tested.</source> <context> <name>TextEditor::BaseTextDocument</name> <message> - <source>Opening file</source> - <translation>ファイルを開ã</translation> + <source>Opening File</source> + <translation>ファイルを開ã„ã¦ã„ã¾ã™</translation> </message> </context> <context> @@ -35092,8 +34524,8 @@ In addition, device connectivity will be tested.</source> <translation>ç¾åœ¨ã®ãƒ•ã‚¡ã‚¤ãƒ«</translation> </message> <message> - <source>File '%1':</source> - <translation>ファイル '%1':</translation> + <source>File "%1":</source> + <translation>ファイル "%1":</translation> </message> <message> <source>File path: %1 @@ -35109,8 +34541,8 @@ In addition, device connectivity will be tested.</source> <translation>ファイルシステム上ã®ãƒ•ã‚¡ã‚¤ãƒ«</translation> </message> <message> - <source>Directory '%1':</source> - <translation>ディレクトリ '%1':</translation> + <source>Directory "%1":</source> + <translation>ディレクトリ "%1":</translation> </message> <message> <source>Path: %1 @@ -35202,7 +34634,7 @@ Filter: %2 </message> <message> <source>Discard</source> - <translation>廃棄</translation> + <translation>ç ´æ£„</translation> </message> </context> <context> @@ -35237,33 +34669,6 @@ Filter: %2 </message> </context> <context> - <name>TextEditor::Internal::Manager</name> - <message> - <source>Registering definitions</source> - <translation>定義を登録</translation> - </message> - <message> - <source>Downloading definitions</source> - <translation>定義をダウンãƒãƒ¼ãƒ‰</translation> - </message> - <message> - <source>Error downloading selected definition(s).</source> - <translation>é¸æŠžã•ã‚ŒãŸå®šç¾©ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Error downloading one or more definitions.</source> - <translation>1ã¤ä»¥ä¸Šã®å®šç¾©ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Please check the directory's access rights.</source> - <translation>ディレクトリã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©é™ã‚’確èªã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Download Error</source> - <translation>ダウンãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼</translation> - </message> -</context> -<context> <name>TextEditor::Internal::LineNumberFilter</name> <message> <source>Line in Current Document</source> @@ -35379,405 +34784,6 @@ Filter: %2 </message> </context> <context> - <name>TextEditor::TextEditorActionHandler</name> - <message> - <source>&Undo</source> - <translation>å…ƒã«æˆ»ã™(&U)</translation> - </message> - <message> - <source>&Redo</source> - <translation>ã‚„ã‚Šç›´ã™(&R)</translation> - </message> - <message> - <source>Cut &Line</source> - <translation>一行切りå–ã‚Š(&L)</translation> - </message> - <message> - <source>Shift+Del</source> - <translation>Shift+Del</translation> - </message> - <message> - <source>Copy &Line</source> - <translation>一行コピー(&L)</translation> - </message> - <message> - <source>Ctrl+Ins</source> - <translation>Ctrl+Ins</translation> - </message> - <message> - <source>Delete &Line</source> - <translation>行削除(&L)</translation> - </message> - <message> - <source>Delete Word from Cursor On</source> - <translation>カーソルä½ç½®ã®å˜èªžã‚’削除</translation> - </message> - <message> - <source>Delete Word Camel Case from Cursor On</source> - <translation>カーソルä½ç½®ã®å˜èªžã®ã‚ャメルケースを削除</translation> - </message> - <message> - <source>Delete Word up to Cursor</source> - <translation>カーソルä½ç½®ã¾ã§ã®å˜èªžã‚’削除</translation> - </message> - <message> - <source>Delete Word Camel Case up to Cursor</source> - <translation>カーソルä½ç½®ã¾ã§ã®å˜èªžã®ã‚ャメルケースを削除</translation> - </message> - <message> - <source>Go to Block Start with Selection</source> - <translation>ブãƒãƒƒã‚¯ã®é–‹å§‹ä½ç½®ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Ctrl+{</source> - <translation>Ctrl+{</translation> - </message> - <message> - <source>Go to Block End with Selection</source> - <translation>ブãƒãƒƒã‚¯ã®çµ‚了ä½ç½®ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Ctrl+}</source> - <translation>Ctrl+}</translation> - </message> - <message> - <source>Move Line Up</source> - <translation>行を上ã«ç§»å‹•</translation> - </message> - <message> - <source>Ctrl+Shift+Up</source> - <translation>Ctrl+Shift+Up</translation> - </message> - <message> - <source>Move Line Down</source> - <translation>行を下ã«ç§»å‹•</translation> - </message> - <message> - <source>Ctrl+Shift+Down</source> - <translation>Ctrl+Shift+Down</translation> - </message> - <message> - <source>Copy Line Up</source> - <translation>上ã®è¡Œã«ã‚³ãƒ”ー</translation> - </message> - <message> - <source>Ctrl+Alt+Up</source> - <translation>Ctrl+Alt+Up</translation> - </message> - <message> - <source>Copy Line Down</source> - <translation>下ã®è¡Œã«ã‚³ãƒ”ー</translation> - </message> - <message> - <source>Ctrl+Alt+Down</source> - <translation>Ctrl+Alt+Down</translation> - </message> - <message> - <source>Join Lines</source> - <translation>行をçµåˆ</translation> - </message> - <message> - <source>Ctrl+J</source> - <translation>Ctrl+J</translation> - </message> - <message> - <source>Insert Line Above Current Line</source> - <translation>ç¾åœ¨è¡Œã®ä¸Šã«è¡Œã‚’è¿½åŠ </translation> - </message> - <message> - <source>Ctrl+Shift+Return</source> - <translation>Ctrl+Shift+Return</translation> - </message> - <message> - <source>Insert Line Below Current Line</source> - <translation>ç¾åœ¨è¡Œã®ä¸‹ã«è¡Œã‚’è¿½åŠ </translation> - </message> - <message> - <source>Ctrl+Return</source> - <translation>Ctrl+Return</translation> - </message> - <message> - <source>Uppercase Selection</source> - <translation>é¸æŠžç¯„囲を大文å—ã«ã™ã‚‹</translation> - </message> - <message> - <source>Meta+Shift+U</source> - <translation>Meta+Shift+U</translation> - </message> - <message> - <source>Alt+Shift+U</source> - <translation>Alt+Shift+U</translation> - </message> - <message> - <source>Lowercase Selection</source> - <translation>é¸æŠžç¯„囲をå°æ–‡å—ã«ã™ã‚‹</translation> - </message> - <message> - <source>Meta+U</source> - <translation>Meta+U</translation> - </message> - <message> - <source>Alt+U</source> - <translation>Alt+U</translation> - </message> - <message> - <source>Indent</source> - <translation>インデント</translation> - </message> - <message> - <source>Unindent</source> - <translation>インデント解除</translation> - </message> - <message> - <source>Follow Symbol Under Cursor</source> - <translation>カーソルä½ç½®ã®ã‚·ãƒ³ãƒœãƒ«ã®å®šç¾©ã¸ç§»å‹•ã™ã‚‹</translation> - </message> - <message> - <source>Follow Symbol Under Cursor in Next Split</source> - <translation>カーソルä½ç½®ã®ã‚·ãƒ³ãƒœãƒ«ã®å®šç¾©ã¸æ¬¡ã®åˆ†å‰²ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ç§»å‹•ã™ã‚‹</translation> - </message> - <message> - <source>Meta+E, F2</source> - <translation>Meta+E, F2</translation> - </message> - <message> - <source>Ctrl+E, F2</source> - <translation>Ctrl+E, F2</translation> - </message> - <message> - <source>Jump To File Under Cursor</source> - <translation>カーソルä½ç½®ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¸ç§»å‹•ã™ã‚‹</translation> - </message> - <message> - <source>Select Encoding...</source> - <translation>æ–‡å—コードã®é¸æŠž...</translation> - </message> - <message> - <source>Paste from Clipboard History</source> - <translation>クリップボード履æ´ã‹ã‚‰è²¼ã‚Šä»˜ã‘</translation> - </message> - <message> - <source>Ctrl+Shift+V</source> - <translation>Ctrl+Shift+V</translation> - </message> - <message> - <source>Auto-&indent Selection</source> - <translation>é¸æŠžç¯„囲を自動インデント(&I)</translation> - </message> - <message> - <source>Ctrl+I</source> - <translation>Ctrl+I</translation> - </message> - <message> - <source>&Rewrap Paragraph</source> - <translation>段è½ã®æŠ˜ã‚Šè¿”ã—ã‚’å†æ§‹ç¯‰(&R)</translation> - </message> - <message> - <source>Meta+E, R</source> - <translation>Meta+E, R</translation> - </message> - <message> - <source>Ctrl+E, R</source> - <translation>Ctrl+E, R</translation> - </message> - <message> - <source>&Visualize Whitespace</source> - <translation>空白ã®å¯è¦–化(&V)</translation> - </message> - <message> - <source>Meta+E, Meta+V</source> - <translation>Meta+E, Meta+V</translation> - </message> - <message> - <source>Ctrl+E, Ctrl+V</source> - <translation>Ctrl+E, Ctrl+V</translation> - </message> - <message> - <source>Clean Whitespace</source> - <translation>空白ã®é™¤åŽ»</translation> - </message> - <message> - <source>Enable Text &Wrapping</source> - <translation>è¡Œã®æŠ˜ã‚Šè¿”ã—ã®æœ‰åŠ¹åŒ–(&W)</translation> - </message> - <message> - <source>Meta+E, Meta+W</source> - <translation>Meta+E, Meta+W</translation> - </message> - <message> - <source>Ctrl+E, Ctrl+W</source> - <translation>Ctrl+E, Ctrl+W</translation> - </message> - <message> - <source>Toggle Comment &Selection</source> - <translation>é¸æŠžç¯„囲ã®ã‚³ãƒ¡ãƒ³ãƒˆåŒ–/éžã‚³ãƒ¡ãƒ³ãƒˆåŒ–切替(&S)</translation> - </message> - <message> - <source>Ctrl+/</source> - <translation>Ctrl+/</translation> - </message> - <message> - <source>Fold</source> - <translation>折りãŸãŸã‚€</translation> - </message> - <message> - <source>Ctrl+<</source> - <translation>Ctrl+<</translation> - </message> - <message> - <source>Unfold</source> - <translation>展開ã™ã‚‹</translation> - </message> - <message> - <source>Ctrl+></source> - <translation>Ctrl+></translation> - </message> - <message> - <source>Toggle &Fold All</source> - <translation>ã™ã¹ã¦ã®å±•é–‹çŠ¶æ…‹ã‚’切り替ãˆã‚‹(&F)</translation> - </message> - <message> - <source>Increase Font Size</source> - <translation>フォントを大ãã</translation> - </message> - <message> - <source>Ctrl++</source> - <translation>Ctrl++</translation> - </message> - <message> - <source>Decrease Font Size</source> - <translation>フォントをå°ã•ã</translation> - </message> - <message> - <source>Ctrl+-</source> - <translation>Ctrl+-</translation> - </message> - <message> - <source>Reset Font Size</source> - <translation>フォントã®å¤§ãã•ã‚’リセット</translation> - </message> - <message> - <source>Meta+0</source> - <translation>Meta+0</translation> - </message> - <message> - <source>Ctrl+0</source> - <translation>Ctrl+0</translation> - </message> - <message> - <source>Go to Block Start</source> - <translation>ブãƒãƒƒã‚¯ã®é–‹å§‹ä½ç½®ã«ç§»å‹•</translation> - </message> - <message> - <source>Ctrl+[</source> - <translation>Ctrl+[</translation> - </message> - <message> - <source>Go to Block End</source> - <translation>ブãƒãƒƒã‚¯ã®çµ‚了ä½ç½®ã«ç§»å‹•</translation> - </message> - <message> - <source>Ctrl+]</source> - <translation>Ctrl+]</translation> - </message> - <message> - <source>Select Block Up</source> - <translation>é¸æŠžã—ãŸãƒ–ãƒãƒƒã‚¯ã‚’上ã¸</translation> - </message> - <message> - <source>Ctrl+U</source> - <translation>Ctrl+U</translation> - </message> - <message> - <source>Select Block Down</source> - <translation>é¸æŠžã—ãŸãƒ–ãƒãƒƒã‚¯ã‚’下ã¸</translation> - </message> - <message> - <source>Go to Line Start</source> - <translation>è¡Œé ã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Line End</source> - <translation>行末ã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Next Line</source> - <translation>次ã®è¡Œã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Previous Line</source> - <translation>å‰ã®è¡Œã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Previous Character</source> - <translation>å‰ã®æ–‡å—ã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Next Character</source> - <translation>次ã®æ–‡å—ã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Previous Word</source> - <translation>å‰ã®å˜èªžã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Next Word</source> - <translation>次ã®å˜èªžã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Previous Word Camel Case</source> - <translation>å‰ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Next Word Camel Case</source> - <translation>次ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•</translation> - </message> - <message> - <source>Go to Line Start with Selection</source> - <translation>è¡Œé ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Line End with Selection</source> - <translation>行末ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Next Line with Selection</source> - <translation>次ã®è¡Œã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Previous Line with Selection</source> - <translation>å‰ã®è¡Œã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Previous Character with Selection</source> - <translation>å‰ã®æ–‡å—ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Next Character with Selection</source> - <translation>次ã®æ–‡å—ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Previous Word with Selection</source> - <translation>å‰ã®å˜èªžã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Next Word with Selection</source> - <translation>次ã®å˜èªžã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Previous Word Camel Case with Selection</source> - <translation>å‰ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source>Go to Next Word Camel Case with Selection</source> - <translation>次ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> - </message> - <message> - <source><line>:<column></source> - <translation><è¡Œ>:<列></translation> - </message> -</context> -<context> <name>TextEditor::Internal::TextEditorPlugin</name> <message> <source>General</source> @@ -35800,10 +34806,6 @@ Filter: %2 <translation>テã‚ストファイル</translation> </message> <message> - <source>Triggers a completion in this scope</source> - <translation>スコープ内ã§è£œå®Œã™ã‚‹å ´åˆã®ãƒˆãƒªã‚¬ãƒ¼</translation> - </message> - <message> <source>Meta+Space</source> <translation>Meta+Space</translation> </message> @@ -35812,14 +34814,22 @@ Filter: %2 <translation>Ctrl+Space</translation> </message> <message> - <source>Triggers a quick fix in this scope</source> - <translation>スコープ内ã§ç°¡æ˜“ä¿®æ£ã™ã‚‹å ´åˆã®ãƒˆãƒªã‚¬ãƒ¼</translation> + <source>Trigger Completion</source> + <translation>補完ã®é–‹å§‹</translation> + </message> + <message> + <source>Trigger Refactoring Action</source> + <translation>リファクタリングアクションã®é–‹å§‹</translation> </message> <message> <source>Alt+Return</source> <translation>Alt+Return</translation> </message> <message> + <source>Create Scratch Buffer Using a Temporary File</source> + <translation>一時ファイルを用ã„ãŸã‚¹ã‚¯ãƒ©ãƒƒãƒãƒãƒƒãƒ•ã‚¡ã®ä½œæˆ</translation> + </message> + <message> <source>Selected text within the current document.</source> <translation>ç¾åœ¨ã®ãƒ‰ã‚ュメント内ã§é¸æŠžã•ã‚Œã¦ã„るテã‚ストã§ã™ã€‚</translation> </message> @@ -35963,6 +34973,14 @@ Applied to text, if no other rules matching.</source> <translation>æ–‡å—ã¨æ–‡å—列リテラルã§ã™ã€‚</translation> </message> <message> + <source>Primitive Type</source> + <translation>プリミティブ型</translation> + </message> + <message> + <source>Name of a primitive data type.</source> + <translation>プリミティブãªãƒ‡ãƒ¼ã‚¿åž‹ã®åå‰ã§ã™ã€‚</translation> + </message> + <message> <source>Type</source> <translation>åž‹</translation> </message> @@ -36103,10 +35121,6 @@ Applied to text, if no other rules matching.</source> <translation>ã‚ーワード</translation> </message> <message> - <source>Reserved keywords of the programming language.</source> - <translation>プãƒã‚°ãƒ©ãƒ 言語ã«ã‚ˆã£ã¦äºˆç´„ã•ã‚Œã¦ã„ã‚‹ã‚ーワードã§ã™ã€‚</translation> - </message> - <message> <source>Operator</source> <translation>演算å</translation> </message> @@ -36125,6 +35139,10 @@ Will not be applied to whitespace in comments and strings.</source> <translation>プリプãƒã‚»ãƒƒã‚µ</translation> </message> <message> + <source>Reserved keywords of the programming language except keywords denoting primitive types.</source> + <translation>プãƒã‚°ãƒ©ãƒ 言語ã«ã‚ˆã£ã¦äºˆç´„ã•ã‚Œã¦ã„ã‚‹ã‚ーワードã§ã™(プリミティブ型を示ã™ã‚ーワードを除ã)。</translation> + </message> + <message> <source>Preprocessor directives.</source> <translation>プリプãƒã‚»ãƒƒã‚µã§ã™ã€‚</translation> </message> @@ -36313,16 +35331,16 @@ Will not be applied to whitespace in comments and strings.</source> <translation>メンテナンスツールã®ãƒ‘スを特定ã§ãã¾ã›ã‚“。ã“ã®ãƒ—ラグインを手動ã§æœ‰åŠ¹ã«ã—ãŸã®ã§ãªã‘ã‚Œã°ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Could not find maintenance tool at '%1'. Check your installation.</source> - <translation>'%1' ã«ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ãƒ„ールを見ã¤ã‘られã¾ã›ã‚“ã§ã—ãŸã€‚インストールを確èªã—ã¦ãã ã•ã„。</translation> + <source>Could not find maintenance tool at "%1". Check your installation.</source> + <translation>"%1" ã«ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ãƒ„ールを見ã¤ã‘られã¾ã›ã‚“ã§ã—ãŸã€‚インストールを確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <source>Start Updater</source> - <translation>更新開始</translation> + <source>Updates Available</source> + <translation>æ›´æ–°ãŒå˜åœ¨ã—ã¾ã™</translation> </message> <message> - <source>Updates available</source> - <translation>æ›´æ–°ãŒå˜åœ¨ã—ã¾ã™</translation> + <source>Start Updater</source> + <translation>更新開始</translation> </message> </context> <context> @@ -36700,22 +35718,6 @@ Will not be applied to whitespace in comments and strings.</source> <context> <name>Valgrind::Memcheck::MemcheckRunner</name> <message> - <source>No network interface found for remote analysis.</source> - <translation>リモート解æžç”¨ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>Select Network Interface</source> - <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã®é¸æŠž</translation> - </message> - <message> - <source>More than one network interface was found on your machine. Please select the one you want to use for remote analysis.</source> - <translation>マシンã«è¤‡æ•°ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚リモート解æžã«ä½¿ã†ã‚‚ã®ã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>No network interface was chosen for remote analysis.</source> - <translation>リモート解æžç”¨ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> - </message> - <message> <source>XmlServer on %1:</source> <translation>%1 ã® XmlServer:</translation> </message> @@ -36958,12 +35960,12 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Valgrind 関数プãƒãƒ•ã‚¡ã‚¤ãƒ©</translation> </message> <message> - <source>Valgrind Memory Analyzer (Remote)</source> - <translation>Valgrind メモリアナライザ(リモート)</translation> + <source>Valgrind Memory Analyzer (External Remote Application)</source> + <translation>Valgrind メモリアナライザ(外部リモートアプリケーション)</translation> </message> <message> - <source>Valgrind Function Profiler (Remote)</source> - <translation>Valgrind 関数プãƒãƒ•ã‚¡ã‚¤ãƒ©(リモート)</translation> + <source>Valgrind Function Profiler (External Remote Application)</source> + <translation>Valgrind 関数アナライザ(外部リモートアプリケーション)</translation> </message> <message> <source>Profile Costs of This Function and Its Callees</source> @@ -37137,29 +36139,6 @@ Will not be applied to whitespace in comments and strings.</source> </message> </context> <context> - <name>VcsBase::BaseCheckoutWizard</name> - <message> - <source>Cannot Open Project</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é–‹ã‘ã¾ã›ã‚“</translation> - </message> - <message> - <source>Failed to open project in '%1'.</source> - <translation>'%1' ã«ã‚るプãƒã‚¸ã‚§ã‚¯ãƒˆãŒé–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>Could not find any project files matching (%1) in the directory '%2'.</source> - <translation>ディレクトリ '%2' 内㫠(%1) ã«åˆè‡´ã™ã‚‹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>The Project Explorer is not available.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚¨ã‚¯ã‚¹ãƒ—ãƒãƒ¼ãƒ©ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。</translation> - </message> - <message> - <source>'%1' does not exist.</source> - <translation>'%1' ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> - </message> -</context> -<context> <name>VcsBase::Internal::CheckoutProgressWizardPage</name> <message> <source>Checkout started...</source> @@ -37225,8 +36204,8 @@ Will not be applied to whitespace in comments and strings.</source> </translation> </message> <message> - <source>Cleaning %1</source> - <translation>%1 をクリーニングä¸</translation> + <source>Cleaning "%1"</source> + <translation>"%1" をクリーニングä¸</translation> </message> </context> <context> @@ -37254,8 +36233,8 @@ Will not be applied to whitespace in comments and strings.</source> <context> <name>VcsBase::VcsBaseClient</name> <message> - <source>Unable to start process '%1': %2</source> - <translation>プãƒã‚»ã‚¹ '%1' を開始ã§ãã¾ã›ã‚“: %2</translation> + <source>Unable to start process "%1": %2</source> + <translation>プãƒã‚»ã‚¹ "%1" を開始ã§ãã¾ã›ã‚“: %2</translation> </message> <message> <source>Timed out after %1s waiting for the process %2 to finish.</source> @@ -37384,16 +36363,16 @@ Will not be applied to whitespace in comments and strings.</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†</translation> </message> <message> - <source>The file '%1' could not be deleted.</source> - <translation>ファイル '%1' ã¯å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> <source>Choose Repository Directory</source> <translation>リãƒã‚¸ãƒˆãƒªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„</translation> </message> <message> - <source>The directory '%1' is already managed by a version control system (%2). Would you like to specify another directory?</source> - <translation>ディレクトリ '%1' ã¯æ—¢ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ (%2) ã«ã‚ˆã£ã¦ç®¡ç†ã•ã‚Œã¦ã„ã¾ã™ã€‚別ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’指定ã—ã¾ã™ã‹?</translation> + <source>The file "%1" could not be deleted.</source> + <translation>ファイル "%1" ã¯å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>The directory "%1" is already managed by a version control system (%2). Would you like to specify another directory?</source> + <translation>ディレクトリ "%1" ã¯æ—¢ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ (%2) ã«ã‚ˆã£ã¦ç®¡ç†ã•ã‚Œã¦ã„ã¾ã™ã€‚別ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’指定ã—ã¾ã™ã‹?</translation> </message> <message> <source>Repository already under version control</source> @@ -37415,26 +36394,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>A version control repository could not be created in %1.</source> <translation>%1 ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> - <message> - <source>There is no patch-command configured in the common 'Version Control' settings.</source> - <translation>共通 'ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†' è¨å®šã« patch コマンドã®è¨å®šãŒã‚ã‚Šã¾ã›ã‚“。</translation> - </message> - <message> - <source>Unable to launch '%1': %2</source> - <translation>'%1' ã‚’èµ·å‹•ã§ãã¾ã›ã‚“: %2</translation> - </message> - <message> - <source>A timeout occurred running '%1'</source> - <translation>'%1' を実行ä¸ã«ã‚¿ã‚¤ãƒ アウトãŒç™ºç”Ÿã—ã¾ã—ãŸ</translation> - </message> - <message> - <source>'%1' crashed.</source> - <translation>'%1' ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>'%1' failed (exit code %2).</source> - <translation>'%1' ãŒå¤±æ•—ã—ã¾ã—ãŸ(終了コード %2)。</translation> - </message> </context> <context> <name>VcsBase::VcsBaseSubmitEditor</name> @@ -37463,16 +36422,16 @@ Will not be applied to whitespace in comments and strings.</source> <translation>[%1] %2 を実行ä¸</translation> </message> <message> - <source>The check script '%1' could not be started: %2</source> - <translation>ãƒã‚§ãƒƒã‚¯ã‚¹ã‚¯ãƒªãƒ—ト '%1' ãŒé–‹å§‹ã§ãã¾ã›ã‚“: %2</translation> + <source>The check script "%1" could not be started: %2</source> + <translation>ãƒã‚§ãƒƒã‚¯ã‚¹ã‚¯ãƒªãƒ—ト "%1" ãŒé–‹å§‹ã§ãã¾ã›ã‚“: %2</translation> </message> <message> - <source>The check script '%1' timed out.</source> - <translation>ãƒã‚§ãƒƒã‚¯ã‚¹ã‚¯ãƒªãƒ—ト '%1' ã¯ã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸã€‚</translation> + <source>The check script "%1" timed out.</source> + <translation>ãƒã‚§ãƒƒã‚¯ã‚¹ã‚¯ãƒªãƒ—ト "%1" ã¯ã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>The check script '%1' crashed.</source> - <translation>ãƒã‚§ãƒƒã‚¯ã‚¹ã‚¯ãƒªãƒ—ト '%1' ã¯ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> + <source>The check script "%1" crashed.</source> + <translation>ãƒã‚§ãƒƒã‚¯ã‚¹ã‚¯ãƒªãƒ—ト "%1" ã¯ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> </message> <message> <source>The check script returned exit code %1.</source> @@ -37491,13 +36450,6 @@ Will not be applied to whitespace in comments and strings.</source> </message> </context> <context> - <name>Welcome::Internal::CommunityWelcomePage</name> - <message> - <source>News && Support</source> - <translation>ニュースã¨ã‚µãƒãƒ¼ãƒˆ</translation> - </message> -</context> -<context> <name>Welcome::Internal::WelcomeMode</name> <message> <source>Welcome</source> @@ -37652,53 +36604,6 @@ Will not be applied to whitespace in comments and strings.</source> </message> </context> <context> - <name>qbs::SpecialPlatformsSetup</name> - <message> - <source>This tool sets up a qbs profile for each installed target in a given %1 installation. -</source> - <translation>ã“ã®ãƒ„ールã§ã¯ %1 ã®å„インストールターゲットã«å¯¾ã—㦠qbs プãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¨å®šã—ã¾ã™ã€‚ -</translation> - </message> - <message> - <source>Usage: %1 [-h|<base directory>]</source> - <translation>使用方法: %1 [-h|<ベースディレクトリ>]</translation> - </message> - <message> - <source>The default base directory is '%1'.</source> - <translation>デフォルト述ã¹âˆ’宇ディレクトリã¯'%1'ã§ã™ã€‚</translation> - </message> - <message> - <source>Unknown option '%1' -%2.</source> - <translation>未知ã®ã‚ªãƒ—ション '%1' -%2.</translation> - </message> - <message> - <source>No base directory given and none auto-detected.</source> - <translation>ベースディレクトリãŒè‡ªå‹•æ¤œå‡ºã§ãã¾ã›ã‚“。</translation> - </message> - <message> - <source>Process hangs</source> - <translation>プãƒã‚»ã‚¹ã¯ä¸æ¢ã—ã¾ã—ãŸ</translation> - </message> - <message> - <source>Unexpected exit code %1</source> - <translation>予期ã—ãªã„終了コード %1</translation> - </message> - <message> - <source>Command '%1' failed: %2.</source> - <translation>コマンド '%1' ãŒå¤±æ•—ã—ã¾ã—ãŸ: %2.</translation> - </message> - <message> - <source>Output was: %1</source> - <translation>出力: %1</translation> - </message> - <message> - <source>Setting up profile '%1'...</source> - <translation>プãƒãƒ•ã‚¡ã‚¤ãƒ« '%1' ã®è¨å®šä¸...</translation> - </message> -</context> -<context> <name>qbs::Internal::Executor</name> <message> <source> for configuration %1</source> @@ -37708,12 +36613,20 @@ Will not be applied to whitespace in comments and strings.</source> <source>Building%1</source> <translation>%1 ã®ãƒ“ルドä¸</translation> </message> + <message> + <source>Failed to create directory '%1'.</source> + <translation>ディレクトリ '%1' ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + </message> </context> <context> <name>qbs::Internal::ScriptEngine</name> <message> + <source>Execution canceled</source> + <translation>実行ãŒã‚ャンセルã•ã‚Œã¾ã—ãŸ</translation> + </message> + <message> <source>Property %1 is deprecated. Please use %2 instead.</source> - <translation>プãƒãƒ‘ティ %1 ã¯éžæŽ¨å¥¨ã§ã™ã€‚代ã‚ã‚Šã« %2 を使用ã—ã¦ãã ã•ã„。</translation> + <translation>プãƒãƒ‘ティ %1 ã®ä½¿ç”¨ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。代ã‚ã‚Šã« %2 を使用ã—ã¦ãã ã•ã„。</translation> </message> <message> <source>Cannot open '%1'.</source> @@ -37724,6 +36637,10 @@ Will not be applied to whitespace in comments and strings.</source> <translation>'%1' ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆä¸ã®ã‚¨ãƒ©ãƒ¼: %2</translation> </message> <message> + <source>loadExtension: cannot load extension '%1'.</source> + <translation>loadExtension: エクステンション '%1' ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“。</translation> + </message> + <message> <source>The loadExtension function requires an extension name.</source> <translation>loadExtension 関数ã¯ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³åãŒå¿…è¦ã§ã™ã€‚</translation> </message> @@ -37732,8 +36649,8 @@ Will not be applied to whitespace in comments and strings.</source> <translation>loadExtension: 内部エラーã§ã™ã€‚サーãƒãƒ‘スãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>loadExtension: Cannot find extension '%1'.</source> - <translation>loadExtension: エクステンション '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>loadExtension: Cannot find extension '%1'. Search paths: %2.</source> + <translation>loadExtension: エクステンション '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 検索パス: %2.</translation> </message> <message> <source>The loadFile function requires a file path.</source> @@ -37919,6 +36836,18 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Qt プãƒã‚¸ã‚§ã‚¯ãƒˆæ©Ÿèƒ½ãƒ•ã‚¡ã‚¤ãƒ«</translation> </message> <message> + <source>Qt Project configuration file</source> + <translation>Qt プãƒã‚¸ã‚§ã‚¯ãƒˆè¨å®šãƒ•ã‚¡ã‚¤ãƒ«</translation> + </message> + <message> + <source>Qt Project cache file</source> + <translation>Qt プãƒã‚¸ã‚§ã‚¯ãƒˆã‚ャッシュファイル</translation> + </message> + <message> + <source>Qt Project stash file</source> + <translation>Qt プãƒã‚¸ã‚§ã‚¯ãƒˆ stash ファイル</translation> + </message> + <message> <source>QML file</source> <translation>QML ファイル</translation> </message> @@ -38132,10 +37061,6 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã«å®šç¾©ã•ã‚Œã¦ã„ã‚‹ *.astylerc ファイルを使用ã™ã‚‹</translation> </message> <message> - <source>Use self-defined style:</source> - <translation>ユーザー定義スタイルを使用ã™ã‚‹:</translation> - </message> - <message> <source>Artistic Style</source> <translation>Artistic Style</translation> </message> @@ -38144,6 +37069,10 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <extracomment>HOME is replaced by the user's home directory</extracomment> <translation>HOME ã«ã‚ã‚‹ .astylerc ã‹ astylerc ファイルを使用ã™ã‚‹</translation> </message> + <message> + <source>Use customized style:</source> + <translation>カスタムスタイルを使用ã™ã‚‹:</translation> + </message> </context> <context> <name>Beautifier::Internal::ClangFormat::ClangFormatOptionsPage</name> @@ -38164,14 +37093,6 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <translation>オプション</translation> </message> <message> - <source>Use Predefined Style:</source> - <translation>定義済ã¿ã‚¹ã‚¿ã‚¤ãƒ«ã‚’使用ã™ã‚‹:</translation> - </message> - <message> - <source>Use Customized Style:</source> - <translation>カスタムスタイルを使用ã™ã‚‹:</translation> - </message> - <message> <source>Format entire file if no text was selected. (For action Format Selected Text)</source> <translation>テã‚ストãŒé¸æŠžã•ã‚Œã¦ã„ãªã„å ´åˆã¯ãƒ•ã‚¡ã‚¤ãƒ«å…¨ä½“ã‚’æ•´å½¢ã™ã‚‹ã€‚(é¸æŠžã—ã¦ã„るテã‚ストã®æ•´å½¢ã‚¢ã‚¯ã‚·ãƒ§ãƒ³å®Ÿè¡Œæ™‚)</translation> </message> @@ -38179,6 +37100,14 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <source>Clang Format</source> <translation>Clang Format</translation> </message> + <message> + <source>Use predefined style:</source> + <translation>定義済ã¿ã‚¹ã‚¿ã‚¤ãƒ«ã‚’使用ã™ã‚‹:</translation> + </message> + <message> + <source>Use customized style:</source> + <translation>カスタムスタイルを使用ã™ã‚‹:</translation> + </message> </context> <context> <name>Beautifier::Internal::ConfigurationDialog</name> @@ -38195,8 +37124,8 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <translation>ドã‚ュメント</translation> </message> <message> - <source>Documentation for '%1'</source> - <translation>'%1' ã®ãƒ‰ã‚ュメント</translation> + <source>Documentation for "%1"</source> + <translation>"%1" ã®ãƒ‰ã‚ュメント</translation> </message> </context> <context> @@ -38249,10 +37178,6 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã«å®šç¾©ã•ã‚Œã¦ã„ã‚‹ uncrustify.cfg ファイルを使用ã™ã‚‹</translation> </message> <message> - <source>Use self-defined style:</source> - <translation>ユーザー定義スタイルを使用ã™ã‚‹:</translation> - </message> - <message> <source>Uncrustify</source> <translation>Uncrustify</translation> </message> @@ -38261,6 +37186,10 @@ Ex. "Revision: 15" を指定ã—ãŸå ´åˆã€ãƒ–ランãƒã¯ãƒªãƒ“ジョ <extracomment>HOME is replaced by the user's home directory</extracomment> <translation>HOME ã«ã‚ã‚‹ uncrustify.cfg ファイルを使用ã™ã‚‹</translation> </message> + <message> + <source>Use customized style:</source> + <translation>カスタムスタイルを使用ã™ã‚‹:</translation> + </message> </context> <context> <name>ClangCodeModel::Internal::ClangProjectSettingsPropertiesPage</name> @@ -38513,65 +37442,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </message> </context> <context> - <name>Qnx::Internal::BlackBerryDeployQtLibrariesDialog</name> - <message> - <source>Deploy Qt to BlackBerry Device</source> - <translation>Qt ã‚’ BlackBerry デãƒã‚¤ã‚¹ã«ãƒ‡ãƒ—ãƒã‚¤</translation> - </message> - <message> - <source>Qt library to deploy:</source> - <translation>デプãƒã‚¤ã™ã‚‹ Qt ライブラリ:</translation> - </message> - <message> - <source>Deploy</source> - <translation>デプãƒã‚¤</translation> - </message> - <message> - <source>Remote directory:</source> - <translation>リモートディレクトリ:</translation> - </message> - <message> - <source>/accounts/devuser/</source> - <translation>/accounts/devuser/</translation> - </message> - <message> - <source>qt</source> - <translation>qt</translation> - </message> - <message> - <source>Close</source> - <translation>é–‰ã˜ã‚‹</translation> - </message> - <message> - <source>Closing the dialog will stop the deployment. Are you sure you want to do this?</source> - <translation>ダイアãƒã‚°ã‚’é–‰ã˜ã‚‹ã¨ãƒ‡ãƒ—ãƒã‚¤ãŒåœæ¢ã—ã¾ã™ã€‚本当ã«ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’é–‰ã˜ã¾ã™ã‹?</translation> - </message> - <message> - <source>Please input a remote directory to deploy to.</source> - <translation>デプãƒã‚¤ã™ã‚‹ãƒªãƒ¢ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’入力ã—ã¦ãã ã•ã„。</translation> - </message> - <message> - <source>Connection failed: %1</source> - <translation>接続失敗: %1</translation> - </message> - <message> - <source>The remote directory '%1' already exists. Deploying to that directory will remove any files already present. - -Are you sure you want to continue?</source> - <translation>リモートディレクトリ '%1' ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ãƒ‡ãƒ—ãƒã‚¤ã™ã‚‹ã¨æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã™ã¹ã¦å‰Šé™¤ã•ã‚Œã¾ã™ã€‚ - -本当ã«ãƒ‡ãƒ—ãƒã‚¤ã—ã¾ã™ã‹?</translation> - </message> - <message> - <source>Checking existence of '%1'</source> - <translation>'%1' ã®å˜åœ¨ç¢ºèªä¸</translation> - </message> - <message> - <source>Removing '%1'</source> - <translation>'%1' ã®å‰Šé™¤ä¸</translation> - </message> -</context> -<context> <name>WinRt::Internal::WinRtPackageDeploymentStepWidget</name> <message> <source>Arguments:</source> @@ -38607,12 +37477,12 @@ Are you sure you want to continue?</source> <context> <name>QmlJS::ModelManagerInterface</name> <message> - <source>Indexing</source> - <translation>解æžä¸</translation> + <source>Parsing QML Files</source> + <translation>QML ファイルã®è§£æžä¸</translation> </message> <message> - <source>QML import scan</source> - <translation>QML import ã®ã‚¹ã‚ャン</translation> + <source>Scanning QML Imports</source> + <translation>QML import ã®ã‚¹ã‚ャンä¸</translation> </message> </context> <context> @@ -38678,9 +37548,9 @@ Check 'General Messages' output pane for details.</source> <translation>引数: %1</translation> </message> <message> - <source>Failed to parse '%1'. + <source>Failed to parse "%1". Error: %2</source> - <translation>'%1' ã®è§£æžã«å¤±æ•—ã—ã¾ã—ãŸã€‚ + <translation>"%1" ã®è§£æžã«å¤±æ•—ã—ã¾ã—ãŸã€‚ エラー: %2</translation> </message> <message> @@ -38734,10 +37604,8 @@ Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚ªãƒ—ションページ㧠qmldump アプリケーション゠<translation>AVD 作æˆä¸ã«ã‚¨ãƒ©ãƒ¼</translation> </message> <message> - <source>Cannot create a new AVD. No sufficiently recent Android SDK available. -Please install an SDK of at least API version %1.</source> - <translation>æ–°ã—ã„ AVD を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚é©åˆ‡ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Android SDK ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 -API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„。</translation> + <source>Could not start process "%1 %2"</source> + <translation>プãƒã‚»ã‚¹ "%1 %2" ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> </message> </context> <context> @@ -38825,6 +37693,18 @@ API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„ã <translation>ファイル "%1" ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“: %2。</translation> </message> <message> + <source>File was modified.</source> + <translation>ファイルã¯ç·¨é›†ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>Time out reached while formatting file %1.</source> + <translation>ファイル %1 ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆä¸ã«ã‚¿ã‚¤ãƒ アウトãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>File %1 was closed.</source> + <translation>ファイル %1 ãŒé–‰ã˜ã‚‰ã‚Œã¾ã—ãŸã€‚</translation> + </message> + <message> <source>Error in Beautifier: %1</source> <translation>Beautifier ã§ã‚¨ãƒ©ãƒ¼: %1</translation> </message> @@ -38943,8 +37823,8 @@ API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„ã <translation>PCH ファイル "%1" ã®ç”Ÿæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Precompiling...</source> - <translation>ヘッダーコンパイルä¸...</translation> + <source>Precompiling</source> + <translation>ヘッダーコンパイルä¸</translation> </message> </context> <context> @@ -39052,6 +37932,14 @@ API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„ã <source>Preserve Case when Replacing</source> <translation>ç½®æ›æ™‚ã«å¤§æ–‡å—/å°æ–‡å—ã‚’ç¶æŒã™ã‚‹</translation> </message> + <message> + <source>Search for...</source> + <translation>検索...</translation> + </message> + <message> + <source>Replace with...</source> + <translation>ç½®æ›...</translation> + </message> </context> <context> <name>Core::IFindFilter</name> @@ -39146,6 +38034,10 @@ API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„ã <context> <name>Core::SearchResultWindow</name> <message> + <source>History:</source> + <translation>å±¥æ´:</translation> + </message> + <message> <source>New Search</source> <translation>æ–°ã—ã„検索</translation> </message> @@ -39202,35 +38094,35 @@ API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„ã <translation>カスタムコマンドã®å®Ÿè¡Œ</translation> </message> <message> - <source>Previous command is still running ('%1'). + <source>Previous command is still running ("%1"). Do you want to kill it?</source> - <translation>å‰å›žã®ã‚³ãƒžãƒ³ãƒ‰ ('%1') ãŒã¾ã 実行ä¸ã§ã™ã€‚ + <translation>å‰å›žã®ã‚³ãƒžãƒ³ãƒ‰ ("%1") ãŒã¾ã 実行ä¸ã§ã™ã€‚ kill ã—ã¾ã™ã‹?</translation> </message> <message> - <source>Kill Previous Process?</source> - <translation>å‰å›žã®ãƒ—ãƒã‚»ã‚¹ã‚’ kill ã—ã¾ã™ã‹?</translation> - </message> - <message> - <source>Command '%1' finished.</source> - <translation>コマンド '%1' ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> + <source>Command "%1" finished.</source> + <translation>コマンド "%1" ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Command '%1' failed.</source> - <translation>コマンド '%1' ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + <source>Command "%1" failed.</source> + <translation>コマンド "%1" ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>Could not find executable for '%1'.</source> - <translation>'%1' ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Starting command "%1".</source> + <translation>コマンド "%1" ã‚’èµ·å‹•ã—ã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <source>Starting command '%1'.</source> - <translation>コマンド '%1' を開始ã—ã¦ã„ã¾ã™ã€‚</translation> + <source>Kill Previous Process?</source> + <translation>å‰å›žã®ãƒ—ãƒã‚»ã‚¹ã‚’ kill ã—ã¾ã™ã‹?</translation> </message> <message> <source>Could not start process: %1.</source> <translation>プãƒã‚»ã‚¹ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸ: %1.</translation> </message> + <message> + <source>Could not find executable for "%1".</source> + <translation>"%1" ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> </context> <context> <name>Core::Internal::FileSystemFilter</name> @@ -39238,6 +38130,10 @@ kill ã—ã¾ã™ã‹?</translation> <source>Files in File System</source> <translation>ファイルシステム上ã®ãƒ•ã‚¡ã‚¤ãƒ«</translation> </message> + <message> + <source>Create and Open "%1"</source> + <translation>"%1" を作æˆã—ã¦é–‹ã</translation> + </message> </context> <context> <name>Core::ILocatorFilter</name> @@ -39269,8 +38165,8 @@ kill ã—ã¾ã™ã‹?</translation> <translation>パスを入力ã—ã¦ãã ã•ã„ (%1)</translation> </message> <message> - <source>Indexing</source> - <translation>解æžä¸</translation> + <source>Updating Locator Caches</source> + <translation>クイックアクセスã‚ャッシュã®æ›´æ–°ä¸</translation> </message> </context> <context> @@ -39374,6 +38270,13 @@ kill ã—ã¾ã™ã‹?</translation> <source>No difference</source> <translation>差分ãŒã‚ã‚Šã¾ã›ã‚“</translation> </message> + <message numerus="yes"> + <source>and %n more</source> + <extracomment>Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'"</extracomment> + <translation> + <numerusform>ãã®ä»–(%n)</numerusform> + </translation> + </message> </context> <context> <name>DiffEditor::DiffEditorManager</name> @@ -39384,6 +38287,13 @@ kill ã—ã¾ã™ã‹?</translation> </context> <context> <name>DiffEditor::SideDiffEditorWidget</name> + <message> + <source>[%1] %2</source> + <translation>[%1] %2</translation> + </message> +</context> +<context> + <name>DiffEditor::SideBySideDiffEditorWidget</name> <message numerus="yes"> <source>Skipped %n lines...</source> <translation> @@ -39391,12 +38301,13 @@ kill ã—ã¾ã™ã‹?</translation> </translation> </message> <message> - <source>[%1] %2</source> - <translation>[%1] %2</translation> + <source>Binary files differ</source> + <translation>ç•°ãªã‚‹ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«</translation> + </message> + <message> + <source>Skipped unknown number of lines...</source> + <translation>何行ã‹ã‚’スã‚ップ...</translation> </message> -</context> -<context> - <name>DiffEditor::SideBySideDiffEditorWidget</name> <message> <source>No controller</source> <translation>コントãƒãƒ¼ãƒ©ãƒ¼ãªã—</translation> @@ -39405,6 +38316,42 @@ kill ã—ã¾ã™ã‹?</translation> <source>No difference</source> <translation>差分ãŒã‚ã‚Šã¾ã›ã‚“</translation> </message> + <message> + <source>Send Chunk to CodePaster...</source> + <translation>CodePaster ã«ãƒãƒ£ãƒ³ã‚¯ã‚’é€ã‚‹...</translation> + </message> + <message> + <source>Apply Chunk...</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã®é©ç”¨...</translation> + </message> + <message> + <source>Revert Chunk...</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã™...</translation> + </message> + <message> + <source>Unable to Paste</source> + <translation>貼り付ã‘ä¸å¯</translation> + </message> + <message> + <source>Code pasting services are not available.</source> + <translation>コード貼り付ã‘サービスã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Revert Chunk</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã™</translation> + </message> + <message> + <source>Apply Chunk</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã®é©ç”¨</translation> + </message> + <message> + <source>Would you like to revert the chunk?</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ</translation> + </message> + <message> + <source>Would you like to apply the chunk?</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’é©ç”¨ã—ã¾ã™ã‹ï¼Ÿ</translation> + </message> </context> <context> <name>ProjectExplorer::KitConfigWidget</name> @@ -39466,8 +38413,8 @@ These files are preserved.</source> <context> <name>QbsProjectManager::QbsManager</name> <message> - <source>Failed opening project '%1': Project is not a file.</source> - <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ '%1' ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> + <source>Failed opening project "%1": Project is not a file.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆ "%1" ãŒé–‹ã‘ã¾ã›ã‚“: プãƒã‚¸ã‚§ã‚¯ãƒˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> <source>Failed to set up kit for Qbs: %1</source> @@ -39535,17 +38482,13 @@ These files are preserved.</source> <translation><ãƒã‚¤ãƒˆã‚³ãƒ¼ãƒ‰></translation> </message> <message> - <source>Source code not available.</source> - <translation>ソースコードãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>GUI Thread</source> + <translation>GUI スレッド</translation> </message> <message> <source>anonymous function</source> <translation>ç„¡å関数</translation> </message> - <message> - <source>Animations</source> - <translation>アニメーション</translation> - </message> </context> <context> <name>QmlProfiler::QV8ProfilerDataModel</name> @@ -39565,32 +38508,30 @@ These files are preserved.</source> <translation>%2 用 Qt %1</translation> </message> <message> - <source>QCC for %1</source> - <translation>%1 用 QCC</translation> + <source>- No auto detection source found.</source> + <translation>- ソースを自動検出ã§ãã¾ã›ã‚“。</translation> </message> <message> - <source>Debugger for %1</source> - <translation>%1 用デãƒãƒƒã‚¬</translation> - </message> - <message> - <source>The following errors occurred while activating target: %1</source> - <translation>ターゲットã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ™ãƒ¼ãƒˆä¸ã«ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %1</translation> + <source>- No sysroot found.</source> + <translation>- sysyroot ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <source>- No Qt version found.</source> - <translation>- Qt ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>The following errors occurred while activating target: %1 +</source> + <translation>ターゲットã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ™ãƒ¼ãƒˆä¸ã«ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %1 +</translation> </message> <message> - <source>- No GCC compiler found.</source> - <translation>- GCC コンパイラãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>QCC for %1</source> + <translation>%1 用 QCC</translation> </message> <message> - <source>- No GDB debugger found for BB10 Device.</source> - <translation>- BB10 デãƒã‚¤ã‚¹ç”¨ã® GDB デãƒãƒƒã‚¬ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>Debugger for %1</source> + <translation>%1 用デãƒãƒƒã‚¬</translation> </message> <message> - <source>- No GDB debugger found for BB10 Simulator.</source> - <translation>- BB10 シミュレータ用㮠GDB デãƒãƒƒã‚¬ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>- No Qt version found.</source> + <translation>- Qt ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> <source>Cannot Set up BB10 Configuration</source> @@ -39665,7 +38606,7 @@ These files are preserved.</source> <translation>確èª</translation> </message> <message> - <source>The device runtime version(%1) does not match the API level version(%2). + <source>The device runtime version (%1) does not match the API level version (%2). Do you want to continue anyway?</source> <translation>デãƒã‚¤ã‚¹ã®ãƒ©ãƒ³ã‚¿ã‚¤ãƒ ãƒãƒ¼ã‚¸ãƒ§ãƒ³(%1)㌠API レベルã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³(%2)ã¨ä¸€è‡´ã—ã¾ã›ã‚“。 本当ã«ç¶™ç¶šã—ã¾ã™ã‹?</translation> @@ -39947,25 +38888,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>Qnx::Internal::QNXPlugin</name> - <message> - <source>BAR descriptor file (BlackBerry)</source> - <translation type="obsolete">BAR 記述ファイル (BlackBerry)</translation> - </message> - <message> - <source>Could not add MIME type for bar-descriptor.xml editor.</source> - <translation type="obsolete">bar-descriptor.xml エディタ用㫠MIME åž‹ã®ç™»éŒ²ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>BAR Descriptor</source> - <translation type="obsolete">BAR Descriptor</translation> - </message> - <message> - <source>Attach to remote QNX application...</source> - <translation type="obsolete">リモート㮠QNX アプリケーションã«ã‚¢ã‚¿ãƒƒãƒ...</translation> - </message> -</context> -<context> <name>PrefixLangDialog</name> <message> <source>Prefix:</source> @@ -40009,13 +38931,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>VcsBase::Internal::CommonSettingsWidget</name> - <message> - <source>Command used for reverting diff chunks.</source> - <translation>差分ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã™éš›ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚</translation> - </message> -</context> -<context> <name>VcsBase::Internal::VcsPlugin</name> <message> <source>Name of the version control system in use by the current project.</source> @@ -40025,6 +38940,10 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <source>The current version control topic (branch or tag) identification of the current project.</source> <translation>ç¾åœ¨ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ãƒˆãƒ”ック(ブランãƒã‚„ã‚¿ã‚°)è˜åˆ¥åã§ã™ã€‚</translation> </message> + <message> + <source>The top level path to the repository the current project is in.</source> + <translation>ç¾åœ¨ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆãŒã‚るリãƒã‚¸ãƒˆãƒªã®ãƒˆãƒƒãƒ—レベルã¸ã®ãƒ‘スã§ã™ã€‚</translation> + </message> </context> <context> <name>WinRt::Internal::WinRtDeployConfiguration</name> @@ -40132,34 +39051,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>WinRt::Internal::WinRtRunControl</name> - <message> - <source>The current kit has no Qt version.</source> - <translation>ç¾åœ¨ã®ã‚ット㫠Qt ãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> - </message> - <message> - <source>Cannot find winrtrunner.exe in "%1".</source> - <translation>"%1" ã« winrtrunner.exe ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> - </message> - <message> - <source>winrtrunner crashed.</source> - <translation>winrtrunner ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>winrtrunner returned with exit code %1.</source> - <translation>winrtrunner ã®çµ‚了コード㯠%1 ã§ã™ã€‚</translation> - </message> - <message> - <source>winrtrunner finished successfully.</source> - <translation>winrtrunner ã¯æ£å¸¸ã«çµ‚了ã—ã¾ã—ãŸã€‚</translation> - </message> - <message> - <source>Error while executing winrtrunner: %1 -</source> - <translation>winrtrunner 実行ä¸ã®ã‚¨ãƒ©ãƒ¼: %1</translation> - </message> -</context> -<context> <name>WinRt::Internal::WinRtRunConfigurationFactory</name> <message> <source>Run App Package</source> @@ -40180,15 +39071,14 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <context> <name>qbs::AbstractJob</name> <message> - <source>Cannot start a job while another one is in process.</source> - <translation>ä»–ã®ã‚¸ãƒ§ãƒ–ã®å®Ÿè¡Œä¸ã«æ–°ãŸã«é–‹å§‹ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</translation> + <source>Cannot start a job while another one is in progress.</source> + <translation>ä»–ã®ã‚¸ãƒ§ãƒ–ã®å®Ÿè¡Œä¸ã«æ–°ãŸãªã‚¸ãƒ§ãƒ–を開始ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</translation> </message> </context> <context> <name>qbs::Internal::JsCommandExecutor</name> <message> - <source>Error while executing JavaScriptCommand: -</source> + <source>Error while executing JavaScriptCommand:</source> <translation>JavaScriptCommand 実行ä¸ã®ã‚¨ãƒ©ãƒ¼:</translation> </message> </context> @@ -40219,63 +39109,1786 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name></name> + <name>Ios::Internal::IosPresetBuildStep</name> <message> - <source>%1 not found.</source> - <translation type="obsolete">%1 ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + <source>Reset to Default</source> + <translation>デフォルトã«æˆ»ã™</translation> </message> <message> - <source> for configuration %1</source> - <translation type="obsolete"> è¨å®š %1 用</translation> + <source>Command:</source> + <translation>コマンド:</translation> </message> <message> - <source>The process '%1' could not be started: %2</source> - <translation type="obsolete">プãƒã‚»ã‚¹ '%1' を開始ã§ãã¾ã›ã‚“: %2</translation> + <source>Arguments:</source> + <translation>引数:</translation> </message> +</context> +<context> + <name>PuppetDialog</name> <message> - <source>Refusing to remove root directory.</source> - <translation type="obsolete">ルートディレクトリを削除ã™ã‚‹ã®ã‚’æ‹’å¦ã—ã¾ã™ã€‚</translation> + <source>Dialog</source> + <translation>ダイアãƒã‚°</translation> </message> +</context> +<context> + <name>Ios::Internal::IosAnalyzeSupport</name> <message> - <source>Installing</source> - <translation type="obsolete">インストールä¸</translation> + <source>Run ended with error.</source> + <translation>エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source>The directory %1 could not be deleted.</source> - <translation type="obsolete">ディレクトリ %1 を削除ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>Run ended.</source> + <translation>実行ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> + </message> +</context> +<context> + <name>Utils::ProxyCredentialsDialog</name> + <message> + <source>Proxy Credentials</source> + <translation>プãƒã‚ã‚·ã®èªè¨¼æƒ…å ±</translation> </message> <message> - <source>The file %1 could not be deleted.</source> - <translation type="obsolete">ファイル %1 を削除ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + <source>The proxy %1 requires a username and password.</source> + <translation>プãƒã‚ã‚· %1 ã«ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¨ãƒ‘スワードãŒå¿…è¦ã§ã™ã€‚</translation> + </message> + <message> + <source>Username:</source> + <translation>ユーザーå:</translation> + </message> + <message> + <source>Username</source> + <translation>ユーザーå</translation> + </message> + <message> + <source>Password:</source> + <translation>パスワード:</translation> + </message> + <message> + <source>Password</source> + <translation>パスワード</translation> </message> </context> <context> - <name>Ios::Internal::IosPresetBuildStep</name> + <name>ProjectExplorer::DeploymentDataView</name> <message> - <source>Reset to Default</source> - <translation>デフォルトã«æˆ»ã™</translation> + <source>Form</source> + <translation>フォーム</translation> </message> <message> - <source>Command:</source> - <translation>コマンド:</translation> + <source>Files to deploy:</source> + <translation>デプãƒã‚¤ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«:</translation> + </message> +</context> +<context> + <name>TabViewSpecifics</name> + <message> + <source>TabView</source> + <translation>タブビュー</translation> + </message> + <message> + <source>Current index</source> + <translation>ç¾åœ¨ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹</translation> + </message> + <message> + <source>Frame visible</source> + <translation>フレームå¯è¦–化</translation> + </message> + <message> + <source>Determines the visibility of the tab frame around contents.</source> + <translation>コンテンツã®å‘¨å›²ã«ã‚¿ãƒ–ã®ãƒ•ãƒ¬ãƒ¼ãƒ を表示ã™ã‚‹ã‹ã©ã†ã‹ã‚’指定ã™ã‚‹ã€‚</translation> + </message> + <message> + <source>Tabs visible</source> + <translation>タブå¯è¦–化</translation> + </message> + <message> + <source>Determines the visibility of the the tab bar.</source> + <translation>タブãƒãƒ¼ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã‚’指定ã™ã‚‹ã€‚</translation> + </message> + <message> + <source>Tab position</source> + <translation>タブã®ä½ç½®</translation> + </message> + <message> + <source>Determines the position of the tabs.</source> + <translation>タブã®ä½ç½®ã‚’指定ã™ã‚‹ã€‚</translation> + </message> +</context> +<context> + <name>PuppetBuildProgressDialog</name> + <message> + <source>Build Progress</source> + <translation>ビルドã®é€²è¡ŒçŠ¶æ³</translation> + </message> + <message> + <source>Build Adapter for the current Qt. Happens only once for every Qt installation.</source> + <translation>ç¾åœ¨ã® Qt 用ã®ã‚¢ãƒ€ãƒ—タをビルドã—ã¦ã„ã¾ã™ã€‚インストールã•ã‚Œã¦ã„ã‚‹ãã‚Œãžã‚Œã® Qt ã«å¯¾ã—ã¦ä¸€åº¦ã®ã¿è¡Œã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>Use Fallback QML Emulation Layer</source> + <translation>代替ã¨ã—㦠QML エミュレーション層を使用ã™ã‚‹</translation> + </message> +</context> +<context> + <name>ButtonsBar</name> + <message> + <source>Jump to previous event.</source> + <translation>å‰ã®ã‚¤ãƒ™ãƒ³ãƒˆã«ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>Jump to next event.</source> + <translation>次ã®ã‚¤ãƒ™ãƒ³ãƒˆã«ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>Show zoom slider.</source> + <translation>ズームスライダーを表示ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>Select range.</source> + <translation>範囲をé¸æŠžã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>View event information on mouseover.</source> + <translation>マウスオーãƒãƒ¼æ™‚ã«ã‚¤ãƒ™ãƒ³ãƒˆæƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚</translation> + </message> +</context> +<context> + <name>CategoryLabel</name> + <message> + <source><bytecode></source> + <translation><ãƒã‚¤ãƒˆã‚³ãƒ¼ãƒ‰></translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name> + <message> + <source>Deploy Qt to BlackBerry Device</source> + <translation>Qt ã‚’ BlackBerry デãƒã‚¤ã‚¹ã«ãƒ‡ãƒ—ãƒã‚¤</translation> + </message> + <message> + <source>Qt library to deploy:</source> + <translation>デプãƒã‚¤ã™ã‚‹ Qt ライブラリ:</translation> + </message> + <message> + <source>Deploy</source> + <translation>デプãƒã‚¤</translation> + </message> + <message> + <source>Remote directory:</source> + <translation>リモートディレクトリ:</translation> + </message> + <message> + <source>Close</source> + <translation>é–‰ã˜ã‚‹</translation> + </message> + <message> + <source>Closing the dialog will stop the deployment. Are you sure you want to do this?</source> + <translation>ダイアãƒã‚°ã‚’é–‰ã˜ã‚‹ã¨ãƒ‡ãƒ—ãƒã‚¤ãŒåœæ¢ã—ã¾ã™ã€‚本当ã«ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’é–‰ã˜ã¾ã™ã‹?</translation> + </message> + <message> + <source>Please input a remote directory to deploy to.</source> + <translation>デプãƒã‚¤ã™ã‚‹ãƒªãƒ¢ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’入力ã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Connection failed: %1</source> + <translation>接続失敗: %1</translation> + </message> + <message> + <source>The remote directory "%1" already exists. Deploying to that directory will remove any files already present. + +Are you sure you want to continue?</source> + <translation>リモートディレクトリ "%1" ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ãƒ‡ãƒ—ãƒã‚¤ã™ã‚‹ã¨æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã™ã¹ã¦å‰Šé™¤ã•ã‚Œã¾ã™ã€‚ + +本当ã«ãƒ‡ãƒ—ãƒã‚¤ã—ã¾ã™ã‹?</translation> + </message> + <message> + <source>Checking existence of "%1"</source> + <translation>"%1" ã®å˜åœ¨ã‚’確èªä¸</translation> + </message> + <message> + <source>Removing "%1"</source> + <translation>"%1" ã®å‰Šé™¤ä¸</translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxSettingsWidget</name> + <message> + <source>Form</source> + <translation>フォーム</translation> + </message> + <message> + <source>Generate kits</source> + <translation>生æˆã•ã‚ŒãŸã‚ット</translation> + </message> + <message> + <source>Configuration Information:</source> + <translation>構æˆæƒ…å ±:</translation> + </message> + <message> + <source>Name:</source> + <translation>åå‰:</translation> + </message> + <message> + <source>Version:</source> + <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³:</translation> + </message> + <message> + <source>Host:</source> + <translation>ホスト:</translation> + </message> + <message> + <source>Target:</source> + <translation>ターゲット:</translation> + </message> + <message> + <source>Add</source> + <translation>è¿½åŠ </translation> + </message> + <message> + <source>Remove</source> + <translation>削除</translation> + </message> + <message> + <source>Select QNX Environment File</source> + <translation>QNX 環境ファイルã®é¸æŠž</translation> + </message> + <message> + <source>Warning</source> + <translation>è¦å‘Š</translation> + </message> + <message> + <source>Configuration already exists or is invalid.</source> + <translation>構æˆãŒæ—¢ã«å˜åœ¨ã™ã‚‹ã‹ç„¡åŠ¹ã§ã™ã€‚</translation> + </message> + <message> + <source>Remove QNX Configuration</source> + <translation>リモート QNX 構æˆ</translation> + </message> + <message> + <source>Are you sure you want to remove: + %1?</source> + <translation>本当ã«å‰Šé™¤ã‚’è¡Œã„ã¾ã™ã‹: +%1?</translation> + </message> +</context> +<context> + <name>RemoteLinux::Internal::RemoteLinuxCustomRunConfigurationWidget</name> + <message> + <source>Form</source> + <translation>フォーム</translation> + </message> + <message> + <source>Local executable:</source> + <translation>ãƒãƒ¼ã‚«ãƒ«å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«:</translation> + </message> + <message> + <source>Remote executable:</source> + <translation>リモート実行ファイル:</translation> </message> <message> <source>Arguments:</source> <translation>引数:</translation> </message> + <message> + <source>Working directory:</source> + <translation>作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª:</translation> + </message> </context> <context> - <name>PuppetDialog</name> + <name>ColorEditor</name> <message> - <source>Dialog</source> - <translation>ダイアãƒã‚°</translation> + <source>Solid Color</source> + <translation>å˜è‰²</translation> + </message> + <message> + <source>Gradient</source> + <translation>グラデーション</translation> + </message> + <message> + <source>Transparent</source> + <translation>é€æ˜Žè‰²</translation> </message> </context> <context> - <name>Ios::Internal::IosAnalyzeSupport</name> + <name>StatesList</name> <message> - <source>Run ended.</source> - <translation>実行ãŒçµ‚了ã—ã¾ã—ãŸã€‚</translation> + <source>Collapse</source> + <translation>折りãŸãŸã‚€</translation> + </message> + <message> + <source>Expand</source> + <translation>展開</translation> + </message> +</context> +<context> + <name>QmlDebug::QmlDebugConnectionPrivate</name> + <message> + <source>Error: (%1) %2</source> + <extracomment>%1=error code, %2=error message</extracomment> + <translation>エラー: (%1) %2</translation> + </message> + <message> + <source><device is gone></source> + <translation><デãƒã‚¤ã‚¹ãªã—></translation> + </message> + <message> + <source>Network connection dropped</source> + <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šãŒã‚ã‚Šã¾ã›ã‚“</translation> + </message> + <message> + <source>Resolving host</source> + <translation>ホストåを解決ã—ã¦ã„ã¾ã™</translation> + </message> + <message> + <source>Establishing network connection ...</source> + <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã‚’確立ã—ã¦ã„ã¾ã™...</translation> + </message> + <message> + <source>Network connection established</source> + <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã•ã‚Œã¾ã—ãŸ</translation> + </message> + <message> + <source>Network connection closing</source> + <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã‚’切æ–ã—ã¦ã„ã¾ã™</translation> + </message> + <message> + <source>Socket state changed to BoundState. This should not happen!</source> + <translation>ソケットã®çŠ¶æ…‹ãŒ BoundSate ã«å¤‰åŒ–ã—ã¾ã—ãŸã€‚発生ã—ãªã„ã¯ãšã®çŠ¶æ…‹ã§ã™!</translation> + </message> + <message> + <source>Socket state changed to ListeningState. This should not happen!</source> + <translation>ソケットã®çŠ¶æ…‹ãŒ ListeningState ã«å¤‰åŒ–ã—ã¾ã—ãŸã€‚発生ã—ãªã„ã¯ãšã®çŠ¶æ…‹ã§ã™!</translation> + </message> +</context> +<context> + <name>QmlDebug::QmlDebugConnection</name> + <message> + <source>Connecting to debug server at %1:%2 ...</source> + <translation>デãƒãƒƒã‚°ã‚µãƒ¼ãƒãƒ¼ %1:%2 ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™...</translation> + </message> +</context> +<context> + <name>QDockWidget</name> + <message> + <source>Float</source> + <translation>フãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°</translation> + </message> + <message> + <source>Undocks and re-attaches the dock widget</source> + <translation>ドックウィジェットをドックã‹ã‚‰å¤–ã—ãŸã‚Šã€å†ã³ãƒ‰ãƒƒã‚ングã—ãŸã‚Šã§ãã¾ã™</translation> + </message> + <message> + <source>Close</source> + <translation>é–‰ã˜ã‚‹</translation> + </message> + <message> + <source>Closes the dock widget</source> + <translation>ドックウィジェットを閉ã˜ã‚‹</translation> + </message> +</context> +<context> + <name>Utils::FileWizardPage</name> + <message> + <source>Location</source> + <translation>パス</translation> + </message> +</context> +<context> + <name>Android::Internal::AvdDialog</name> + <message> + <source>Cannot create a new AVD. No sufficiently recent Android SDK available. +Install an SDK of at least API version %1.</source> + <translation>æ–°ã—ã„ AVD を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚é©åˆ‡ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Android SDK ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 +API ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %1 以上㮠SDK をインストールã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Cannot create a AVD for ABI %1. Install an image for it.</source> + <translation>ABI %1 用㮠AVD を作æˆã§ãã¾ã›ã‚“。対応ã™ã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’インストールã—ã¦ãã ã•ã„。</translation> + </message> +</context> +<context> + <name>BareMetal</name> + <message> + <source>Example:</source> + <translation>サンプル:</translation> + </message> + <message> + <source>Enter your hostname like "localhost" or "192.0.2.1" or a command which must support GDB pipelining starting with a pipe symbol.</source> + <translation>"localhost" ã‚„ "192.0.2.1" ãªã©ã®ãƒ›ã‚¹ãƒˆåã‹ã€ãƒ‘イプã®ã‚·ãƒ³ãƒœãƒ«ã§å§‹ã¾ã‚‹GDBパイプラインをサãƒãƒ¼ãƒˆã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’入力ã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Enter the hardware reset command here.<br>The CPU should be halted after this command.</source> + <translation>ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒªã‚»ãƒƒãƒˆã‚³ãƒžãƒ³ãƒ‰ã‚’入力ã—ã¦ãã ã•ã„。<br/>CPUã‚’åœæ¢ã•ã›ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’想定ã—ã¦ã„ã¾ã™ã€‚</translation> + </message> + <message> + <source>Enter commands to reset the board, and write the nonvolatile memory.</source> + <translation>ボードをリセットã—ã¦ã€ä¸æ®ç™ºãƒ¡ãƒ¢ãƒªã«æ›¸ã込むコマンドを入力ã—ã¦ãã ã•ã„。</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalDeviceConfigurationFactory</name> + <message> + <source>Bare Metal Device</source> + <translation>ベアメタルデãƒã‚¤ã‚¹</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalDeviceConfigurationWidget</name> + <message> + <source>GDB host:</source> + <translation>GDB ホスト:</translation> + </message> + <message> + <source>GDB port:</source> + <translation>GDB ãƒãƒ¼ãƒˆ:</translation> + </message> + <message> + <source>Init commands:</source> + <translation>åˆæœŸåŒ–コマンド:</translation> + </message> + <message> + <source>Reset commands:</source> + <translation>リセットコマンド:</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalDeviceConfigurationWizard</name> + <message> + <source>New Bare Metal Device Configuration Setup</source> + <translation>æ–°ã—ã„ベアメタルデãƒã‚¤ã‚¹æ§‹æˆã®è¨å®š</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalGdbCommandsDeployStep</name> + <message> + <source>GDB commands</source> + <translation>GDB コマンド</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalRunConfiguration</name> + <message> + <source>%1 (via GDB server or hardware debugger)</source> + <translation>%1 (GDBサーãƒãƒ¼ã‚ã‚‹ã„ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‡ãƒãƒƒã‚¬çµŒç”±)</translation> + </message> + <message> + <source>Run on GDB server or hardware debugger</source> + <extracomment>Bare Metal run configuration default run name</extracomment> + <translation>GDB サーãƒãƒ¼ã‚ã‚‹ã„ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ‡ãƒãƒƒã‚¬ä¸Šã§å®Ÿè¡Œ</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalRunConfigurationWidget</name> + <message> + <source>Executable:</source> + <translation>実行ファイル:</translation> + </message> + <message> + <source>Arguments:</source> + <translation>引数:</translation> + </message> + <message> + <source><default></source> + <translation><デフォルト></translation> + </message> + <message> + <source>Working directory:</source> + <translation>作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª:</translation> + </message> + <message> + <source>Unknown</source> + <translation>ä¸æ˜Ž</translation> + </message> +</context> +<context> + <name>Bazaar::Internal::CloneWizardFactory</name> + <message> + <source>Clones a Bazaar branch and tries to load the contained project.</source> + <translation>Bazaar ブランãƒã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + </message> + <message> + <source>Bazaar Clone (Or Branch)</source> + <translation>Bazaar クãƒãƒ¼ãƒ³ (ブランãƒ)</translation> + </message> +</context> +<context> + <name>Core::BaseFileWizardFactory</name> + <message> + <source>File Generation Failure</source> + <translation>ファイル生æˆã‚¨ãƒ©ãƒ¼</translation> + </message> + <message> + <source>Existing files</source> + <translation>上書ã時ã®ã‚¨ãƒ©ãƒ¼</translation> + </message> + <message> + <source>Failed to open an editor for "%1".</source> + <translation>"%1"をエディタã§é–‹ã‘ã¾ã›ã‚“。</translation> + </message> + <message> + <source>[read only]</source> + <translation>[èªå–専用]</translation> + </message> + <message> + <source>[folder]</source> + <translation>[フォルダ]</translation> + </message> + <message> + <source>[symbolic link]</source> + <translation>[シンボリックリンク]</translation> + </message> + <message> + <source>The project directory %1 contains files which cannot be overwritten: +%2.</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª %1 内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’上書ãã§ãã¾ã›ã‚“: +%2.</translation> + </message> +</context> +<context> + <name>Core::StandardFileWizardFactory</name> + <message> + <source>New %1</source> + <translation>æ–°ã—ã„ %1</translation> + </message> +</context> +<context> + <name>Core::DocumentModelPrivate</name> + <message> + <source><no document></source> + <translation><ドã‚ュメントãªã—></translation> + </message> + <message> + <source>No document is selected.</source> + <translation>ドã‚ュメントãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> + </message> +</context> +<context> + <name>Core::PatchTool</name> + <message> + <source>There is no patch-command configured in the general "Environment" settings.</source> + <translation>è¨å®šã®"環境"㧠patch コマンドãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> + </message> + <message> + <source>Executing in %1: %2 %3</source> + <translation>%1 ã§å®Ÿè¡Œä¸: %2 %3</translation> + </message> + <message> + <source>Unable to launch "%1": %2</source> + <translation>"%1" ã‚’èµ·å‹•ã§ãã¾ã›ã‚“: %2</translation> + </message> + <message> + <source>A timeout occurred running "%1"</source> + <translation>"%1" を実行ä¸ã«ã‚¿ã‚¤ãƒ アウトãŒç™ºç”Ÿã—ã¾ã—ãŸ</translation> + </message> + <message> + <source>"%1" crashed.</source> + <translation>"%1" ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>"%1" failed (exit code %2).</source> + <translation>"%1" ãŒå¤±æ•—ã—ã¾ã—ãŸ(終了コード %2)。</translation> + </message> +</context> +<context> + <name>Core::Internal::VariableChooserPrivate</name> + <message> + <source>Select a variable to insert.</source> + <translation>挿入ã™ã‚‹å¤‰æ•°ã‚’é¸æŠžã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Insert variable</source> + <translation>変数を挿入</translation> + </message> + <message> + <source>Current Value: %1</source> + <translation>ç¾åœ¨å€¤: %1</translation> + </message> +</context> +<context> + <name>Core::Internal::WindowSupport</name> + <message> + <source>Exit Full Screen</source> + <translation>全画é¢è¡¨ç¤ºã‚’ã‚„ã‚ã‚‹</translation> + </message> + <message> + <source>Enter Full Screen</source> + <translation>全画é¢è¡¨ç¤ºã«ã™ã‚‹</translation> + </message> +</context> +<context> + <name>CppEditor::Internal::CppEditorOutline</name> + <message> + <source>Sort Alphabetically</source> + <translation>ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆé †ã«ã‚½ãƒ¼ãƒˆ</translation> + </message> +</context> +<context> + <name>CppSourceProcessor</name> + <message> + <source>%1: No such file or directory</source> + <translation>%1: ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚‚ã—ãã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã‚ã‚Šã¾ã›ã‚“</translation> + </message> + <message> + <source>%1: Could not get file contents</source> + <translation>%1: ファイルã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ</translation> + </message> +</context> +<context> + <name>Cvs::Internal::CheckoutWizardFactory</name> + <message> + <source>Checks out a CVS repository and tries to load the contained project.</source> + <translation>CVS リãƒã‚¸ãƒˆãƒªã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + </message> + <message> + <source>CVS Checkout</source> + <translation>CVS ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ</translation> + </message> +</context> +<context> + <name>Debugger::Internal::LocalsAndExpressionsOptionsPage</name> + <message> + <source>Use Debugging Helper</source> + <translation>デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘を使用ã™ã‚‹</translation> + </message> + <message> + <source>The debugging helpers are used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. </source> + <translation>デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘㯠&quot;ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¨å¼&quot; ã«ãŠã„㦠QString ã‚„ std::map ã®ã‚ˆã†ãªç‰¹å®šã®åž‹ã‚’ã‚ã‹ã‚Šã‚„ã™ãã«è¡¨ç¤ºã™ã‚‹ç‚ºã«ä½¿ã‚ã‚Œã¾ã™ã€‚</translation> + </message> + <message> + <source>Use code model</source> + <translation>コードモデルを使用ã™ã‚‹</translation> + </message> + <message> + <source>Makes use of Qt Creator's code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source> + <translation>ã“ã®ã‚ªãƒ—ションをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã¨ã€å¤‰æ•°ãŒãƒ‡ãƒãƒƒã‚¬å‰²ã‚Šè¾¼ã¿æ™‚ã«å€¤ãŒä»£å…¥ã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã‚’調査ã™ã‚‹ç‚ºã« Qt Creator ã®ã‚³ãƒ¼ãƒ‰ãƒ¢ãƒ‡ãƒ«ãŒä½¿ç”¨ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚</translation> + </message> + <message> + <source>Displays names of QThread based threads.</source> + <translation>QThread ベースã®ã‚¹ãƒ¬ãƒƒãƒ‰åを表示ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>Display thread names</source> + <translation>スレッドåを表示ã™ã‚‹</translation> + </message> + <message> + <source>Shows "std::" prefix for types from the standard library.</source> + <translation>標準ライブラリ内ã®åž‹ã« "std::" プレフィックスを表示ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>Show "std::" namespace for types</source> + <translation>åž‹ã® "std::" åå‰ç©ºé–“を表示</translation> + </message> + <message> + <source>Shows Qt namespace prefix for Qt types. This is only relevant if Qt was configured with '-qtnamespace'.</source> + <translation>Qt ã®åž‹ã«ã¯ Qt åå‰ç©ºé–“を表示ã—ã¾ã™ã€‚Qt ㌠'-qtnamespace' 付ã㧠configure ã•ã‚Œã¦ã„ã‚‹å ´åˆã®ã¿æœ‰åŠ¹ã§ã™ã€‚</translation> + </message> + <message> + <source>Qt's namespace for types</source> + <translation>åž‹ã® Qt åå‰ç©ºé–“</translation> + </message> + <message> + <source><unlimited></source> + <translation><無制é™></translation> + </message> + <message> + <source>Maximum string length:</source> + <translation>最大文å—列長:</translation> + </message> + <message> + <source>Display string length:</source> + <translation>表示文å—列長:</translation> + </message> +</context> +<context> + <name>Debugger::Internal::DebuggerToolTipManager</name> + <message> + <source>Restored</source> + <translation>リストア済ã¿</translation> + </message> +</context> +<context> + <name>DiffEditor::UnifiedDiffEditorWidget</name> + <message> + <source>No controller</source> + <translation>コントãƒãƒ¼ãƒ©ãƒ¼ãªã—</translation> + </message> + <message> + <source>Send Chunk to CodePaster...</source> + <translation>CodePaster ã«ãƒãƒ£ãƒ³ã‚¯ã‚’é€ã‚‹...</translation> + </message> + <message> + <source>Apply Chunk...</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã®é©ç”¨...</translation> + </message> + <message> + <source>Revert Chunk...</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã™...</translation> + </message> + <message> + <source>Unable to Paste</source> + <translation>貼り付ã‘ä¸å¯</translation> + </message> + <message> + <source>Code pasting services are not available.</source> + <translation>コード貼り付ã‘サービスã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Revert Chunk</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã™</translation> + </message> + <message> + <source>Apply Chunk</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã®é©ç”¨</translation> + </message> + <message> + <source>Would you like to revert the chunk?</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ</translation> + </message> + <message> + <source>Would you like to apply the chunk?</source> + <translation>ãƒãƒ£ãƒ³ã‚¯ã‚’é©ç”¨ã—ã¾ã™ã‹ï¼Ÿ</translation> + </message> + <message> + <source>No difference</source> + <translation>差分ãŒã‚ã‚Šã¾ã›ã‚“</translation> + </message> +</context> +<context> + <name>EmacsKeys::Internal::EmacsKeysPlugin</name> + <message> + <source>Delete Character</source> + <translation>æ–‡å—ã®å‰Šé™¤</translation> + </message> + <message> + <source>Kill Word</source> + <translation>å˜èªžã®å‰Šé™¤</translation> + </message> + <message> + <source>Kill Line</source> + <translation>è¡Œã®å‰Šé™¤</translation> + </message> + <message> + <source>Insert New Line and Indent</source> + <translation>æ–°ã—ã„行を挿入ã—インデントã™ã‚‹</translation> + </message> + <message> + <source>Go to File Start</source> + <translation>ファイルã®å…ˆé ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to File End</source> + <translation>ファイルã®çµ‚端ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Line Start</source> + <translation>è¡Œé ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Line End</source> + <translation>行末ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Line</source> + <translation>次ã®è¡Œã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Line</source> + <translation>å‰ã®è¡Œã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Character</source> + <translation>次ã®æ–‡å—ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Character</source> + <translation>å‰ã®æ–‡å—ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Word</source> + <translation>次ã®å˜èªžã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Word</source> + <translation>å‰ã®å˜èªžã«ç§»å‹•</translation> + </message> + <message> + <source>Mark</source> + <translation>マーク</translation> + </message> + <message> + <source>Exchange Cursor and Mark</source> + <translation>カーソルã¨ãƒžãƒ¼ã‚¯ã®ä½ç½®ã‚’交æ›ã™ã‚‹</translation> + </message> + <message> + <source>Copy</source> + <translation>コピー</translation> + </message> + <message> + <source>Cut</source> + <translation>切りå–ã‚Š</translation> + </message> + <message> + <source>Yank</source> + <translation>ヤンク</translation> + </message> + <message> + <source>Scroll Half Screen Down</source> + <translation>åŠç”»é¢åˆ†ã‚¹ã‚¯ãƒãƒ¼ãƒ«ãƒ€ã‚¦ãƒ³ã™ã‚‹</translation> + </message> + <message> + <source>Scroll Half Screen Up</source> + <translation>åŠç”»é¢åˆ†ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã‚¢ãƒƒãƒ—ã™ã‚‹</translation> + </message> +</context> +<context> + <name>Git::Internal::CloneWizardFactory</name> + <message> + <source>Clones a Git repository and tries to load the contained project.</source> + <translation>Git リãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + </message> + <message> + <source>Git Repository Clone</source> + <translation>Git リãƒã‚¸ãƒˆãƒªã‚¯ãƒãƒ¼ãƒ³</translation> + </message> +</context> +<context> + <name>Gitorious::Internal::GitoriousCloneWizardFactory</name> + <message> + <source>Clones a Gitorious repository and tries to load the contained project.</source> + <translation>Gitorious リãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + </message> + <message> + <source>Gitorious Repository Clone</source> + <translation>Gitorious リãƒã‚¸ãƒˆãƒªã‚¯ãƒãƒ¼ãƒ³</translation> + </message> +</context> +<context> + <name>Git::Internal::GitSubmitEditor</name> + <message> + <source>Refreshing Commit Data</source> + <translation>コミットデータã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ä¸</translation> + </message> +</context> +<context> + <name>Git::Internal::RemoteModel</name> + <message> + <source>Name</source> + <translation>åå‰</translation> + </message> + <message> + <source>URL</source> + <translation>URL</translation> + </message> +</context> +<context> + <name>Help::Internal::HelpWidget</name> + <message> + <source>Go to Help Mode</source> + <translation>ヘルプモードã«ç§»è¡Œ</translation> + </message> + <message> + <source>Back</source> + <translation>戻る</translation> + </message> + <message> + <source>Forward</source> + <translation>進む</translation> + </message> + <message> + <source>Increase Font Size</source> + <translation>フォントを大ãã</translation> + </message> + <message> + <source>Decrease Font Size</source> + <translation>フォントをå°ã•ã</translation> + </message> + <message> + <source>Reset Font Size</source> + <translation>フォントã®å¤§ãã•ã‚’リセット</translation> + </message> + <message> + <source>Help</source> + <translation>ヘルプ</translation> + </message> + <message> + <source>Help - %1</source> + <translation>ヘルプ - %1</translation> + </message> +</context> +<context> + <name>Help::Internal::QtWebKitHelpWidget</name> + <message> + <source>Open Link as New Page</source> + <translation>リンクを新ã—ã„ページã§é–‹ã</translation> + </message> +</context> +<context> + <name>Help::Internal::SearchTaskHandler</name> + <message> + <source>Get Help Online</source> + <translation>オンラインã‹ã‚‰ãƒ˜ãƒ«ãƒ—ã‚’å–å¾—</translation> + </message> +</context> +<context> + <name>Help::Internal::SearchSideBarItem</name> + <message> + <source>Regenerate Index</source> + <translation>インデックスã®å†ç”Ÿæˆ</translation> + </message> +</context> +<context> + <name>Help::Internal::TextBrowserHelpWidget</name> + <message> + <source>Open Link</source> + <translation>リンクを開ã</translation> + </message> + <message> + <source>Open Link as New Page</source> + <translation>リンクを新ã—ã„ページã§é–‹ã</translation> + </message> + <message> + <source>Copy Link</source> + <translation>リンクをコピー</translation> + </message> + <message> + <source>Copy</source> + <translation>コピー</translation> + </message> + <message> + <source>Reload</source> + <translation>å†èªè¾¼</translation> + </message> +</context> +<context> + <name>Mercurial::Internal::CloneWizardFactory</name> + <message> + <source>Clones a Mercurial repository and tries to load the contained project.</source> + <translation>Mercurial リãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + </message> + <message> + <source>Mercurial Clone</source> + <translation>Mercurial クãƒãƒ¼ãƒ³</translation> + </message> +</context> +<context> + <name>ProjectExplorer::DeploymentDataModel</name> + <message> + <source>Local File Path</source> + <translation>ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス</translation> + </message> + <message> + <source>Remote Directory</source> + <translation>リモートディレクトリ</translation> + </message> +</context> +<context> + <name>ProjectWizard</name> + <message> + <source>The files are implicitly added to the projects:</source> + <translation>ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è‡ªå‹•çš„ã«ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«è¿½åŠ ã•ã‚Œã¾ã™:</translation> + </message> + <message> + <source><Implicitly Add></source> + <translation><自動的ã«è¿½åŠ ></translation> + </message> + <message> + <source><None></source> + <translation><ãªã—></translation> + </message> +</context> +<context> + <name>Utils::SettingsAccessor</name> + <message> + <source>No Valid Settings Found</source> + <translation>有効ãªè¨å®šãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation> + </message> + <message> + <source><p>No valid settings file could be found.</p><p>All settings files found in directory "%1" were either too new or too old to be read.</p></source> + <translation><p>有効ãªè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</p><p>ディレクトリ "%1" ã«æœ‰ã‚‹ã™ã¹ã¦ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯å¤ã™ãŽã‚‹ã‹æ–°ã—ã™ãŽã‚‹ã‹ã®ã©ã¡ã‚‰ã‹ã§ã™ã€‚</p></translation> + </message> + <message> + <source>Using Old Settings</source> + <translation>å¤ã„è¨å®šã®åˆ©ç”¨</translation> + </message> + <message> + <source><p>The versioned backup "%1" of the settings file is used, because the non-versioned file was created by an incompatible version of Qt Creator.</p><p>Settings changes made since the last time this version of Qt Creator was used are ignored, and changes made now will <b>not</b> be propagated to the newer version.</p></source> + <translation><p>ãƒãƒ¼ã‚¸ãƒ§ãƒ³æŒ‡å®šã®ãªã„è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒäº’æ›æ€§ã®ãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Creator ã§ä½œæˆã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³æŒ‡å®šã•ã‚ŒãŸãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—è¨å®šãƒ•ã‚¡ã‚¤ãƒ« "%1" を使用ã—ã¾ã™ã€‚</p><p>ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Creator ã§å‰å›žä¿å˜ã•ã‚ŒãŸè¨å®šã‚ˆã‚Šã‚‚後ã®å¤‰æ›´ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚今後ã®å¤‰æ›´å†…容ã¯ã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯<b>é©ç”¨ã•ã‚Œã¾ã›ã‚“</b>。</p></translation> + </message> +</context> +<context> + <name>ProjectExplorer::EnvironmentIdAccessor</name> + <message> + <source><p>No .user settings file created by this instance of Qt Creator was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%1"?</p></source> + <translation><p>ã“ã® Qt Creator ã§ä½œæˆã•ã‚ŒãŸ .user è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</p><p>ä»–ã®ãƒžã‚·ãƒ³ä¸Šã§ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ä½œæ¥ã‚’è¡Œã£ãŸã‹ã€ä»¥å‰ã¯ç•°ãªã‚‹ãƒ‘スã§ã“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—ã¦ã„ã¾ã—ãŸã‹?</p><p>ã“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ« "%1" ã‚’èªã¿è¾¼ã¿ã¾ã™ã‹?</p></translation> + </message> + <message> + <source>Settings File for "%1" from a different Environment?</source> + <translation>è¨å®šãƒ•ã‚¡ã‚¤ãƒ« "%1" ã¯ä»–ã®ç’°å¢ƒç”±æ¥ã®ã‚‚ã®ã§ã™ã‹?</translation> + </message> +</context> +<context> + <name>ProjectExplorer::Task</name> + <message> + <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> + <translation>ビルドã™ã‚‹ç‚ºã«ã¯ã‚³ãƒ³ãƒ‘イラã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ã‚ットオプションã§ã‚³ãƒ³ãƒ‘イラを構æˆã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Qt Creator needs a build configuration set up to build. Configure a build configuration in the project settings.</source> + <translation>ビルドã®è¨å®šã«ã¯ãƒ“ルド構æˆãŒå¿…è¦ã§ã™ã€‚プãƒã‚¸ã‚§ã‚¯ãƒˆã®è¨å®šã‹ã‚‰ãƒ“ルド構æˆã‚’è¨å®šã—ã¦ãã ã•ã„。</translation> + </message> +</context> +<context> + <name>ProjectExplorer::XcodebuildParser</name> + <message> + <source>Xcodebuild failed.</source> + <translation>Xcodebuild ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + </message> +</context> +<context> + <name>QbsProjectManager::Internal::QbsRootProjectNode</name> + <message> + <source>Qbs files</source> + <translation>Qbs ファイル</translation> + </message> +</context> +<context> + <name>QmlDesigner::CrumbleBar</name> + <message> + <source>Save the changes to preview them correctly.</source> + <translation>æ£ã—ãプレビューã™ã‚‹ãŸã‚ã«å¤‰æ›´å†…容をä¿å˜ã—ã¾ã™ã€‚</translation> + </message> + <message> + <source>Always save when leaving subcomponent</source> + <translation>サブコンãƒãƒ¼ãƒãƒ³ãƒˆã‚’抜ã‘ã‚‹ã¨ãã¯å¸¸ã«ä¿å˜ã™ã‚‹</translation> + </message> +</context> +<context> + <name>NavigatorTreeModel</name> + <message> + <source>Warning</source> + <translation>è¦å‘Š</translation> + </message> + <message> + <source>Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆ %1 ã®è¦ªå関係を修æ£ã™ã‚‹ã¨ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆ %2 ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚処ç†ã‚’続行ã—ã¾ã™ã‹ï¼Ÿ</translation> + </message> +</context> +<context> + <name>QmlDesigner::AddTabDesignerAction</name> + <message> + <source>Naming Error</source> + <translation>命åエラー</translation> + </message> + <message> + <source>Component already exists.</source> + <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚</translation> + </message> +</context> +<context> + <name>NodeInstanceServerProxy</name> + <message> + <source>Cannot Connect to QML Emulation Layer (QML Puppet)</source> + <translation>QML エミュレーション層(QML パペット)ã«æŽ¥ç¶šã§ãã¾ã›ã‚“</translation> + </message> + <message> + <source>The executable of the QML emulation layer (QML Puppet) may not be responding. Switching to another kit might help.</source> + <translation>QML エミュレーション層(QML パペット)ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿œç”ã—ã¦ã„ãªã„よã†ã§ã™ã€‚ä»–ã®ã‚ットã¸ã®å¤‰æ›´ã‚’検討ã—ã¦ãã ã•ã„。</translation> + </message> +</context> +<context> + <name>PuppetCreator</name> + <message> + <source>QML Emulation Layer (QML Puppet) Building was Unsuccessful</source> + <translation>QML エミュレーション層(QML パペット)ã®ãƒ“ルドã«å¤±æ•—ã—ã¾ã—ãŸ</translation> + </message> + <message> + <source>The QML emulation layer (QML Puppet) cannot be built. The fallback emulation layer, which does not support all features, will be used.</source> + <translation>QML エミュレーション層(QML パペット)をビルドã§ãã¾ã›ã‚“。ã™ã¹ã¦ã®æ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„代替エミュレーション層ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚</translation> + </message> + <message> + <source>Qt Version is not supported</source> + <translation>サãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®Qt</translation> + </message> + <message> + <source>The QML emulation layer (QML Puppet) cannot be built because the Qt version is too old or it cannot run natively on your computer. The fallback emulation layer, which does not support all features, will be used.</source> + <translation>QML エミュレーション層(QML パペット)をビルドã§ãã¾ã›ã‚“。Qt ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã‚‹ã‹ã€ã“ã®ã‚³ãƒ³ãƒ”ュータ上ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã™ã¹ã¦ã®æ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„代替エミュレーション層ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚</translation> + </message> + <message> + <source>Kit is invalid</source> + <translation>無効ãªã‚ット</translation> + </message> + <message> + <source>The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. For example the compiler can be misconfigured. Fix the kit configuration and restart Qt Creator. Otherwise, the fallback emulation layer, which does not support all features, will be used.</source> + <translation>QML エミュレーション層(QML パペット)をビルドã§ãã¾ã›ã‚“。ã‚ットãŒæ£ã—ã構æˆã•ã‚Œã¦ã„ã¾ã›ã‚“。ãŸã¨ãˆã°ã‚³ãƒ³ãƒ‘イラã®è¨å®šãªã©ã€ã‚ットã®è¨å®šã‚’ä¿®æ£ã—㦠Qt Creator ã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„。修æ£ã—ãªã„å ´åˆã€ã™ã¹ã¦ã®æ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„代替エミュレーション層ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚</translation> + </message> +</context> +<context> + <name>Qnx::Internal::BarDescriptorFileNodeManager</name> + <message> + <source>Cannot save bar descriptor file: %1</source> + <translation>BAR 記述ファイルをä¿å˜ã§ãã¾ã›ã‚“: %1</translation> + </message> + <message> + <source>Cannot reload bar descriptor file: %1</source> + <translation>BAR 記述ファイルをå†èªã¿è¾¼ã¿ã§ãã¾ã›ã‚“: %1</translation> + </message> + <message> + <source>Setup Application Descriptor File</source> + <translation>アプリケーション記述ファイルã®è¨å®š</translation> + </message> + <message> + <source>You need to set up a bar descriptor file to enable packaging. +Do you want Qt Creator to generate it for your project (%1)?</source> + <translation>パッケージングを行ã†ã«ã¯ BAR 記述ファイルã®è¨å®šãŒå¿…è¦ã§ã™ã€‚ +Qt Creator ã§ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆ(%1)ã®ãƒ‘ッケージを生æˆã—ã¾ã™ã‹?</translation> + </message> + <message> + <source>Don't ask again for this project</source> + <translation>ã“ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã¯ä»Šå¾Œã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ãªã„</translation> + </message> + <message> + <source>Cannot set up application descriptor file: Reading the bar descriptor template failed.</source> + <translation>アプリケーション記述ファイルをè¨å®šã§ãã¾ã›ã‚“: BAR 記述テンプレートã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Cannot set up application descriptor file: Writing the bar descriptor file failed.</source> + <translation>アプリケーション記述ファイルをè¨å®šã§ãã¾ã›ã‚“: BAR 記述ファイルã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Error</source> + <translation>エラー</translation> + </message> + <message> + <source>Cannot open BAR application descriptor file</source> + <translation>BAR アプリケーション記述ファイルを開ã‘ã¾ã›ã‚“</translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxBaseConfiguration</name> + <message> + <source>- No GCC compiler found.</source> + <translation>- GCC コンパイラãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>- No GDB debugger found for armvle7.</source> + <translation>- armvle7用㮠GDB デãƒãƒƒã‚¬ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + </message> + <message> + <source>- No GDB debugger found for x86.</source> + <translation>- x86用㮠GDB デãƒãƒƒã‚¬ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxConfiguration</name> + <message> + <source>The following errors occurred while activating the QNX configuration:</source> + <translation>QNX 構æˆã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ™ãƒ¼ãƒˆä¸ã«ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ:</translation> + </message> + <message> + <source>Cannot Set Up QNX Configuration</source> + <translation>QNX ãŒè¨å®šã§ãã¾ã›ã‚“</translation> + </message> + <message> + <source>QCC for %1 (armv7)</source> + <translation>%1 用 QCC(armv7)</translation> + </message> + <message> + <source>QCC for %1 (x86)</source> + <translation>%1 用 QCC(x86)</translation> + </message> + <message> + <source>Debugger for %1 (armv7)</source> + <translation>%1 用デãƒãƒƒã‚¬(armv7)</translation> + </message> + <message> + <source>Debugger for %1 (x86)</source> + <translation>%1 用デãƒãƒƒã‚¬(x86)</translation> + </message> + <message> + <source>Kit for %1 (armv7)</source> + <translation>%1 用ã‚ット(armv7)</translation> + </message> + <message> + <source>Kit for %1 (x86)</source> + <translation>%1 用ã‚ット(x86)</translation> + </message> +</context> +<context> + <name>QNX</name> + <message> + <source>QNX</source> + <translation>QNX</translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxSettingsPage</name> + <message> + <source>QNX</source> + <translation>QNX</translation> + </message> +</context> +<context> + <name>RemoteLinux::Internal::RemoteLinuxCustomRunConfiguration</name> + <message> + <source>The remote executable must be set in order to run a custom remote run configuration.</source> + <translation>カスタムãªãƒªãƒ¢ãƒ¼ãƒˆå®Ÿè¡Œæ§‹æˆã§å®Ÿè¡Œã™ã‚‹ãŸã‚ã«ã¯ãƒªãƒ¢ãƒ¼ãƒˆã®å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¨å®šã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Run "%1" on Linux Device</source> + <translation>Linux デãƒã‚¤ã‚¹ä¸Šã§ "%1" ã®å®Ÿè¡Œ</translation> + </message> + <message> + <source>Custom Executable (on Remote Generic Linux Host)</source> + <translation>カスタム実行ファイル (リモートã®ä¸€èˆ¬çš„㪠Linux ホスト上)</translation> + </message> +</context> +<context> + <name>Subversion::Internal::CheckoutWizardFactory</name> + <message> + <source>Checks out a Subversion repository and tries to load the contained project.</source> + <translation>Subversion リãƒã‚¸ãƒˆãƒªã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«èªã¿è¾¼ã¿ã¾ã™ã€‚</translation> + </message> + <message> + <source>Subversion Checkout</source> + <translation>Subversion ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ</translation> + </message> +</context> +<context> + <name>TaskList::Internal::TaskListPlugin</name> + <message> + <source>Cannot open task file %1: %2</source> + <translation>タスクファイル %1 ã‚’é–‹ã‘ã¾ã›ã‚“: %2</translation> + </message> + <message> + <source>File Error</source> + <translation>ファイルエラー</translation> + </message> + <message> + <source>My Tasks</source> + <translation>タスク</translation> + </message> + <message> + <source>Task file reader</source> + <translation>タスクファイルリーダー</translation> + </message> +</context> +<context> + <name>TextEditor::Internal::MultiDefinitionDownloader</name> + <message> + <source>Downloading Highlighting Definitions</source> + <translation>ãƒã‚¤ãƒ©ã‚¤ãƒˆå®šç¾©ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸</translation> + </message> + <message> + <source>Error downloading selected definition(s).</source> + <translation>é¸æŠžã•ã‚ŒãŸå®šç¾©ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Error downloading one or more definitions.</source> + <translation>定義ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Please check the directory's access rights.</source> + <translation>ディレクトリã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©é™ã‚’確èªã—ã¦ãã ã•ã„。</translation> + </message> + <message> + <source>Download Error</source> + <translation>ダウンãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼</translation> + </message> +</context> +<context> + <name>TextEditor::Internal::TextEditorActionHandlerPrivate</name> + <message> + <source>&Undo</source> + <translation>å…ƒã«æˆ»ã™(&U)</translation> + </message> + <message> + <source>&Redo</source> + <translation>ã‚„ã‚Šç›´ã™(&R)</translation> + </message> + <message> + <source>Delete &Line</source> + <translation>行削除(&L)</translation> + </message> + <message> + <source>Delete Word from Cursor On</source> + <translation>カーソルä½ç½®ã®å˜èªžã‚’削除</translation> + </message> + <message> + <source>Delete Word Camel Case from Cursor On</source> + <translation>カーソルä½ç½®ã®å˜èªžã®ã‚ャメルケースを削除</translation> + </message> + <message> + <source>Delete Word up to Cursor</source> + <translation>カーソルä½ç½®ã¾ã§ã®å˜èªžã‚’削除</translation> + </message> + <message> + <source>Delete Word Camel Case up to Cursor</source> + <translation>カーソルä½ç½®ã¾ã§ã®å˜èªžã®ã‚ャメルケースを削除</translation> + </message> + <message> + <source>Go to Block Start with Selection</source> + <translation>ブãƒãƒƒã‚¯ã®é–‹å§‹ä½ç½®ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+{</source> + <translation>Ctrl+{</translation> + </message> + <message> + <source>Go to Block End with Selection</source> + <translation>ブãƒãƒƒã‚¯ã®çµ‚了ä½ç½®ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+}</source> + <translation>Ctrl+}</translation> + </message> + <message> + <source>Move Line Up</source> + <translation>行を上ã«ç§»å‹•</translation> + </message> + <message> + <source>Ctrl+Shift+Up</source> + <translation>Ctrl+Shift+Up</translation> + </message> + <message> + <source>Move Line Down</source> + <translation>行を下ã«ç§»å‹•</translation> + </message> + <message> + <source>Ctrl+Shift+Down</source> + <translation>Ctrl+Shift+Down</translation> + </message> + <message> + <source>Copy Line Up</source> + <translation>上ã®è¡Œã«ã‚³ãƒ”ー</translation> + </message> + <message> + <source>Ctrl+Alt+Up</source> + <translation>Ctrl+Alt+Up</translation> + </message> + <message> + <source>Copy Line Down</source> + <translation>下ã®è¡Œã«ã‚³ãƒ”ー</translation> + </message> + <message> + <source>Ctrl+Alt+Down</source> + <translation>Ctrl+Alt+Down</translation> + </message> + <message> + <source>Join Lines</source> + <translation>行をçµåˆ</translation> + </message> + <message> + <source>Ctrl+J</source> + <translation>Ctrl+J</translation> + </message> + <message> + <source>Insert Line Above Current Line</source> + <translation>ç¾åœ¨è¡Œã®ä¸Šã«è¡Œã‚’è¿½åŠ </translation> + </message> + <message> + <source>Ctrl+Shift+Return</source> + <translation>Ctrl+Shift+Return</translation> + </message> + <message> + <source>Insert Line Below Current Line</source> + <translation>ç¾åœ¨è¡Œã®ä¸‹ã«è¡Œã‚’è¿½åŠ </translation> + </message> + <message> + <source>Ctrl+Return</source> + <translation>Ctrl+Return</translation> + </message> + <message> + <source>Indent</source> + <translation>インデント</translation> + </message> + <message> + <source>Unindent</source> + <translation>インデント解除</translation> + </message> + <message> + <source>Follow Symbol Under Cursor</source> + <translation>カーソルä½ç½®ã®ã‚·ãƒ³ãƒœãƒ«ã®å®šç¾©ã¸ç§»å‹•ã™ã‚‹</translation> + </message> + <message> + <source>Follow Symbol Under Cursor in Next Split</source> + <translation>カーソルä½ç½®ã®ã‚·ãƒ³ãƒœãƒ«ã®å®šç¾©ã¸æ¬¡ã®åˆ†å‰²ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ç§»å‹•ã™ã‚‹</translation> + </message> + <message> + <source>Meta+E, F2</source> + <translation>Meta+E, F2</translation> + </message> + <message> + <source>Ctrl+E, F2</source> + <translation>Ctrl+E, F2</translation> + </message> + <message> + <source>Jump To File Under Cursor</source> + <translation>カーソルä½ç½®ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¸ç§»å‹•ã™ã‚‹</translation> + </message> + <message> + <source>Move the View a Page Up and Keep the Cursor Position</source> + <translation>カーソルä½ç½®ã‚’ç¶æŒã—ã¦è¡¨ç¤ºã‚’ページアップã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+PgUp</source> + <translation>Ctrl+PgUp</translation> + </message> + <message> + <source>Move the View a Page Down and Keep the Cursor Position</source> + <translation>カーソルä½ç½®ã‚’ç¶æŒã—ã¦è¡¨ç¤ºã‚’ページダウンã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+PgDown</source> + <translation>Ctrl+PgDown</translation> + </message> + <message> + <source>Move the View a Line Up and Keep the Cursor Position</source> + <translation>カーソルä½ç½®ã‚’ç¶æŒã—ã¦ä¸€è¡Œä¸Šã‚’表示ã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+Up</source> + <translation>Ctrl+Up</translation> + </message> + <message> + <source>Move the View a Line Down and Keep the Cursor Position</source> + <translation>カーソルä½ç½®ã‚’ç¶æŒã—ã¦ä¸€è¡Œä¸‹ã‚’表示ã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+Down</source> + <translation>Ctrl+Down</translation> + </message> + <message> + <source>Select Encoding...</source> + <translation>æ–‡å—コードã®é¸æŠž...</translation> + </message> + <message> + <source>Paste from Clipboard History</source> + <translation>クリップボード履æ´ã‹ã‚‰è²¼ã‚Šä»˜ã‘</translation> + </message> + <message> + <source>Ctrl+Shift+V</source> + <translation>Ctrl+Shift+V</translation> + </message> + <message> + <source>Auto-&indent Selection</source> + <translation>é¸æŠžç¯„囲を自動インデント(&I)</translation> + </message> + <message> + <source>Ctrl+I</source> + <translation>Ctrl+I</translation> + </message> + <message> + <source>&Rewrap Paragraph</source> + <translation>段è½ã®æŠ˜ã‚Šè¿”ã—ã‚’å†æ§‹ç¯‰(&R)</translation> + </message> + <message> + <source>Meta+E, R</source> + <translation>Meta+E, R</translation> + </message> + <message> + <source>Ctrl+E, R</source> + <translation>Ctrl+E, R</translation> + </message> + <message> + <source>&Visualize Whitespace</source> + <translation>空白ã®å¯è¦–化(&V)</translation> + </message> + <message> + <source>Meta+E, Meta+V</source> + <translation>Meta+E, Meta+V</translation> + </message> + <message> + <source>Ctrl+E, Ctrl+V</source> + <translation>Ctrl+E, Ctrl+V</translation> + </message> + <message> + <source>Clean Whitespace</source> + <translation>空白ã®é™¤åŽ»</translation> + </message> + <message> + <source>Enable Text &Wrapping</source> + <translation>è¡Œã®æŠ˜ã‚Šè¿”ã—ã®æœ‰åŠ¹åŒ–(&W)</translation> + </message> + <message> + <source>Meta+E, Meta+W</source> + <translation>Meta+E, Meta+W</translation> + </message> + <message> + <source>Ctrl+E, Ctrl+W</source> + <translation>Ctrl+E, Ctrl+W</translation> + </message> + <message> + <source>Toggle Comment &Selection</source> + <translation>é¸æŠžç¯„囲ã®ã‚³ãƒ¡ãƒ³ãƒˆåŒ–/éžã‚³ãƒ¡ãƒ³ãƒˆåŒ–切替(&S)</translation> + </message> + <message> + <source>Ctrl+/</source> + <translation>Ctrl+/</translation> + </message> + <message> + <source>Cut &Line</source> + <translation>一行切りå–ã‚Š(&L)</translation> + </message> + <message> + <source>Shift+Del</source> + <translation>Shift+Del</translation> + </message> + <message> + <source>Copy &Line</source> + <translation>一行コピー(&L)</translation> + </message> + <message> + <source>Ctrl+Ins</source> + <translation>Ctrl+Ins</translation> + </message> + <message> + <source>Uppercase Selection</source> + <translation>é¸æŠžç¯„囲を大文å—ã«ã™ã‚‹</translation> + </message> + <message> + <source>Meta+Shift+U</source> + <translation>Meta+Shift+U</translation> + </message> + <message> + <source>Alt+Shift+U</source> + <translation>Alt+Shift+U</translation> + </message> + <message> + <source>Lowercase Selection</source> + <translation>é¸æŠžç¯„囲をå°æ–‡å—ã«ã™ã‚‹</translation> + </message> + <message> + <source>Meta+U</source> + <translation>Meta+U</translation> + </message> + <message> + <source>Alt+U</source> + <translation>Alt+U</translation> + </message> + <message> + <source>Fold</source> + <translation>折りãŸãŸã‚€</translation> + </message> + <message> + <source>Ctrl+<</source> + <translation>Ctrl+<</translation> + </message> + <message> + <source>Unfold</source> + <translation>展開ã™ã‚‹</translation> + </message> + <message> + <source>Ctrl+></source> + <translation>Ctrl+></translation> + </message> + <message> + <source>Toggle &Fold All</source> + <translation>ã™ã¹ã¦ã®å±•é–‹çŠ¶æ…‹ã‚’切り替ãˆã‚‹(&F)</translation> + </message> + <message> + <source>Increase Font Size</source> + <translation>フォントを大ãã</translation> + </message> + <message> + <source>Ctrl++</source> + <translation>Ctrl++</translation> + </message> + <message> + <source>Decrease Font Size</source> + <translation>フォントをå°ã•ã</translation> + </message> + <message> + <source>Ctrl+-</source> + <translation>Ctrl+-</translation> + </message> + <message> + <source>Reset Font Size</source> + <translation>フォントã®å¤§ãã•ã‚’リセット</translation> + </message> + <message> + <source>Meta+0</source> + <translation>Meta+0</translation> + </message> + <message> + <source>Ctrl+0</source> + <translation>Ctrl+0</translation> + </message> + <message> + <source>Go to Block Start</source> + <translation>ブãƒãƒƒã‚¯ã®é–‹å§‹ä½ç½®ã«ç§»å‹•</translation> + </message> + <message> + <source>Ctrl+[</source> + <translation>Ctrl+[</translation> + </message> + <message> + <source>Go to Block End</source> + <translation>ブãƒãƒƒã‚¯ã®çµ‚了ä½ç½®ã«ç§»å‹•</translation> + </message> + <message> + <source>Ctrl+]</source> + <translation>Ctrl+]</translation> + </message> + <message> + <source>Select Block Up</source> + <translation>é¸æŠžã—ãŸãƒ–ãƒãƒƒã‚¯ã‚’上ã¸</translation> + </message> + <message> + <source>Ctrl+U</source> + <translation>Ctrl+U</translation> + </message> + <message> + <source>Select Block Down</source> + <translation>é¸æŠžã—ãŸãƒ–ãƒãƒƒã‚¯ã‚’下ã¸</translation> + </message> + <message> + <source>Go to Line Start</source> + <translation>è¡Œé ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Line End</source> + <translation>行末ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Line</source> + <translation>次ã®è¡Œã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Line</source> + <translation>å‰ã®è¡Œã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Character</source> + <translation>å‰ã®æ–‡å—ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Character</source> + <translation>次ã®æ–‡å—ã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Word</source> + <translation>å‰ã®å˜èªžã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Word</source> + <translation>次ã®å˜èªžã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Previous Word Camel Case</source> + <translation>å‰ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Next Word Camel Case</source> + <translation>次ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•</translation> + </message> + <message> + <source>Go to Line Start with Selection</source> + <translation>è¡Œé ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Line End with Selection</source> + <translation>行末ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Next Line with Selection</source> + <translation>次ã®è¡Œã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Previous Line with Selection</source> + <translation>å‰ã®è¡Œã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Previous Character with Selection</source> + <translation>å‰ã®æ–‡å—ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Next Character with Selection</source> + <translation>次ã®æ–‡å—ã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Previous Word with Selection</source> + <translation>å‰ã®å˜èªžã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Next Word with Selection</source> + <translation>次ã®å˜èªžã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Previous Word Camel Case with Selection</source> + <translation>å‰ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source>Go to Next Word Camel Case with Selection</source> + <translation>次ã®å˜èªžã®ã‚ャメルケースã«ç§»å‹•ã—ã€é¸æŠžçŠ¶æ…‹ã«ã™ã‚‹</translation> + </message> + <message> + <source><line>:<column></source> + <translation><è¡Œ>:<列></translation> + </message> +</context> +<context> + <name>VcsBase::BaseCheckoutWizardFactory</name> + <message> + <source>Cannot Open Project</source> + <translation>プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’é–‹ã‘ã¾ã›ã‚“</translation> + </message> + <message> + <source>Failed to open project in "%1".</source> + <translation>"%1" ã«ã‚るプãƒã‚¸ã‚§ã‚¯ãƒˆãŒé–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>Could not find any project files matching (%1) in the directory "%2".</source> + <translation>ディレクトリ "%2" 内㫠(%1) ã«åˆè‡´ã™ã‚‹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>"%1" does not exist.</source> + <translation>"%1" ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> + </message> +</context> +<context> + <name>WinRt::Internal::WinRtDebugSupport</name> + <message> + <source>The WinRT debugging helper is missing from your Qt Creator installation. It was assumed to be located at</source> + <translation>ã“ã® Qt Creator ã« WinRT デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。通常㯠%1 ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™</translation> + </message> + <message> + <source>Cannot start the WinRT Runner Tool.</source> + <translation>WinRT Runner Tool ã‚’èµ·å‹•ã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Cannot establish connection to the WinRT debugging helper.</source> + <translation>WinRT デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã«æŽ¥ç¶šã§ãã¾ã›ã‚“。</translation> + </message> + <message> + <source>Cannot extract the PID from the WinRT debugging helper. (output: %1)</source> + <translation>WinRT デãƒãƒƒã‚°ãƒ˜ãƒ«ãƒ‘ã‹ã‚‰ PID を抽出ã§ãã¾ã›ã‚“。(出力: %1)</translation> + </message> + <message> + <source>Cannot create an appropriate run control for the current run configuration.</source> + <translation>ç¾åœ¨ã®å®Ÿè¡Œæ§‹æˆã«é©åˆ‡ãªå®Ÿè¡Œã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã‚’作æˆã§ãã¾ã›ã‚“。</translation> + </message> +</context> +<context> + <name>WinRt::Internal::WinRtRunnerHelper</name> + <message> + <source>The current kit has no Qt version.</source> + <translation>ç¾åœ¨ã®ã‚ット㫠Qt ãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> + </message> + <message> + <source>Cannot find winrtrunner.exe in "%1".</source> + <translation>"%1" ã« winrtrunner.exe ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚</translation> + </message> + <message> + <source>Error while executing the WinRT Runner Tool: %1 +</source> + <translation>WinRT Runner Tool 実行ä¸ã®ã‚¨ãƒ©ãƒ¼: %1</translation> + </message> +</context> +<context> + <name>qbs::Internal::ExecutorJob</name> + <message> + <source>Transformer execution canceled.</source> + <translation>Transformer ã®å®Ÿè¡ŒãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚</translation> </message> </context> </TS> diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 286d469281..f69e9074a7 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -160,11 +160,19 @@ <name>BaseQtVersion</name> <message> <source>The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4).</source> - <translation>КомпілÑтор '%1' (%2) не може генерувати код Ð´Ð»Ñ Qt верÑÑ–Ñ— '%3' (%4).</translation> + <translation type="vanished">КомпілÑтор '%1' (%2) не може генерувати код Ð´Ð»Ñ Qt верÑÑ–Ñ— '%3' (%4).</translation> </message> <message> <source>The compiler '%1' (%2) may not produce code compatible with the Qt version '%3' (%4).</source> - <translation>КомпілÑтор '%1' (%2) може не генерувати код ÑуміÑний з Qt верÑÑ–Ñ— '%3' (%4).</translation> + <translation type="vanished">КомпілÑтор '%1' (%2) може не генерувати код ÑуміÑний з Qt верÑÑ–Ñ— '%3' (%4).</translation> + </message> + <message> + <source>The compiler "%1" (%2) cannot produce code for the Qt version "%3" (%4).</source> + <translation>КомпілÑтор "%1" (%2) не може генерувати код Ð´Ð»Ñ Qt верÑÑ–Ñ— "%3" (%4).</translation> + </message> + <message> + <source>The compiler "%1" (%2) may not produce code compatible with the Qt version "%3" (%4).</source> + <translation>КомпілÑтор "%1" (%2) може генерувати код неÑуміÑний з Qt верÑÑ–Ñ— "%3" (%4).</translation> </message> <message> <source>Name:</source> @@ -211,6 +219,10 @@ <translation>Ðеобхідна Qt 4.8.0 або новіша.</translation> </message> <message> + <source>Building Debugging Helpers</source> + <translation>Побудова помічників зневадженнÑ</translation> + </message> + <message> <source>Requires Qt 4.7.1 or newer.</source> <translation type="vanished">Ðеобхідна Qt 4.7.1 або новіша.</translation> </message> @@ -220,7 +232,7 @@ </message> <message> <source>Building helpers</source> - <translation>Збірка помічників</translation> + <translation type="vanished">Збірка помічників</translation> </message> </context> <context> @@ -312,7 +324,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Show from oldest to newest</source> - <translation type="unfinished"></translation> + <translation>Показувати від найÑтарших до найновших</translation> </message> <message> <source>Include merges</source> @@ -443,7 +455,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Pull...</source> - <translation type="unfinished"></translation> + <translation>Ð’Ñ‚Ñгнути (pull)...</translation> </message> <message> <source>Push...</source> @@ -491,7 +503,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> <message> <source>Diff &Selected Files</source> - <translation type="unfinished"></translation> + <translation>&Зміни у вибраних файлах</translation> </message> <message> <source>There are no changes to commit.</source> @@ -599,11 +611,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Clones a Bazaar branch and tries to load the contained project.</source> - <translation>Клонує гілку Bazaar та намагаєть завантажити з нього проект.</translation> - </message> - <message> - <source>Bazaar Clone (Or Branch)</source> - <translation type="unfinished"></translation> + <translation type="vanished">Клонує гілку Bazaar та намагаєть завантажити з нього проект.</translation> </message> </context> <context> @@ -742,7 +750,7 @@ The new branch will depend on the availability of the source branch for all oper </message> <message> <source>Local</source> - <translation>Локальна змінна</translation> + <translation>Локально</translation> </message> <message> <source>Pull Source</source> @@ -905,6 +913,10 @@ Local pulls are not applied to the master branch.</source> <translation>ПереÑунути вниз</translation> </message> <message> + <source>&Edit</source> + <translation>&Редагувати</translation> + </message> + <message> <source>&Remove</source> <translation>&Видалити</translation> </message> @@ -926,7 +938,7 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Edit Note</source> - <translation>Редагувати примітку</translation> + <translation type="vanished">Редагувати примітку</translation> </message> </context> <context> @@ -980,8 +992,12 @@ Local pulls are not applied to the master branch.</source> <translation>ÐаÑтупна закладка в документі</translation> </message> <message> + <source>Edit Bookmark</source> + <translation>Редагувати закладку</translation> + </message> + <message> <source>Edit Bookmark Note</source> - <translation>Редагувати примітку до закладки</translation> + <translation type="vanished">Редагувати примітку до закладки</translation> </message> </context> <context> @@ -1061,7 +1077,11 @@ Local pulls are not applied to the master branch.</source> <name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name> <message> <source>Run cmake</source> - <translation>ЗапуÑтити cmake</translation> + <translation type="vanished">ЗапуÑтити cmake</translation> + </message> + <message> + <source>Run CMake...</source> + <translation>ЗапуÑтити CMake...</translation> </message> <message> <source>Reconfigure project:</source> @@ -1098,8 +1118,12 @@ Local pulls are not applied to the master branch.</source> <translation>ЗапуÑтити CMake</translation> </message> <message> + <source>Failed opening project "%1": Project is not a file</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": Проект не Ñ” файлом</translation> + </message> + <message> <source>Failed opening project '%1': Project is not a file</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> </message> </context> <context> @@ -1194,6 +1218,10 @@ Local pulls are not applied to the master branch.</source> <translation>ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ cbp в %1.</translation> </message> <message> + <source>The cached generator %1 is incompatible with the configured kits.</source> + <translation>Кешований генератор %1 неÑуміÑний з налаштованими комплектами.</translation> + </message> + <message> <source>No generator selected.</source> <translation>Генератор не обрано.</translation> </message> @@ -1253,11 +1281,11 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> + <translation type="vanished">Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> </message> <message> <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + <translation type="vanished">ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> </message> </context> <context> @@ -1334,7 +1362,7 @@ Local pulls are not applied to the master branch.</source> <name>ClassView::Internal::NavigationWidget</name> <message> <source>Form</source> - <translation>Форма</translation> + <translation type="vanished">Форма</translation> </message> <message> <source>Show Subprojects</source> @@ -1731,32 +1759,42 @@ Local pulls are not applied to the master branch.</source> <comment>msgShowOptionsDialog</comment> <translation>Ðалаштувати...</translation> </message> + <message> + <source>Open Preferences dialog.</source> + <comment>msgShowOptionsDialogToolTip (mac version)</comment> + <translation>Відкрити діалог налаштувань.</translation> + </message> + <message> + <source>Open Options dialog.</source> + <comment>msgShowOptionsDialogToolTip (non-mac version)</comment> + <translation>Відкрити діалог налаштувань.</translation> + </message> </context> <context> <name>Core::BaseFileWizard</name> <message> <source>File Generation Failure</source> - <translation>Збій генерації файлу</translation> + <translation type="vanished">Збій генерації файлу</translation> </message> <message> <source>Existing files</source> - <translation>ІÑнуючі файли</translation> + <translation type="vanished">ІÑнуючі файли</translation> </message> <message> <source>Failed to open an editor for '%1'.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€Ð° Ð´Ð»Ñ '%1'.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€Ð° Ð´Ð»Ñ '%1'.</translation> </message> <message> <source>[read only]</source> - <translation>[лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ]</translation> + <translation type="vanished">[лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ]</translation> </message> <message> <source>[folder]</source> - <translation>[тека]</translation> + <translation type="vanished">[тека]</translation> </message> <message> <source>[symbolic link]</source> - <translation>[Ñимволічне поÑиланнÑ]</translation> + <translation type="vanished">[Ñимволічне поÑиланнÑ]</translation> </message> <message> <source> [read only]</source> @@ -1773,7 +1811,7 @@ Local pulls are not applied to the master branch.</source> <message> <source>The project directory %1 contains files which cannot be overwritten: %2.</source> - <translation>Тека проекту %1 міÑтить файли, Ñкі не можуть бути перезапиÑані: + <translation type="vanished">Тека проекту %1 міÑтить файли, Ñкі не можуть бути перезапиÑані: %2.</translation> </message> </context> @@ -1890,6 +1928,10 @@ Local pulls are not applied to the master branch.</source> <translation>Ctrl+W</translation> </message> <message> + <source>Alternative Close</source> + <translation>Закрити</translation> + </message> + <message> <source>Ctrl+F4</source> <translation>Ctrl+F4</translation> </message> @@ -2022,6 +2064,10 @@ Local pulls are not applied to the master branch.</source> <translation>Закрити інші редактори</translation> </message> <message> + <source>Open With</source> + <translation>Відкрити за допомогою</translation> + </message> + <message> <source>File Error</source> <translation>Помилка файлу</translation> </message> @@ -2196,7 +2242,7 @@ Local pulls are not applied to the master branch.</source> <source>'%1' returned the following error: %2</source> - <translation>'%1' повернула наÑтупну помилку: + <translation type="vanished">'%1' повернула наÑтупну помилку: %2</translation> </message> @@ -2205,6 +2251,14 @@ Local pulls are not applied to the master branch.</source> <translation type="vanished">ÐалаштуваннÑ...</translation> </message> <message> + <source>"%1" returned the following error: + +%2</source> + <translation>"%1" повернула наÑтупну помилку: + +%2</translation> + </message> + <message> <source>Launching Windows Explorer Failed</source> <translation>Збій запуÑку Провідника Windows</translation> </message> @@ -2519,15 +2573,27 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Could not find executable for '%1' (expanded '%2')</source> - <translation>Ðе вдалоÑÑŒ знайти виконуваний модуль Ð´Ð»Ñ '%1' (розгорнуто '%2')</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти виконуваний модуль Ð´Ð»Ñ '%1' (розгорнуто '%2')</translation> </message> <message> <source>Starting external tool '%1' %2</source> - <translation>ЗапуÑк зовнішнього інÑтрумента '%1' %2</translation> + <translation type="vanished">ЗапуÑк зовнішнього інÑтрумента '%1' %2</translation> </message> <message> <source>'%1' finished</source> - <translation>'%1' завершено</translation> + <translation type="vanished">'%1' завершено</translation> + </message> + <message> + <source>Could not find executable for "%1" (expanded "%2")</source> + <translation>Ðе вдалоÑÑŒ знайти виконуваний модуль Ð´Ð»Ñ %1" (розгорнуто %2")</translation> + </message> + <message> + <source>Starting external tool "%1" %2</source> + <translation>ЗапуÑк зовнішнього інÑтрумента %1" %2</translation> + </message> + <message> + <source>"%1" finished</source> + <translation>%1" завершено</translation> </message> </context> <context> @@ -2585,6 +2651,10 @@ Local pulls are not applied to the master branch.</source> <translation><СиÑтемна мова></translation> </message> <message> + <source>Command used for reverting diff chunks.</source> + <translation>Команда Ð´Ð»Ñ Ð½Ð°ÐºÐ»Ð°Ð´Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚Ð¾Ðº.</translation> + </message> + <message> <source>Variables</source> <translation>Змінні</translation> </message> @@ -2662,6 +2732,10 @@ Local pulls are not applied to the master branch.</source> <source>Automatically creates temporary copies of modified files. If Qt Creator is restarted after a crash or power failure, it asks whether to recover the auto-saved content.</source> <translation>Ðвтоматично Ñтворювати тимчаÑові копії змінених файлів. Якщо Qt Creator буде перезапущено через помилку чи збій живленнÑ, то він запитає чи відновлювати автоматично збережений зміÑÑ‚.</translation> </message> + <message> + <source>Patch command:</source> + <translation>Команда patch:</translation> + </message> </context> <context> <name>Core::Internal::MainWindow</name> @@ -2671,11 +2745,11 @@ Local pulls are not applied to the master branch.</source> </message> <message> <source>Exit Full Screen</source> - <translation>Вийти з повноекранного режиму</translation> + <translation type="vanished">Вийти з повноекранного режиму</translation> </message> <message> <source>Enter Full Screen</source> - <translation>Перейти в повноекранний режим</translation> + <translation type="vanished">Перейти в повноекранний режим</translation> </message> <message> <source>&File</source> @@ -2698,6 +2772,10 @@ Local pulls are not applied to the master branch.</source> <translation>&Довідка</translation> </message> <message> + <source>Return to Editor</source> + <translation>Повернути до редактора</translation> + </message> + <message> <source>&New File or Project...</source> <translation>&Ðовий файл або проект...</translation> </message> @@ -2810,6 +2888,14 @@ Local pulls are not applied to the master branch.</source> <translation>МаÑштаб</translation> </message> <message> + <source>Close Window</source> + <translation>Закрити вікно</translation> + </message> + <message> + <source>Ctrl+Meta+W</source> + <translation>Ctrl+Meta+W</translation> + </message> + <message> <source>Show Sidebar</source> <translation>Показати бічну панель</translation> </message> @@ -3062,7 +3148,7 @@ Local pulls are not applied to the master branch.</source> <name>Core::Internal::OpenWithDialog</name> <message> <source>Open file '%1' with:</source> - <translation>Відкрити файл '%1' у:</translation> + <translation type="vanished">Відкрити файл '%1' у:</translation> </message> <message> <source>Open File With...</source> @@ -3072,6 +3158,10 @@ Local pulls are not applied to the master branch.</source> <source>Open file extension with:</source> <translation>Відкривати файли з розширеннÑм у:</translation> </message> + <message> + <source>Open file "%1" with:</source> + <translation>Відкрити файл %1" у:</translation> + </message> </context> <context> <name>Core::Internal::OutputPaneManager</name> @@ -3347,14 +3437,18 @@ Would you like to overwrite them?</source> <name>Core::StandardFileWizard</name> <message> <source>New %1</source> - <translation>Ðовий %1</translation> + <translation type="vanished">Ðовий %1</translation> </message> </context> <context> <name>Core::VariableChooser</name> <message> <source>Insert variable</source> - <translation>Ð’Ñтавити змінну</translation> + <translation type="vanished">Ð’Ñтавити змінну</translation> + </message> + <message> + <source>Variables</source> + <translation>Змінні</translation> </message> </context> <context> @@ -3462,7 +3556,7 @@ to version control (%2) <name>CppEditor::Internal::CPPEditorWidget</name> <message> <source>Sort Alphabetically</source> - <translation>Сортувати за абеткою</translation> + <translation type="vanished">Сортувати за абеткою</translation> </message> <message> <source>&Refactor</source> @@ -3483,6 +3577,10 @@ to version control (%2) <source>The header and source file names will be derived from the class name</source> <translation>Імена файлів заголовків та коду походитимуть від назви клаÑу</translation> </message> + <message> + <source>Details</source> + <translation>Деталі</translation> + </message> </context> <context> <name>CppEditor::Internal::CppClassWizard</name> @@ -3499,7 +3597,7 @@ to version control (%2) </message> <message> <source>Details</source> - <translation>Деталі</translation> + <translation type="vanished">Деталі</translation> </message> </context> <context> @@ -3546,11 +3644,11 @@ to version control (%2) <name>CppPreprocessor</name> <message> <source>%1: No such file or directory</source> - <translation>%1: Файл чи тека не Ñ–Ñнують</translation> + <translation type="vanished">%1: Файл чи тека не Ñ–Ñнують</translation> </message> <message> <source>%1: Could not get file contents</source> - <translation>%1: Ðе вдалоÑÑŒ отримати зміÑÑ‚ файлу</translation> + <translation type="vanished">%1: Ðе вдалоÑÑŒ отримати зміÑÑ‚ файлу</translation> </message> </context> <context> @@ -3716,7 +3814,11 @@ to version control (%2) </message> <message> <source>Adds leading asterisks when continuing Qt '/*!' and Java '/**' style comments on new lines.</source> - <translation>Додавати початкові зірочки при продовженні коментарів в Ñтилі Qt (/*!) та Java (/**) на новому Ñ€Ñдку.</translation> + <translation type="vanished">Додавати початкові зірочки при продовженні коментарів в Ñтилі Qt (/*!) та Java (/**) на новому Ñ€Ñдку.</translation> + </message> + <message> + <source>Adds leading asterisks when continuing C/C++ "/*", Qt "/*!" and Java "/**" style comments on new lines.</source> + <translation>Додавати початкові зірочки при продовженні коментарів в Ñтилі C/C++ "/*", Qt "/*!" та Java "/**" на новому Ñ€Ñдку.</translation> </message> </context> <context> @@ -4005,8 +4107,12 @@ if (a && <translation>Ð’Ð¶Ð¸Ð²Ð°Ð½Ð½Ñ C++:</translation> </message> <message> + <source>Searching for Usages</source> + <translation>Пошук вживань</translation> + </message> + <message> <source>Searching</source> - <translation>Пошук</translation> + <translation type="vanished">Пошук</translation> </message> <message> <source>C++ Macro Usages:</source> @@ -4066,7 +4172,7 @@ if (a && </message> <message> <source>Searching</source> - <translation>Пошук</translation> + <translation type="vanished">Пошук</translation> </message> <message> <source>C++ Symbols:</source> @@ -4081,6 +4187,10 @@ if (a && <translation type="vanished">Методи</translation> </message> <message> + <source>Searching for Symbol</source> + <translation>Пошук Ñимволу</translation> + </message> + <message> <source>Functions</source> <translation>Функції</translation> </message> @@ -4295,7 +4405,7 @@ Flags: %3</source> <name>Debugger::DebuggerEngine</name> <message> <source>Launching</source> - <translation>ЗапуÑк</translation> + <translation type="vanished">ЗапуÑк</translation> </message> <message> <source>Setup failed.</source> @@ -4416,6 +4526,10 @@ Setting breakpoints by file name and line number may fail. <translation>Спрацювала Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ñ‚Ð¾Ñ‡ÐºÐ° перепину даних %1 в 0x%2 в нитці %3.</translation> </message> <message> + <source>Launching Debugger</source> + <translation>ЗапуÑк зневаджувача</translation> + </message> + <message> <source>Stopped: %1 (Signal %2).</source> <translation>Зупинено: %1 (Ñигнал %2).</translation> </message> @@ -4489,8 +4603,16 @@ Setting breakpoints by file name and line number may fail. <translation>ЗневадженнÑ</translation> </message> <message> + <source>Option "%1" is missing the parameter.</source> + <translation>Опції "%1" бракує параметра.</translation> + </message> + <message> + <source>The parameter "%1" of option "%2" does not match the pattern <handle>:<pid>.</source> + <translation>Параметр "%1" опції "%2" не збігаєтьÑÑ Ð·Ñ– зразком <handle>:<pid>.</translation> + </message> + <message> <source>Option '%1' is missing the parameter.</source> - <translation>Опції '%1' бракує параметра.</translation> + <translation type="vanished">Опції '%1' бракує параметра.</translation> </message> <message> <source>Only one executable allowed!</source> @@ -4498,7 +4620,7 @@ Setting breakpoints by file name and line number may fail. </message> <message> <source>The parameter '%1' of option '%2' does not match the pattern <handle>:<pid>.</source> - <translation>Параметр '%1' опції '%2' не збігаєтьÑÑ Ð·Ñ– зразком <handle>:<pid>.</translation> + <translation type="vanished">Параметр '%1' опції '%2' не збігаєтьÑÑ Ð·Ñ– зразком <handle>:<pid>.</translation> </message> <message> <source>Invalid debugger option: %1</source> @@ -4896,7 +5018,7 @@ Affected are breakpoints %1</source> <name>Debugger::Internal::BreakWindow</name> <message> <source>Breakpoints</source> - <translation>Точки перепину</translation> + <translation type="vanished">Точки перепину</translation> </message> </context> <context> @@ -5075,8 +5197,16 @@ This feature is only available for GDB.</source> <translation>Вже Ñ–Ñнує</translation> </message> <message> + <source>A file named "%1" already exists.</source> + <translation>Файл з іменем "%1" вже Ñ–Ñнує.</translation> + </message> + <message> + <source>The folder "%1" could not be created.</source> + <translation>Ðе вдалоÑÑŒ Ñтворити теку "%1".</translation> + </message> + <message> <source>A file named '%1' already exists.</source> - <translation>Файл з іменем '%1' вже Ñ–Ñнує.</translation> + <translation type="vanished">Файл з іменем '%1' вже Ñ–Ñнує.</translation> </message> <message> <source>Cannot Create</source> @@ -5084,7 +5214,7 @@ This feature is only available for GDB.</source> </message> <message> <source>The folder '%1' could not be created.</source> - <translation>Ðе вдалоÑÑŒ Ñтворити теку '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ Ñтворити теку '%1'.</translation> </message> </context> <context> @@ -5118,7 +5248,11 @@ This feature is only available for GDB.</source> <name>Debugger::Internal::CdbEngine</name> <message> <source>The console process '%1' could not be started.</source> - <translation>Ðе вдалоÑÑŒ запуÑтити конÑольний Ð¿Ñ€Ð¾Ñ†ÐµÑ '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ запуÑтити конÑольний Ð¿Ñ€Ð¾Ñ†ÐµÑ '%1'.</translation> + </message> + <message> + <source>The console process "%1" could not be started.</source> + <translation>Ðе вдалоÑÑŒ запуÑтити конÑольний Ð¿Ñ€Ð¾Ñ†ÐµÑ "%1".</translation> </message> <message> <source>Debugger Error</source> @@ -5161,6 +5295,10 @@ This feature is only available for GDB.</source> <translation>ÐŸÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð½Ðµ можливе в віддалених ÑеÑÑ–ÑÑ….</translation> </message> <message> + <source>Conditional breakpoint %1 (%2) in thread %3 triggered, examining expression "%4".</source> + <translation>Спрацювала умовна точка перепину %1 (%2) в нитці %3, вивчаєтьÑÑ Ð²Ð¸Ñ€Ð°Ð· "%4".</translation> + </message> + <message> <source>Malformed stop response received.</source> <translation>Отримано неправильну відповідь на запит зупинки.</translation> </message> @@ -5177,12 +5315,16 @@ This feature is only available for GDB.</source> <translation>Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ 0 отримано при обчиÑлені умови точки перепину %1, зупинÑємоÑÑŒ.</translation> </message> <message> + <source>"Select Widget to Watch": Not supported in state "%1".</source> + <translation>"Оберіть віджет Ð´Ð»Ñ Ð½Ð°Ð³Ð»Ñду": Стан "%1" не підтримуєтьÑÑ.</translation> + </message> + <message> <source>Trace point %1 (%2) in thread %3 triggered.</source> <translation>Спрацювала точка траÑÑƒÐ²Ð°Ð½Ð½Ñ %1 (%2) в нитці %3.</translation> </message> <message> <source>Conditional breakpoint %1 (%2) in thread %3 triggered, examining expression '%4'.</source> - <translation>Спрацювала умовна точка перепину %1 (%2) в нитці %3, вивчаєтьÑÑ Ð²Ð¸Ñ€Ð°Ð· '%4'.</translation> + <translation type="vanished">Спрацювала умовна точка перепину %1 (%2) в нитці %3, вивчаєтьÑÑ Ð²Ð¸Ñ€Ð°Ð· '%4'.</translation> </message> <message> <source>"Select Widget to Watch": Please stop the application first.</source> @@ -5190,7 +5332,7 @@ This feature is only available for GDB.</source> </message> <message> <source>"Select Widget to Watch": Not supported in state '%1'.</source> - <translation>"Оберіть віджет Ð´Ð»Ñ Ð½Ð°Ð³Ð»Ñду": Стан '%1' не підтримуєтьÑÑ.</translation> + <translation type="vanished">"Оберіть віджет Ð´Ð»Ñ Ð½Ð°Ð³Ð»Ñду": Стан '%1' не підтримуєтьÑÑ.</translation> </message> </context> <context> @@ -5407,7 +5549,7 @@ This feature is only available for GDB.</source> </message> <message> <source>Start '%1' and break at function 'main()'</source> - <translation>ЗапуÑтити '%1' та перерватиÑÑŒ на функції 'main()'</translation> + <translation type="vanished">ЗапуÑтити '%1' та перерватиÑÑŒ на функції 'main()'</translation> </message> <message> <source>Set Breakpoint at Line %1</source> @@ -5572,6 +5714,10 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat <translation>Під'єднуватиÑÑŒ можна лише до локально запущених процеÑів.</translation> </message> <message> + <source>Start "%1" and break at function "main()"</source> + <translation>ЗапуÑтити "%1" та перерватиÑÑŒ на функції 'main()'</translation> + </message> + <message> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> @@ -5580,6 +5726,46 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat <translation>F5</translation> </message> <message> + <source>Breakpoints</source> + <translation>Точки перепину</translation> + </message> + <message> + <source>Modules</source> + <translation>Модулі</translation> + </message> + <message> + <source>Registers</source> + <translation>РегіÑтри</translation> + </message> + <message> + <source>Stack</source> + <translation>Стек</translation> + </message> + <message> + <source>Source Files</source> + <translation>Файли коду</translation> + </message> + <message> + <source>Threads</source> + <translation>Ðитки</translation> + </message> + <message> + <source>Locals and Expressions</source> + <translation>Локальні змінні та вирази</translation> + </message> + <message> + <source>Snapshots</source> + <translation>Знімки</translation> + </message> + <message> + <source>Restart Debugging</source> + <translation>ПерезапуÑтити зневадженнÑ</translation> + </message> + <message> + <source>Restart the debugging session.</source> + <translation>ПерезапуÑк ÑеанÑу зневадженнÑ.</translation> + </message> + <message> <source>Add Expression Evaluator</source> <translation>Додати обчиÑлюваний вираз</translation> </message> @@ -5612,6 +5798,10 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat <translation>Скинути зневаджувач</translation> </message> <message> + <source>Shift+Ctrl+R</source> + <translation>Shift+Ctrl+R</translation> + </message> + <message> <source>Ctrl+Shift+O</source> <translation>Ctrl+Shift+O</translation> </message> @@ -5661,7 +5851,7 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat </message> <message> <source>Apply Changes on Save</source> - <translation>ЗаÑтоÑувати зміни при збереженні</translation> + <translation type="vanished">ЗаÑтоÑувати зміни при збереженні</translation> </message> <message> <source>Show Application on Top</source> @@ -5728,7 +5918,7 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat </message> <message> <source>Always Adjust Column Widths to Contents</source> - <translation>Завжди підганÑти ширину Ñтовпців до зміÑту</translation> + <translation type="vanished">Завжди підганÑти ширину Ñтовпців до зміÑту</translation> </message> <message> <source>Use Alternating Row Colors</source> @@ -5807,6 +5997,14 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat <translation>Ðалаштувати зневаджувач...</translation> </message> <message> + <source>Always Adjust View Column Widths to Contents</source> + <translation>Завжди підганÑти ширину Ñтовпців до зміÑту</translation> + </message> + <message> + <source>Keep Editor Stationary When Stepping</source> + <translation>ЗафікÑувати редактор під Ñ‡Ð°Ñ ÐºÑ€Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ</translation> + </message> + <message> <source>Debugger Font Size Follows Main Editor</source> <translation>Розмір шрифту зневаджувач відповідає головному редактору</translation> </message> @@ -5899,6 +6097,14 @@ Qt Creator не може під'єднатиÑÑŒ до нього.</translat <translation>ЗареєÑтрувати Ð´Ð»Ñ Ð¿Ð¾Ñмертного зневадженнÑ</translation> </message> <message> + <source>The maximum length of string entries in the Locals and Expressions pane. Longer than that are cut off and displayed with an ellipsis attached.</source> + <translation>МакÑимальна довжина Ñ€Ñдка елементу в панелі "Локальні змінні та вирази". Довші Ñ€Ñдки будуть обрізані та відображені з трикрапкою.</translation> + </message> + <message> + <source>The maximum length for strings in separated windows. Longer strings are cut off and displayed with an ellipsis attached.</source> + <translation>МакÑимальна довжина Ñ€Ñдків в відокремлених вікнах. Довші Ñ€Ñдки будуть обрізані та відображені з трикрапкою.</translation> + </message> + <message> <source>Reload Full Stack</source> <translation>Перезавантажити повний Ñтек</translation> </message> @@ -6136,6 +6342,14 @@ This might yield incorrect results.</source> <translation>Зупинено.</translation> </message> <message> + <source>There is no GDB binary available for binaries in format "%1"</source> + <translation>ВідÑутній GDB Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½ÑƒÐ²Ð°Ð½Ð¸Ñ… модулів в форматі "%1"</translation> + </message> + <message> + <source>The debugger settings point to a script file at "%1" which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source> + <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÑƒÐ²Ð°Ñ‡Ð° вказують на файл Ñкрипту в "%1", Ñкий недоÑтупний. Якщо файл Ñкрипту не потрібен, очиÑÑ‚Ñ–Ñ‚ÑŒ те поле, щоб уникнути цього попередженнÑ. </translation> + </message> + <message> <source>Failed to start application:</source> <translation>Збій запуÑку програми:</translation> </message> @@ -6315,7 +6529,7 @@ You can choose between waiting longer or aborting debugging.</source> </message> <message> <source>There is no GDB binary available for binaries in format '%1'</source> - <translation>ВідÑутній GDB Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½ÑƒÐ²Ð°Ð½Ð¸Ñ… модулів в форматі '%1'</translation> + <translation type="vanished">ВідÑутній GDB Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½ÑƒÐ²Ð°Ð½Ð¸Ñ… модулів в форматі '%1'</translation> </message> <message> <source>Retrieving data for stack view thread 0x%1...</source> @@ -6362,7 +6576,7 @@ You can choose between waiting longer or aborting debugging.</source> </message> <message> <source>The debugger settings point to a script file at '%1' which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source> - <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÑƒÐ²Ð°Ñ‡Ð° вказують на файл Ñкрипту в '%1', Ñкий недоÑтупний. Якщо файл Ñкрипту не потрібен, очиÑÑ‚Ñ–Ñ‚ÑŒ те поле, щоб уникнути цього попередженнÑ. </translation> + <translation type="vanished">ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÑƒÐ²Ð°Ñ‡Ð° вказують на файл Ñкрипту в '%1', Ñкий недоÑтупний. Якщо файл Ñкрипту не потрібен, очиÑÑ‚Ñ–Ñ‚ÑŒ те поле, щоб уникнути цього попередженнÑ. </translation> </message> <message> <source>The gdb process terminated.</source> @@ -6563,6 +6777,14 @@ markers in the source code editor.</source> <translation><html><head/><body><p>Введені тут команди GDB будуть виконані піÑÐ»Ñ Ð¿Ð¾Ð²Ð½Ð¾Ñ— ініціалізації помічників Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Qt Creator. Ви можете додати тут команди Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ñ… помічників Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ змінити Ñ–Ñнуючі.</p>%1</body></html></translation> </message> <message> + <source>Extra Debugging Helpers</source> + <translation>Додаткові помічники зневадженнÑ</translation> + </message> + <message> + <source>Path to a Python file containing additional data dumpers.</source> + <translation>ШлÑÑ… до файлу Python, що міÑтит додаткові відображувачі даних.</translation> + </message> + <message> <source>Extended</source> <translation>Розширені опції</translation> </message> @@ -6709,7 +6931,7 @@ markers in the source code editor.</source> <name>Debugger::Internal::ModulesWindow</name> <message> <source>Modules</source> - <translation>Модулі</translation> + <translation type="vanished">Модулі</translation> </message> </context> <context> @@ -6754,7 +6976,7 @@ markers in the source code editor.</source> </message> <message> <source>Unable to start pdb '%1': %2</source> - <translation>Ðеможливо запуÑтити pdb '%1': %2</translation> + <translation type="vanished">Ðеможливо запуÑтити pdb '%1': %2</translation> </message> <message> <source>Adapter start failed</source> @@ -6766,7 +6988,7 @@ markers in the source code editor.</source> </message> <message> <source>'%1' contains no identifier</source> - <translation>'%1' не міÑтить ідентифікатора</translation> + <translation type="vanished">'%1' не міÑтить ідентифікатора</translation> </message> <message> <source>String literal %1</source> @@ -6774,7 +6996,7 @@ markers in the source code editor.</source> </message> <message> <source>Cowardly refusing to evaluate expression '%1' with potential side effects</source> - <translation>ÐÑ–Ñкова відмова від обчиÑÐ»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð·Ñƒ '%1' з потенційними побічними ефектами</translation> + <translation type="vanished">ÐÑ–Ñкова відмова від обчиÑÐ»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð·Ñƒ '%1' з потенційними побічними ефектами</translation> </message> <message> <source>Pdb I/O Error</source> @@ -6782,7 +7004,23 @@ markers in the source code editor.</source> </message> <message> <source>The Pdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source> - <translation>Збій запуÑку процеÑу Pdb. Ðбо програма '%1', що викликаєтьÑÑ Ð²Ñ–Ð´ÑутнÑ, або, можливо, ви маєте недоÑтатньо прав Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку програми.</translation> + <translation type="vanished">Збій запуÑку процеÑу Pdb. Ðбо програма '%1', що викликаєтьÑÑ Ð²Ñ–Ð´ÑутнÑ, або, можливо, ви маєте недоÑтатньо прав Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку програми.</translation> + </message> + <message> + <source>Unable to start pdb "%1": %2</source> + <translation>Ðеможливо запуÑтити pdb "%1": %2</translation> + </message> + <message> + <source>"%1" contains no identifier</source> + <translation>"%1" не міÑтить ідентифікатора</translation> + </message> + <message> + <source>Cowardly refusing to evaluate expression "%1" with potential side effects</source> + <translation>ÐÑ–Ñкова відмова від обчиÑÐ»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð·Ñƒ "%1" з потенційними побічними ефектами</translation> + </message> + <message> + <source>The Pdb process failed to start. Either the invoked program "%1" is missing, or you may have insufficient permissions to invoke the program.</source> + <translation>Збій запуÑку процеÑу Pdb. Ðбо програма "%1", що викликаєтьÑÑ Ð²Ñ–Ð´ÑутнÑ, або, можливо, ви маєте недоÑтатньо прав Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку програми.</translation> </message> <message> <source>The Pdb process crashed some time after starting successfully.</source> @@ -6816,8 +7054,12 @@ markers in the source code editor.</source> <translation><p>СталаÑÑ Ð½Ðµ оброблена виключна ÑитуаціÑ:</p><p>%1</p></translation> </message> <message> + <source><p>An uncaught exception occurred in "%1":</p><p>%2</p></source> + <translation><p>СталаÑÑ Ð½Ðµ оброблена виключна ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ñ–Ñ Ð² "%1":</p><p>%2</p></translation> + </message> + <message> <source><p>An uncaught exception occurred in '%1':</p><p>%2</p></source> - <translation><p>СталаÑÑ Ð½Ðµ оброблена виключна ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ñ–Ñ Ð² %1:</p><p>%2</p></translation> + <translation type="vanished"><p>СталаÑÑ Ð½Ðµ оброблена виключна ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ñ–Ñ Ð² %1:</p><p>%2</p></translation> </message> <message> <source>No Local Variables</source> @@ -6870,8 +7112,12 @@ Do you want to retry?</source> <translation>Зневаджувач QML: Віддалений вузол закрив з'єднаннÑ.</translation> </message> <message> + <source>QML Debugger: Could not connect to service "%1".</source> + <translation>Зневаджувач QML: Ðе вдалоÑÑŒ підключитиÑÑŒ до ÑервіÑу "%1".</translation> + </message> + <message> <source>QML Debugger: Could not connect to service '%1'.</source> - <translation>Зневаджувач QML: Ðе вдалоÑÑŒ підключитиÑÑŒ до ÑервіÑу '%1'.</translation> + <translation type="vanished">Зневаджувач QML: Ðе вдалоÑÑŒ підключитиÑÑŒ до ÑервіÑу '%1'.</translation> </message> <message> <source>JS Source for %1</source> @@ -6925,18 +7171,26 @@ Do you want to retry?</source> <name>Debugger::Internal::RegisterMemoryView</name> <message> <source>Memory at Register '%1' (0x%2)</source> - <translation>Пам'ÑÑ‚ÑŒ з регіÑтру '%1' (0x%2)</translation> + <translation type="vanished">Пам'ÑÑ‚ÑŒ з регіÑтру '%1' (0x%2)</translation> </message> <message> <source>Register '%1'</source> - <translation>РегіÑÑ‚Ñ€ '%1'</translation> + <translation type="vanished">РегіÑÑ‚Ñ€ '%1'</translation> + </message> + <message> + <source>Memory at Register "%1" (0x%2)</source> + <translation>Пам'ÑÑ‚ÑŒ з регіÑтру "%1" (0x%2)</translation> + </message> + <message> + <source>Register "%1"</source> + <translation>РегіÑÑ‚Ñ€ "%1"</translation> </message> </context> <context> <name>Debugger::Internal::RegisterWindow</name> <message> <source>Registers</source> - <translation>РегіÑтри</translation> + <translation type="vanished">РегіÑтри</translation> </message> </context> <context> @@ -7008,7 +7262,7 @@ Do you want to retry?</source> <name>Debugger::Internal::SnapshotWindow</name> <message> <source>Snapshots</source> - <translation>Знімки</translation> + <translation type="vanished">Знімки</translation> </message> </context> <context> @@ -7026,7 +7280,7 @@ Do you want to retry?</source> <name>Debugger::Internal::SourceFilesWindow</name> <message> <source>Source Files</source> - <translation>Файли коду</translation> + <translation type="vanished">Файли коду</translation> </message> </context> <context> @@ -7112,7 +7366,7 @@ Do you want to retry?</source> <name>Debugger::Internal::StackWindow</name> <message> <source>Stack</source> - <translation>Стек</translation> + <translation type="vanished">Стек</translation> </message> </context> <context> @@ -7205,7 +7459,7 @@ Do you want to retry?</source> <name>Debugger::Internal::ThreadsWindow</name> <message> <source>Threads</source> - <translation>Ðитки</translation> + <translation type="vanished">Ðитки</translation> </message> </context> <context> @@ -7281,7 +7535,7 @@ Do you want to retry?</source> </message> <message> <source><Edit></source> - <translation><Змініть></translation> + <translation type="vanished"><Змініть></translation> </message> <message> <source><empty></source> @@ -7328,7 +7582,7 @@ Do you want to retry?</source> <name>Debugger::Internal::WatchModel</name> <message> <source><Edit></source> - <translation><Змінити></translation> + <translation type="vanished"><Змінити></translation> </message> <message numerus="yes"> <source>Array of %n items</source> @@ -7340,27 +7594,27 @@ Do you want to retry?</source> </message> <message> <source>Raw pointer</source> - <translation>Вказівник</translation> + <translation type="vanished">Вказівник</translation> </message> <message> <source>Latin1 string</source> - <translation>Ð Ñдок Latin1</translation> + <translation type="vanished">Ð Ñдок Latin1</translation> </message> <message> <source>UTF8 string</source> - <translation>Ð Ñдок UTF8</translation> + <translation type="vanished">Ð Ñдок UTF8</translation> </message> <message> <source>Local 8bit string</source> - <translation>Ð Ñдок в локальному 8-бітному кодуванні</translation> + <translation type="vanished">Ð Ñдок в локальному 8-бітному кодуванні</translation> </message> <message> <source>UTF16 string</source> - <translation>Ð Ñдок UTF16</translation> + <translation type="vanished">Ð Ñдок UTF16</translation> </message> <message> <source>UCS4 string</source> - <translation>Ð Ñдок UCS4</translation> + <translation type="vanished">Ð Ñдок UCS4</translation> </message> <message> <source>Array of 10 items</source> @@ -7372,19 +7626,19 @@ Do you want to retry?</source> </message> <message> <source>Decimal</source> - <translation>ДеÑÑтковий</translation> + <translation type="vanished">ДеÑÑтковий</translation> </message> <message> <source>Hexadecimal</source> - <translation>ШіÑтнадцÑтковий</translation> + <translation type="vanished">ШіÑтнадцÑтковий</translation> </message> <message> <source>Binary</source> - <translation>Двійковий</translation> + <translation type="vanished">Двійковий</translation> </message> <message> <source>Octal</source> - <translation>Ð’Ñ–Ñімковий</translation> + <translation type="vanished">Ð’Ñ–Ñімковий</translation> </message> <message> <source>returned value</source> @@ -7426,12 +7680,68 @@ Do you want to retry?</source> <source>Type</source> <translation>Тип</translation> </message> + <message> + <source>Raw Data</source> + <translation>Сирі дані</translation> + </message> + <message> + <source>Latin1 String</source> + <translation>Ð Ñдок Latin1</translation> + </message> + <message> + <source>UTF-8 String</source> + <translation>Ð Ñдок UTF-8</translation> + </message> + <message> + <source>Local 8-Bit String</source> + <translation>Ð Ñдок в локальному 8-бітному кодуванні</translation> + </message> + <message> + <source>UTF-16 String</source> + <translation>Ð Ñдок UTF-16</translation> + </message> + <message> + <source>UCS-4 String</source> + <translation>Ð Ñдок UCS-4</translation> + </message> + <message> + <source>Latin1 String in Separate Window</source> + <translation>Ð Ñдок Latin1 в окремому вікні</translation> + </message> + <message> + <source>UTF-8 String in Separate Window</source> + <translation>Ð Ñдок UTF-8 в окремому вікні</translation> + </message> + <message> + <source>Decimal Integer</source> + <translation>ДеÑÑткове ціле</translation> + </message> + <message> + <source>Hexadecimal Integer</source> + <translation>ШіÑтнадцÑткове ціле</translation> + </message> + <message> + <source>Binary Integer</source> + <translation>Двійкове ціле</translation> + </message> + <message> + <source>Octal Integer</source> + <translation>Ð’Ñ–Ñімкове ціле</translation> + </message> + <message> + <source>Compact Float</source> + <translation>Компактне дійÑне</translation> + </message> + <message> + <source>Scientific Float</source> + <translation>Ðаукове дійÑне</translation> + </message> </context> <context> <name>Debugger::Internal::WatchWindow</name> <message> <source>Locals and Expressions</source> - <translation>Локальні змінні та вирази</translation> + <translation type="vanished">Локальні змінні та вирази</translation> </message> </context> <context> @@ -7471,13 +7781,13 @@ Do you want to retry?</source> <message> <source>The generated header of the form '%1' could not be found. Rebuilding the project might help.</source> - <translation>Ðе вдалоÑÑŒ знайти згенерований заголовочний файл форми '%1'. + <translation type="vanished">Ðе вдалоÑÑŒ знайти згенерований заголовочний файл форми '%1'. Перезбірка проекту може допомогти.</translation> </message> <message> <source>The generated header '%1' could not be found in the code model. Rebuilding the project might help.</source> - <translation>Ðе вдалоÑÑŒ знайти згенерований заголовочний файл форми '%1' в моделі коду. + <translation type="vanished">Ðе вдалоÑÑŒ знайти згенерований заголовочний файл форми '%1' в моделі коду. Перезбірка проекту може допомогти.</translation> </message> <message> @@ -7492,6 +7802,18 @@ Rebuilding the project might help.</source> <source>Form Editor</source> <translation>Редактор форм</translation> </message> + <message> + <source>The generated header of the form "%1" could not be found. +Rebuilding the project might help.</source> + <translation>Ðе вдалоÑÑŒ знайти згенерований заголовочний файл форми "%1". +Перезбірка проекту може допомогти.</translation> + </message> + <message> + <source>The generated header "%1" could not be found in the code model. +Rebuilding the project might help.</source> + <translation>Ðе вдалоÑÑŒ знайти згенерований заголовочний файл форми "%1" в моделі коду. +Перезбірка проекту може допомогти.</translation> + </message> </context> <context> <name>Designer::FormWindowEditor</name> @@ -7547,11 +7869,11 @@ Rebuilding the project might help.</source> </message> <message> <source>Form Template</source> - <translation>Шаблон форми</translation> + <translation type="vanished">Шаблон форми</translation> </message> <message> <source>Class Details</source> - <translation>Деталі клаÑу</translation> + <translation type="vanished">Деталі клаÑу</translation> </message> </context> <context> @@ -7565,6 +7887,10 @@ Rebuilding the project might help.</source> <translation>КлаÑ</translation> </message> <message> + <source>Class Details</source> + <translation>Деталі клаÑу</translation> + </message> + <message> <source>%1 - Error</source> <translation>%1 - Помилка</translation> </message> @@ -7734,7 +8060,7 @@ Rebuilding the project might help.</source> <name>Designer::Internal::FormFileWizardDialog</name> <message> <source>Location</source> - <translation>РозташуваннÑ</translation> + <translation type="vanished">РозташуваннÑ</translation> </message> </context> <context> @@ -7744,6 +8070,10 @@ Rebuilding the project might help.</source> <translation>Оберіть шаблон форми</translation> </message> <message> + <source>Form Template</source> + <translation>Шаблон форми</translation> + </message> + <message> <source>%1 - Error</source> <translation>%1 - Помилка</translation> </message> @@ -7756,7 +8086,7 @@ Rebuilding the project might help.</source> </message> <message> <source>Form Template</source> - <translation>Шаблон форми</translation> + <translation type="vanished">Шаблон форми</translation> </message> </context> <context> @@ -7764,7 +8094,13 @@ Rebuilding the project might help.</source> <message> <source>The class containing '%1' could not be found in %2. Please verify the #include-directives.</source> - <translation>Ðе вдалоÑÑŒ знайти клаÑ, що міÑтить '%1' в %2. + <translation type="vanished">Ðе вдалоÑÑŒ знайти клаÑ, що міÑтить '%1' в %2. +Будь лаÑка, перевірте директиви #include.</translation> + </message> + <message> + <source>The class containing "%1" could not be found in %2. +Please verify the #include-directives.</source> + <translation>Ðе вдалоÑÑŒ знайти клаÑ, що міÑтить "%1" в %2. Будь лаÑка, перевірте директиви #include.</translation> </message> <message> @@ -7772,13 +8108,19 @@ Please verify the #include-directives.</source> <translation>Помилка знаходженнÑ/Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñлота.</translation> </message> <message> + <source>No documents matching "%1" could be found. +Rebuilding the project might help.</source> + <translation>Ðе вдалоÑÑŒ знайти документи, що відповідають "%1". +Перезбірка проекту може допомогти.</translation> + </message> + <message> <source>Internal error: No project could be found for %1.</source> <translation type="vanished">Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°. Ðе вдалоÑÑŒ знайти проект Ð´Ð»Ñ %1.</translation> </message> <message> <source>No documents matching '%1' could be found. Rebuilding the project might help.</source> - <translation>Ðе вдалоÑÑŒ знайти документи, що відповідають '%1'. + <translation type="vanished">Ðе вдалоÑÑŒ знайти документи, що відповідають '%1'. Перезбірка проекту може допомогти.</translation> </message> <message> @@ -8060,6 +8402,10 @@ Rebuilding the project might help.</source> <source>All</source> <translation>УÑÑ–</translation> </message> + <message> + <source>%1 (current: "%2")</source> + <translation>%1 (зараз: "%2")</translation> + </message> </context> <context> <name>ExtensionSystem::PluginErrorView</name> @@ -8223,6 +8569,18 @@ Reason: %3</source> <source>Utilities</source> <translation>Утиліти</translation> </message> + <message> + <source>Plugin is not available on this platform.</source> + <translation>Додаток недоÑтупний на цій платформі.</translation> + </message> + <message> + <source>Plugin is required.</source> + <translation>Додаток необхідний.</translation> + </message> + <message> + <source>Load on startup</source> + <translation>Завантажувати при запуÑку</translation> + </message> </context> <context> <name>FakeVim::Internal</name> @@ -8273,10 +8631,6 @@ Reason: %3</source> <translation>%1Ð’Ñе</translation> </message> <message> - <source>Mark '%1' not set.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Not implemented in FakeVim.</source> <translation>Ðе реалізовано в FakeVim.</translation> </message> @@ -8285,6 +8639,10 @@ Reason: %3</source> <translation type="vanished">Ðевідома опціÑ:</translation> </message> <message> + <source>Mark "%1" not set.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Unknown option:</source> <translation>Ðевідома опціÑ:</translation> </message> @@ -8560,7 +8918,7 @@ Reason: %3</source> </message> <message> <source>Passes key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim.</source> - <translation type="unfinished"></translation> + <translation>Передавати поÑлідовноÑÑ‚Ñ– клавіш (Ñк Ctrl-S) до Ñдра Qt Creator заміÑÑ‚ÑŒ інтерпретації Ñ—Ñ… в FakeVim. Це надаÑÑ‚ÑŒ проÑтіший доÑтуп до функціональноÑÑ‚Ñ– Ñдра Qt Creator за рахунок втрати деÑких можливоÑтей FakeVim.</translation> </message> <message> <source>Lets Qt Creator handle some key presses in insert mode so that code can be properly completed and expanded.</source> @@ -9061,6 +9419,10 @@ Reason: %3</source> <context> <name>GenericProjectManager::Internal::FilesSelectionWizardPage</name> <message> + <source>Files</source> + <translation>Файли</translation> + </message> + <message> <source>Hide files matching:</source> <translation>Приховати файли, що відповідають:</translation> </message> @@ -9120,11 +9482,11 @@ Reason: %3</source> </message> <message> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> + <translation type="vanished">Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> </message> <message> <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + <translation type="vanished">ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> </message> <message> <source>Override %1:</source> @@ -9193,11 +9555,11 @@ Reason: %3</source> </message> <message> <source>Location</source> - <translation>РозташуваннÑ</translation> + <translation type="vanished">РозташуваннÑ</translation> </message> <message> <source>Files</source> - <translation>Файли</translation> + <translation type="vanished">Файли</translation> </message> <message> <source>File Selection</source> @@ -9208,7 +9570,11 @@ Reason: %3</source> <name>GenericProjectManager::Internal::Manager</name> <message> <source>Failed opening project '%1': Project is not a file</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + </message> + <message> + <source>Failed opening project "%1": Project is not a file.</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": Проект не Ñ” файлом.</translation> </message> </context> <context> @@ -9358,10 +9724,18 @@ These files are preserved.</source> </message> <message> <source>Would you like to delete the tag '%1'?</source> - <translation>Бажаєте видалити тег '%1'?</translation> + <translation type="vanished">Бажаєте видалити тег '%1'?</translation> + </message> + <message> + <source>Would you like to delete the tag "%1"?</source> + <translation>Бажаєте видалити тег "%1"?</translation> </message> <message> - <source>Would you like to delete the <b>unmerged</b> branch '%1'?</source> + <source>Would you like to delete the branch "%1"?</source> + <translation>Бажаєте видалити гілку "%1"?</translation> + </message> + <message> + <source>Would you like to delete the <b>unmerged</b> branch "%1"?</source> <translation type="unfinished"></translation> </message> <message> @@ -9381,7 +9755,7 @@ These files are preserved.</source> <translation type="unfinished"></translation> </message> <message> - <source>Hard reset branch '%1' to '%2'?</source> + <source>Hard reset branch "%1" to "%2"?</source> <translation type="unfinished"></translation> </message> <message> @@ -9398,7 +9772,7 @@ These files are preserved.</source> </message> <message> <source>Would you like to delete the branch '%1'?</source> - <translation>Бажаєте видалити гілку '%1'?</translation> + <translation type="vanished">Бажаєте видалити гілку '%1'?</translation> </message> <message> <source>Re&fresh</source> @@ -9426,7 +9800,7 @@ These files are preserved.</source> </message> <message> <source>&Merge</source> - <translation type="unfinished"></translation> + <translation>З&лити</translation> </message> <message> <source>Re&base</source> @@ -9508,7 +9882,7 @@ These files are preserved.</source> </message> <message> <source>Select Git Directory</source> - <translation type="unfinished"></translation> + <translation>Оберіть теку Git</translation> </message> <message> <source>Error: Unknown reference</source> @@ -9532,11 +9906,11 @@ These files are preserved.</source> </message> <message> <source>Change:</source> - <translation type="unfinished"></translation> + <translation>Зміна:</translation> </message> <message> <source>HEAD</source> - <translation type="unfinished"></translation> + <translation>HEAD</translation> </message> <message> <source>Select a Git Commit</source> @@ -9555,22 +9929,22 @@ These files are preserved.</source> </message> <message> <source>Clones a Git repository and tries to load the contained project.</source> - <translation>Клонує Ñховище Git та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> + <translation type="vanished">Клонує Ñховище Git та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> </message> <message> <source>Git Repository Clone</source> - <translation>ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñховища Git</translation> + <translation type="vanished">ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñховища Git</translation> </message> </context> <context> <name>Git::Internal::GitBlameArgumentsWidget</name> <message> <source>Omit Date</source> - <translation type="unfinished"></translation> + <translation>ПропуÑкати дату</translation> </message> <message> <source>Hide the date of a change from the output.</source> - <translation type="unfinished"></translation> + <translation>Приховати дату зміни у виведенні.</translation> </message> <message> <source>Ignore Whitespace</source> @@ -9588,16 +9962,12 @@ These files are preserved.</source> <translation>ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° дані...</translation> </message> <message> - <source>Git Diff</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Cannot determine the repository for "%1".</source> <translation>Ðеможливо визначити Ñховище Ð´Ð»Ñ "%1".</translation> </message> <message> <source>Cannot parse the file output.</source> - <translation type="unfinished"></translation> + <translation>Ðе вдалоÑÑŒ розібрати файл з виведеннÑм.</translation> </message> <message> <source>Cannot run "%1 %2" in "%2": %3</source> @@ -9605,15 +9975,15 @@ These files are preserved.</source> </message> <message> <source>Git Diff "%1"</source> - <translation type="unfinished"></translation> + <translation>Зміни в "%1" (Git)</translation> </message> <message> <source>Git Diff Branch "%1"</source> - <translation type="unfinished"></translation> + <translation>Зміни в гілці "%1" (Git)</translation> </message> <message> <source>Git Log "%1"</source> - <translation type="unfinished"></translation> + <translation>ІÑÑ‚Ð¾Ñ€Ñ–Ñ "%1" (Git)</translation> </message> <message> <source>Git Reflog "%1"</source> @@ -9665,10 +10035,10 @@ These files are preserved.</source> </message> <message numerus="yes"> <source>Cannot reset %n file(s) in "%1": %2</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Ðеможливо Ñкинути %n файл в "%1": %2</numerusform> + <numerusform>Ðеможливо Ñкинути %n файли в "%1": %2</numerusform> + <numerusform>Ðеможливо Ñкинути %n файлів в "%1": %2</numerusform> </translation> </message> <message> @@ -9687,7 +10057,7 @@ These files are preserved.</source> </message> <message> <source>REBASING</source> - <translation type="unfinished"></translation> + <translation>ПЕРЕБÐЗУВÐÐÐЯ</translation> </message> <message> <source>REVERTING</source> @@ -9706,6 +10076,34 @@ These files are preserved.</source> <translation type="unfinished"></translation> </message> <message> + <source>Stage Chunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unstage Chunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Chunk successfully unstaged</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Chunk successfully staged</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Git Diff Projects</source> + <translation>Зміни в проекті (Git)</translation> + </message> + <message> + <source>Git Diff Repository</source> + <translation>Зміни в Ñховищі Git</translation> + </message> + <message> + <source>Git Diff Files</source> + <translation>Зміни в файлах (Git)</translation> + </message> + <message> <source>Cannot describe revision "%1" in "%2": %3</source> <translation type="unfinished"></translation> </message> @@ -9736,11 +10134,11 @@ These files are preserved.</source> </message> <message> <source>Rebase is in progress. What do you want to do?</source> - <translation type="unfinished"></translation> + <translation>ÐŸÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‰Ðµ триває. Що ви бажаєте зробити?</translation> </message> <message> <source>Continue Merge</source> - <translation type="unfinished"></translation> + <translation>Продовжити злиттÑ</translation> </message> <message> <source>You need to commit changes to finish merge. @@ -9769,7 +10167,7 @@ Commit now?</source> </message> <message> <source>Cannot set tracking branch: %1</source> - <translation type="unfinished"></translation> + <translation>Ðеможливо вÑтановити гілку Ð´Ð»Ñ ÑтеженнÑ: %1</translation> </message> <message> <source>Conflicts detected with commit %1.</source> @@ -9823,7 +10221,7 @@ Commit now?</source> </message> <message> <source>Discard (reset) local changes and execute %1.</source> - <translation type="unfinished"></translation> + <translation>Відкинути (Ñкинути) локальні зміни та виконати %1.</translation> </message> <message> <source>Execute %1 with local changes in working directory.</source> @@ -9857,11 +10255,11 @@ Commit now?</source> </message> <message> <source>Run &Merge Tool</source> - <translation type="unfinished"></translation> + <translation>ЗапуÑтити інÑтрументи з&литтÑ</translation> </message> <message> <source>&Skip</source> - <translation type="unfinished"></translation> + <translation>&ПропуÑтити</translation> </message> <message> <source>Cannot obtain status: %1</source> @@ -9967,7 +10365,7 @@ Commit now?</source> </message> <message> <source>All changes in working directory will be discarded. Are you sure?</source> - <translation type="unfinished"></translation> + <translation>УÑÑ– зміни в робочій теці будуть відкинуті. Ви впевнені?</translation> </message> <message> <source>Chunk successfully staged</source> @@ -10126,7 +10524,7 @@ Commit now?</source> </message> <message> <source>Log Project</source> - <translation type="unfinished"></translation> + <translation>ІÑÑ‚Ð¾Ñ€Ñ–Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ</translation> </message> <message> <source>Log Project "%1"</source> @@ -10158,7 +10556,7 @@ Commit now?</source> </message> <message> <source>Reset...</source> - <translation type="unfinished"></translation> + <translation>Скинути (reset)...</translation> </message> <message> <source>Show...</source> @@ -10174,7 +10572,7 @@ Commit now?</source> </message> <message> <source>Diff &Selected Files</source> - <translation type="unfinished"></translation> + <translation>&Зміни у вибраних файлах</translation> </message> <message> <source>Create Repository...</source> @@ -10182,7 +10580,7 @@ Commit now?</source> </message> <message> <source>Saves the current state of your work.</source> - <translation type="unfinished"></translation> + <translation>Зберігає поточний Ñтан вашої праці.</translation> </message> <message> <source>Stash</source> @@ -10214,7 +10612,7 @@ Commit now?</source> </message> <message> <source>Interactive Rebase...</source> - <translation type="unfinished"></translation> + <translation>Інтерактивне перебазуваннÑ...</translation> </message> <message> <source>Update Submodules</source> @@ -10222,11 +10620,11 @@ Commit now?</source> </message> <message> <source>Abort Merge</source> - <translation type="unfinished"></translation> + <translation>Перервати злиттÑ</translation> </message> <message> <source>Abort Rebase</source> - <translation type="unfinished"></translation> + <translation>Перервати перебазуваннÑ</translation> </message> <message> <source>Abort Cherry Pick</source> @@ -10350,11 +10748,11 @@ Commit now?</source> </message> <message> <source>Rebase...</source> - <translation type="unfinished"></translation> + <translation>Перебазувати (rebase)...</translation> </message> <message> <source>Merge...</source> - <translation type="unfinished"></translation> + <translation>Злити...</translation> </message> <message> <source>Git &Tools</source> @@ -10390,7 +10788,7 @@ Commit now?</source> </message> <message> <source>Merge Tool</source> - <translation type="unfinished"></translation> + <translation>ІнÑтрументи злиттÑ</translation> </message> <message> <source>Actions on Commits...</source> @@ -10414,7 +10812,7 @@ Commit now?</source> </message> <message> <source>Interactive Rebase</source> - <translation type="unfinished"></translation> + <translation>Інтерактивне перебазуваннÑ</translation> </message> <message> <source>Another submit is currently being executed.</source> @@ -10461,38 +10859,11 @@ Commit now?</source> <name>Git::Internal::GitSettings</name> <message> <source>The binary '%1' could not be located in the path '%2'</source> - <translation>Ðе вдалоÑÑŒ знайти виконуваний модуль '%1' в шлÑху '%2'</translation> - </message> -</context> -<context> - <name>Git::Internal::GitShowArgumentsWidget</name> - <message> - <source>oneline</source> - <translation type="unfinished"></translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти виконуваний модуль '%1' в шлÑху '%2'</translation> </message> <message> - <source>short</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>medium</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>full</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>fuller</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>email</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>raw</source> - <translation type="unfinished"></translation> + <source>The binary "%1" could not be located in the path "%2"</source> + <translation>Ðе вдалоÑÑŒ знайти виконуваний модуль "%1" в шлÑху "%2"</translation> </message> </context> <context> @@ -10662,19 +11033,26 @@ Commit now?</source> <context> <name>Git::Internal::SettingsPageWidget</name> <message> - <source>Set the environment variable HOME to '%1' + <source>Set the environment variable HOME to "%1" (%2). This causes msysgit to look for the SSH-keys in that location instead of its installation directory when run outside git bash.</source> - <translation type="unfinished"></translation> + <translation>Ð’Ñтановити змінну Ñередовища HOME в "%1" +(%2). +Це змуÑить msysgit шукати ключі SSH-keys в цьому розташуванні +заміÑÑ‚ÑŒ теки вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ запуÑку поза git bash.</translation> </message> <message> <source>not currently set</source> <translation>наразі не вÑтановлено</translation> </message> <message> + <source>currently set to "%1"</source> + <translation>зараз вÑтановлено в "%1"</translation> + </message> + <message> <source>currently set to '%1'</source> - <translation>зараз вÑтановлено в '%1'</translation> + <translation type="vanished">зараз вÑтановлено в '%1'</translation> </message> <message> <source>Git Repository Browser Command</source> @@ -10701,7 +11079,7 @@ instead of its installation directory when run outside git bash.</source> </message> <message> <source><No repository></source> - <translation type="unfinished"></translation> + <translation><Ðемає Ñховища></translation> </message> <message> <source>Repository: %1</source> @@ -10750,7 +11128,7 @@ instead of its installation directory when run outside git bash.</source> </message> <message> <source>Repository Modified</source> - <translation type="unfinished"></translation> + <translation>Сховище було змінено</translation> </message> <message> <source>%1 cannot be restored since the repository is modified. @@ -10790,11 +11168,19 @@ You can choose between stashing the changes or discarding them.</source> <name>Gitorious::Internal::Gitorious</name> <message> <source>Error parsing reply from '%1': %2</source> - <translation>Помилка розбору відповіді з '%1': %2</translation> + <translation type="vanished">Помилка розбору відповіді з '%1': %2</translation> </message> <message> <source>Request failed for '%1': %2</source> - <translation>Збій запиту Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚ '%1': %2</translation> + <translation type="vanished">Збій запиту Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚ '%1': %2</translation> + </message> + <message> + <source>Error parsing reply from "%1": %2</source> + <translation>Помилка розбору відповіді з "%1": %2</translation> + </message> + <message> + <source>Request failed for "%1": %2</source> + <translation>Збій запиту Ð´Ð»Ñ "%1": %2</translation> </message> <message> <source>Open source projects that use Git.</source> @@ -10805,11 +11191,19 @@ You can choose between stashing the changes or discarding them.</source> <name>Gitorious::Internal::GitoriousCloneWizard</name> <message> <source>Clones a Gitorious repository and tries to load the contained project.</source> - <translation>Клонує Ñховище Gitorious та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> + <translation type="vanished">Клонує Ñховище Gitorious та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> </message> <message> <source>Gitorious Repository Clone</source> - <translation>ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñховища Gitorious</translation> + <translation type="vanished">ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñховища Gitorious</translation> + </message> + <message> + <source>Cloning</source> + <translation>КлонуваннÑ</translation> + </message> + <message> + <source>Cloning started...</source> + <translation>ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‡Ð°Ð»Ð¾ÑÑŒ...</translation> </message> </context> <context> @@ -10876,8 +11270,12 @@ You can choose between stashing the changes or discarding them.</source> <translation>Проект</translation> </message> <message> + <source>Choose a project from "%1"</source> + <translation>Виберіть проект з "%1"</translation> + </message> + <message> <source>Choose a project from '%1'</source> - <translation>Виберіть проект з '%1'</translation> + <translation type="vanished">Виберіть проект з '%1'</translation> </message> </context> <context> @@ -10904,7 +11302,11 @@ You can choose between stashing the changes or discarding them.</source> </message> <message> <source>Choose a repository of the project '%1'.</source> - <translation>Оберіть Ñховище Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1'.</translation> + <translation type="vanished">Оберіть Ñховище Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1'.</translation> + </message> + <message> + <source>Choose a repository of the project "%1".</source> + <translation>Оберіть Ñховище Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1".</translation> </message> <message> <source>Mainline Repositories</source> @@ -11055,6 +11457,22 @@ You can choose between stashing the changes or discarding them.</source> <source>Help</source> <translation>Довідка</translation> </message> + <message> + <source>Error loading page</source> + <translation>Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñторінки</translation> + </message> + <message> + <source><p>Check that you have the corresponding documentation set installed.</p></source> + <translation><li>Перевірте, чи відповідний набір документації вÑтановлено.</li></translation> + </message> + <message> + <source>Error loading: %1</source> + <translation>Помилка завантаженнÑ: %1</translation> + </message> + <message> + <source>The page could not be found</source> + <translation>Ðе вдалоÑÑŒ знайти Ñторінку</translation> + </message> </context> <context> <name>Help::Internal::CentralWidget</name> @@ -11114,11 +11532,11 @@ You can choose between stashing the changes or discarding them.</source> <name>Help::Internal::ExternalHelpWindow</name> <message> <source>Show Sidebar</source> - <translation>Показати бічну панель</translation> + <translation type="vanished">Показати бічну панель</translation> </message> <message> <source>Qt Creator Offline Help</source> - <translation>Локальна довідка Qt Creator</translation> + <translation type="vanished">Локальна довідка Qt Creator</translation> </message> </context> <context> @@ -11238,11 +11656,11 @@ Add, modify, and remove document filters, which determine the documentation set </message> <message> <source>Always Start Full Help</source> - <translation>Завжди запуÑкати повну довідку</translation> + <translation type="vanished">Завжди запуÑкати повну довідку</translation> </message> <message> <source>Always Show Help in External Window</source> - <translation>Завжди показувати довідку в зовнішньому вікні</translation> + <translation type="vanished">Завжди показувати довідку в зовнішньому вікні</translation> </message> <message> <source>On help start:</source> @@ -11312,6 +11730,14 @@ Add, modify, and remove document filters, which determine the documentation set <source>Switches to editor context after last help page is closed.</source> <translation>Перейти в контекÑÑ‚ редактора піÑÐ»Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¾Ñтанньої Ñторінки довідки.</translation> </message> + <message> + <source>Always Show in Help Mode</source> + <translation>Завжди показувати в режимі довідки</translation> + </message> + <message> + <source>Always Show in External Window</source> + <translation>Завжди показувати в зовнішньому вікні</translation> + </message> </context> <context> <name>Help::Internal::HelpIndexFilter</name> @@ -11475,15 +11901,15 @@ Add, modify, and remove document filters, which determine the documentation set </message> <message> <source>Go to Help Mode</source> - <translation>Перейти в режим довідки</translation> + <translation type="vanished">Перейти в режим довідки</translation> </message> <message> <source>Next</source> - <translation>Вперед</translation> + <translation type="vanished">Вперед</translation> </message> <message> <source>Previous</source> - <translation>Ðазад</translation> + <translation type="vanished">Ðазад</translation> </message> <message> <source><html><head><title>No Documentation</title></head><body><br/><center><b>%1</b><br/>No documentation available.</center></body></html></source> @@ -11498,39 +11924,43 @@ Add, modify, and remove document filters, which determine the documentation set <name>Help::Internal::HelpViewer</name> <message> <source><title>about:blank</title></source> - <translation><title>about:blank</title></translation> + <translation type="vanished"><title>about:blank</title></translation> </message> <message> <source><html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br/><br/><h1>The page could not be found</h1><br/><h3>'%1'</h3></div></body></html></source> - <translation><html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Помилка 404...</title></head><body><div align="center"><br><br><h1>Ðе вдалоÑÑŒ знайти Ñторінку</h1><br><h3>'%1'</h3></div></body></translation> + <translation type="vanished"><html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Помилка 404...</title></head><body><div align="center"><br><br><h1>Ðе вдалоÑÑŒ знайти Ñторінку</h1><br><h3>'%1'</h3></div></body></translation> </message> <message> <source>Open Link</source> - <translation>Відкрити поÑиланнÑ</translation> + <translation type="vanished">Відкрити поÑиланнÑ</translation> </message> <message> <source>Open Link as New Page</source> - <translation>Відкрити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² новій Ñторінці</translation> + <translation type="vanished">Відкрити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² новій Ñторінці</translation> </message> <message> <source>Copy Link</source> - <translation>Копіювати поÑиланнÑ</translation> + <translation type="vanished">Копіювати поÑиланнÑ</translation> </message> <message> <source>Copy</source> - <translation>Копіювати</translation> + <translation type="vanished">Копіювати</translation> </message> <message> <source>Reload</source> - <translation>Перезавантажити</translation> + <translation type="vanished">Перезавантажити</translation> </message> <message> <source>Error loading: %1</source> - <translation>Помилка завантаженнÑ: %1</translation> + <translation type="vanished">Помилка завантаженнÑ: %1</translation> </message> <message> <source>Unknown or unsupported Content!</source> - <translation>Ðевідомий або непідтримуваний зміÑÑ‚!</translation> + <translation type="vanished">Ðевідомий або непідтримуваний зміÑÑ‚!</translation> + </message> + <message> + <source>Unknown or unsupported content!</source> + <translation>Ðевідомий або непідтримуваний зміÑÑ‚</translation> </message> </context> <context> @@ -11596,11 +12026,15 @@ Add, modify, and remove document filters, which determine the documentation set <name>Help::Internal::SearchWidget</name> <message> <source>Indexing</source> - <translation>ІндекÑуваннÑ</translation> + <translation type="vanished">ІндекÑуваннÑ</translation> </message> <message> <source>Indexing Documentation...</source> - <translation>ІндекÑÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ—...</translation> + <translation type="vanished">ІндекÑÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ—...</translation> + </message> + <message> + <source>Indexing Documentation</source> + <translation>ІндекÑÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ—</translation> </message> <message> <source>Open Link</source> @@ -11638,27 +12072,27 @@ Add, modify, and remove document filters, which determine the documentation set <name>HelpViewer</name> <message> <source>Error 404...</source> - <translation>Помилка 404...</translation> + <translation type="vanished">Помилка 404...</translation> </message> <message> <source>The page could not be found!</source> - <translation>Ðе вдалоÑÑŒ знайти Ñторінку!</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти Ñторінку!</translation> </message> <message> <source><li>Check that you have one or more documentation sets installed.</li></source> - <translation><li>Перевірте, що вÑтановлено один чи більше наборів документації.</li></translation> + <translation type="vanished"><li>Перевірте, що вÑтановлено один чи більше наборів документації.</li></translation> </message> <message> <source><li>Check that you have installed the appropriate browser plug-in to support the file your loading.</li></source> - <translation><li>Перевірте, чи вÑтановлено відповідний додаток Ð´Ð»Ñ Ð¾Ð³Ð»Ñдача Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸ файлу, що завантажуєтьÑÑ.</li></translation> + <translation type="vanished"><li>Перевірте, чи вÑтановлено відповідний додаток Ð´Ð»Ñ Ð¾Ð³Ð»Ñдача Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸ файлу, що завантажуєтьÑÑ.</li></translation> </message> <message> <source><li>If you try to access a public URL, make sure to have a network connection.</li></source> - <translation><li>Якщо ви намагаєтеÑÑŒ отримати доÑтуп до публічного URL, переконайтеÑÑŒ, що ви маєте з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею.</li></translation> + <translation type="vanished"><li>Якщо ви намагаєтеÑÑŒ отримати доÑтуп до публічного URL, переконайтеÑÑŒ, що ви маєте з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею.</li></translation> </message> <message> <source><li>If your computer or network is protected by a firewall or proxy, make sure the application is permitted to access the network.</li></source> - <translation><li>Якщо ваш комп'ютер або мережа захищена мережевим екраном або прокÑÑ–, переконайтеÑÑŒ, що програмі дозволено доÑтуп до мережі.</li></translation> + <translation type="vanished"><li>Якщо ваш комп'ютер або мережа захищена мережевим екраном або прокÑÑ–, переконайтеÑÑŒ, що програмі дозволено доÑтуп до мережі.</li></translation> </message> </context> <context> @@ -13428,11 +13862,7 @@ stderr був: %1</translation> </message> <message> <source>Clones a Mercurial repository and tries to load the contained project.</source> - <translation>Клонує Ñховище Mercurial та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> - </message> - <message> - <source>Mercurial Clone</source> - <translation type="unfinished"></translation> + <translation type="vanished">Клонує Ñховище Mercurial та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> </message> </context> <context> @@ -13552,7 +13982,7 @@ stderr був: %1</translation> <name>Mercurial::Internal::MercurialPlugin</name> <message> <source>Me&rcurial</source> - <translation type="unfinished"></translation> + <translation>Me&rcurial</translation> </message> <message> <source>Annotate Current File</source> @@ -13712,7 +14142,7 @@ stderr був: %1</translation> </message> <message> <source>Diff &Selected Files</source> - <translation type="unfinished"></translation> + <translation>&Зміни у вибраних файлах</translation> </message> <message> <source>&Undo</source> @@ -14022,6 +14452,18 @@ stderr був: %1</translation> <translation>Файл коду Python</translation> </message> <message> + <source>Qt Project configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Qt Project cache file</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Qt Project stash file</source> + <translation type="unfinished"></translation> + </message> + <message> <source>QML file</source> <translation>Файл QML</translation> </message> @@ -14190,7 +14632,11 @@ stderr був: %1</translation> <translation type="unfinished"></translation> </message> <message> - <source>Follows current</source> + <source>Preferred highlight begin - must be smaller than Preferred end. Note that the user has to add a highlight component.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Preferred highlight end - must be larger than Preferred begin. Note that the user has to add a highlight component.</source> <translation type="unfinished"></translation> </message> <message> @@ -14234,22 +14680,10 @@ stderr був: %1</translation> <translation type="unfinished"></translation> </message> <message> - <source>Preferred highlight begin - must be smaller than Preferred end.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Preferred end</source> <translation type="unfinished"></translation> </message> <message> - <source>Preferred highlight end - must be larger than Preferred begin.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Determines whether the highlight is managed by the view.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Interactive</source> <translation type="unfinished"></translation> </message> @@ -14292,15 +14726,15 @@ stderr був: %1</translation> <name>Perforce::Internal::PerforceChecker</name> <message> <source>No executable specified</source> - <translation type="unfinished"></translation> + <translation>Виконуваний модуль не вказано</translation> </message> <message> <source>"%1" timed out after %2ms.</source> - <translation type="unfinished"></translation> + <translation>Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° "%1" вичерпано піÑÐ»Ñ %2 мÑ.</translation> </message> <message> <source>Unable to launch "%1": %2</source> - <translation type="unfinished"></translation> + <translation>Ðеможливо запуÑтити "%1": %2</translation> </message> <message> <source>"%1" crashed.</source> @@ -14308,7 +14742,7 @@ stderr був: %1</translation> </message> <message> <source>"%1" terminated with exit code %2: %3</source> - <translation type="unfinished"></translation> + <translation>"%1" завершивÑÑ Ð· кодом %2: %3</translation> </message> <message> <source>The client does not seem to contain any mapped files.</source> @@ -14321,7 +14755,7 @@ stderr був: %1</translation> </message> <message> <source>The repository "%1" does not exist.</source> - <translation type="unfinished"></translation> + <translation>Сховище "%1" не Ñ–Ñнує.</translation> </message> </context> <context> @@ -14562,7 +14996,7 @@ stderr був: %1</translation> </message> <message> <source>Diff &Selected Files</source> - <translation type="unfinished"></translation> + <translation>&Зміни у вибраних файлах</translation> </message> <message> <source>&Undo</source> @@ -14610,7 +15044,7 @@ stderr був: %1</translation> </message> <message> <source>Could not start perforce '%1'. Please check your settings in the preferences.</source> - <translation>Ðе вдалоÑÑŒ запуÑтити perforce '%1'. Будь лаÑка, перевірте ваші налаштуваннÑ.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ запуÑтити perforce '%1'. Будь лаÑка, перевірте ваші налаштуваннÑ.</translation> </message> <message> <source>Perforce did not respond within timeout limit (%1 ms).</source> @@ -14665,6 +15099,10 @@ stderr був: %1</translation> <translation type="unfinished"></translation> </message> <message> + <source>Could not start perforce "%1". Please check your settings in the preferences.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Error running "where" on %1: %2</source> <extracomment>Failed to run p4 "where" to resolve a Perforce file name to a local file system name.</extracomment> <translation type="unfinished"></translation> @@ -14753,7 +15191,7 @@ stderr був: %1</translation> </message> <message> <source>Perforce</source> - <translation type="unfinished"></translation> + <translation>Perforce</translation> </message> <message> <source>Automatically open files when editing</source> @@ -14783,7 +15221,7 @@ stderr був: %1</translation> </message> <message> <source>Change:</source> - <translation type="unfinished"></translation> + <translation>Зміна:</translation> </message> <message> <source>Client:</source> @@ -14821,11 +15259,19 @@ stderr був: %1</translation> <name>PluginManager</name> <message> <source>The plugin '%1' is specified twice for testing.</source> - <translation>Додаток Ð´Ð»Ñ Ñ‚ÐµÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ '%1' вказано двічі.</translation> + <translation type="vanished">Додаток Ð´Ð»Ñ Ñ‚ÐµÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ '%1' вказано двічі.</translation> </message> <message> <source>The plugin '%1' does not exist.</source> - <translation>Додаток '%1' не Ñ–Ñнує.</translation> + <translation type="vanished">Додаток '%1' не Ñ–Ñнує.</translation> + </message> + <message> + <source>The plugin "%1" is specified twice for testing.</source> + <translation>Додаток Ð´Ð»Ñ Ñ‚ÐµÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ "%1" вказано двічі.</translation> + </message> + <message> + <source>The plugin "%1" does not exist.</source> + <translation>Додаток "%1" не Ñ–Ñнує.</translation> </message> <message> <source>Unknown option %1</source> @@ -14844,19 +15290,19 @@ stderr був: %1</translation> <name>PluginSpec</name> <message> <source>'%1' misses attribute '%2'</source> - <translation>У '%1' відÑутній атрибут '%2'</translation> + <translation type="vanished">У '%1' відÑутній атрибут '%2'</translation> </message> <message> <source>'%1' has invalid format</source> - <translation>'%1' має неправильний формат</translation> + <translation type="vanished">'%1' має неправильний формат</translation> </message> <message> <source>Invalid element '%1'</source> - <translation>Ðеправильний елемент '%1'</translation> + <translation type="vanished">Ðеправильний елемент '%1'</translation> </message> <message> <source>Unexpected closing element '%1'</source> - <translation>Ðеочікуваний закриваючий елемент '%1'</translation> + <translation type="vanished">Ðеочікуваний закриваючий елемент '%1'</translation> </message> <message> <source>Unexpected token</source> @@ -14864,7 +15310,27 @@ stderr був: %1</translation> </message> <message> <source>Expected element '%1' as top level element</source> - <translation>Ð’ ÑкоÑÑ‚Ñ– елемента верхнього Ñ€Ñ–Ð²Ð½Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð²ÑÑ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ '%1'</translation> + <translation type="vanished">Ð’ ÑкоÑÑ‚Ñ– елемента верхнього Ñ€Ñ–Ð²Ð½Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð²ÑÑ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ '%1'</translation> + </message> + <message> + <source>"%1" misses attribute "%2"</source> + <translation>У "%1" відÑутній атрибут "%1"</translation> + </message> + <message> + <source>"%1" has invalid format</source> + <translation>"%1" має неправильний формат</translation> + </message> + <message> + <source>Invalid element "%1"</source> + <translation>Ðеправильний елемент "%1"</translation> + </message> + <message> + <source>Unexpected closing element "%1"</source> + <translation>Ðеочікуваний закриваючий елемент "%1"</translation> + </message> + <message> + <source>Expected element "%1" as top level element</source> + <translation>Ð’ ÑкоÑÑ‚Ñ– елемента верхнього Ñ€Ñ–Ð²Ð½Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð²ÑÑ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ "%1"</translation> </message> <message> <source>Resolving dependencies failed because state != Read</source> @@ -14948,6 +15414,10 @@ stderr був: %1</translation> <context> <name>ProjectExplorer::AbstractProcessStep</name> <message> + <source>Configuration is faulty. Check the Issues view for details.</source> + <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + </message> + <message> <source>The process "%1" exited normally.</source> <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ "%1" завершивÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾.</translation> </message> @@ -14996,7 +15466,7 @@ stderr був: %1</translation> <name>ProjectExplorer::BaseProjectWizardDialog</name> <message> <source>Location</source> - <translation>РозташуваннÑ</translation> + <translation type="vanished">РозташуваннÑ</translation> </message> <message> <source>untitled</source> @@ -15061,6 +15531,10 @@ stderr був: %1</translation> <translation>Збірку/Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ ÑкаÑовано</translation> </message> <message> + <source>When executing step "%1"</source> + <translation>Під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÑ€Ð¾ÐºÑƒ "%1"</translation> + </message> + <message> <source>Elapsed time: %1.</source> <translation>Пройшло чаÑу: %1.</translation> </message> @@ -15079,7 +15553,7 @@ stderr був: %1</translation> </message> <message> <source>When executing step '%1'</source> - <translation>Під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÑ€Ð¾ÐºÑƒ '%1'</translation> + <translation type="vanished">Під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÑ€Ð¾ÐºÑƒ '%1'</translation> </message> <message> <source>Running steps for project %1...</source> @@ -15123,13 +15597,23 @@ stderr був: %1</translation> %2</translation> </message> <message> + <source>Error running "%1" in %2: %3</source> + <translation>Помилка запуÑку "%1" в %2: %3</translation> + </message> + <message> + <source>Building helper "%1" in %2 +</source> + <translation>Збірка помічника "%1" в %2 +</translation> + </message> + <message> <source>Error running '%1' in %2: %3</source> - <translation>Помилка запуÑку '%1' в %2: %3</translation> + <translation type="vanished">Помилка запуÑку '%1' в %2: %3</translation> </message> <message> <source>Building helper '%1' in %2 </source> - <translation>Збірка помічника '%1' в %2 + <translation type="vanished">Збірка помічника '%1' в %2 </translation> </message> <message> @@ -15156,7 +15640,7 @@ stderr був: %1</translation> <message> <source>Details</source> <comment>Default short title for custom wizard page to be shown in the progress pane of the wizard.</comment> - <translation>Деталі</translation> + <translation type="vanished">Деталі</translation> </message> <message> <source>Creates a plain C project using qmake, not using the Qt library.</source> @@ -15755,8 +16239,12 @@ Reason: %2</source> <translation>Поточний проект</translation> </message> <message> + <source>Project "%1":</source> + <translation>Проект "%1":</translation> + </message> + <message> <source>Project '%1':</source> - <translation>Проект '%1':</translation> + <translation type="vanished">Проект '%1':</translation> </message> </context> <context> @@ -15819,7 +16307,7 @@ Reason: %2</source> </message> <message> <source>Open with</source> - <translation>Відкрити за допомогою</translation> + <translation type="vanished">Відкрити за допомогою</translation> </message> <message> <source>Find in this directory...</source> @@ -15838,6 +16326,14 @@ Reason: %2</source> <translation>Синхронізувати з редактором</translation> </message> <message> + <source>Open Project in "%1"</source> + <translation>Відкрити проект в "%1"</translation> + </message> + <message> + <source>Open With</source> + <translation>Відкрити за допомогою</translation> + </message> + <message> <source>Choose Folder...</source> <translation>Оберіть теку...</translation> </message> @@ -16155,7 +16651,7 @@ Reason: %2</source> </message> <message> <source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="http://releases.qt-project.org/jom/">http://releases.qt-project.org/jom/</a>. Disable it if you experience problems with your builds.</source> - <translation><i>jom</i> - це заміна Ð´Ð»Ñ <i>nmake</i>, Ñка розподілÑÑ” Ð¿Ñ€Ð¾Ñ†ÐµÑ ÐºÐ¾Ð¼Ð¿Ñ–Ð»Ñції на декілька Ñдер процеÑора. ÐайÑвіжіший виконуваний модуль доÑтупний за адреÑою <a href="http://releases.qt-project.org/jom/">http://releases.qt-project.org/jom/</a>. Вимкніть викориÑÑ‚Ð°Ð½Ð½Ñ jom у випадку проблем зі збіркою.</translation> + <translation type="vanished"><i>jom</i> - це заміна Ð´Ð»Ñ <i>nmake</i>, Ñка розподілÑÑ” Ð¿Ñ€Ð¾Ñ†ÐµÑ ÐºÐ¾Ð¼Ð¿Ñ–Ð»Ñції на декілька Ñдер процеÑора. ÐайÑвіжіший виконуваний модуль доÑтупний за адреÑою <a href="http://releases.qt-project.org/jom/">http://releases.qt-project.org/jom/</a>. Вимкніть викориÑÑ‚Ð°Ð½Ð½Ñ jom у випадку проблем зі збіркою.</translation> </message> <message> <source>Default build directory:</source> @@ -16181,6 +16677,10 @@ Reason: %2</source> <source>Asks before terminating the running application in response to clicking the stop button in Application Output.</source> <translation>Запитувати перед завершеннÑм запущеного додатку при натиÑканні на кнопку зупинки в панелі Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÑƒ.</translation> </message> + <message> + <source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="http://download.qt-project.org/official_releases/jom/">http://download.qt-project.org/official_releases/jom/</a>. Disable it if you experience problems with your builds.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectExplorer::Internal::ProjectFileFactory</name> @@ -16206,7 +16706,7 @@ Reason: %2</source> <name>ProjectExplorer::Internal::ProjectFileWizardExtension</name> <message> <source><Implicitly Add></source> - <translation><ÐеÑвно додати></translation> + <translation type="vanished"><ÐеÑвно додати></translation> </message> <message> <source>The files are implicitly added to the projects: @@ -16216,11 +16716,10 @@ Reason: %2</source> </message> <message> <source>The files are implicitly added to the projects:</source> - <translation>ÐеÑвно додані до проектів файли:</translation> + <translation type="vanished">ÐеÑвно додані до проектів файли:</translation> </message> <message> <source><None></source> - <extracomment>No project selected</extracomment> <translation><Ðемає></translation> </message> <message> @@ -16232,25 +16731,46 @@ Reason: %2</source> <translation>Збій ÑиÑтеми контролю верÑій</translation> </message> <message> + <source>Failed to add subproject "%1" +to project "%2".</source> + <translation>Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1" +до проекту "%2".</translation> + </message> + <message> + <source>Failed to add one or more files to project +"%1" (%2).</source> + <translation>Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ чи кількох файлів до проекту +"%1" (%2). +</translation> + </message> + <message> + <source>A version control system repository could not be created in "%1".</source> + <translation>Ðе вдалоÑÑŒ Ñтворити Ñховище ÑиÑтеми контролю верÑій в "%1".</translation> + </message> + <message> + <source>Failed to add "%1" to the version control system.</source> + <translation>Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ "%1" до ÑиÑтеми контролю верÑій.</translation> + </message> + <message> <source>Failed to add subproject '%1' to project '%2'.</source> - <translation>Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1' + <translation type="vanished">Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1' до проекту '%2'.</translation> </message> <message> <source>Failed to add one or more files to project '%1' (%2).</source> - <translation>Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ чи кількох файлів до проекту + <translation type="vanished">Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ чи кількох файлів до проекту '%1' (%2). </translation> </message> <message> <source>A version control system repository could not be created in '%1'.</source> - <translation>Ðе вдалоÑÑŒ Ñтворити репозитарій ÑиÑтеми контролю верÑій в '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ Ñтворити репозитарій ÑиÑтеми контролю верÑій в '%1'.</translation> </message> <message> <source>Failed to add '%1' to the version control system.</source> - <translation>Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ '%1' до ÑиÑтеми контролю верÑій.</translation> + <translation type="vanished">Збій Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ '%1' до ÑиÑтеми контролю верÑій.</translation> </message> </context> <context> @@ -16391,6 +16911,15 @@ to project '%2'.</source> <translation>&Клонувати обрану</translation> </message> <message> + <source>Clone Configuration</source> + <extracomment>Title of a the cloned RunConfiguration window, text of the window</extracomment> + <translation>Клонувати конфігурацію</translation> + </message> + <message> + <source>New configuration name:</source> + <translation>Ðазва нової конфігурації:</translation> + </message> + <message> <source>New name for run configuration <b>%1</b>:</source> <translation>Ðова назва Ð´Ð»Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— запуÑку <b>%1</b>:</translation> </message> @@ -16455,11 +16984,11 @@ to project '%2'.</source> </message> <message> <source>New session name</source> - <translation>Ðазва нової ÑеÑÑ–Ñ—</translation> + <translation type="vanished">Ðазва нової ÑеÑÑ–Ñ—</translation> </message> <message> <source>Rename session</source> - <translation>Перейменувати ÑеÑÑ–ÑŽ</translation> + <translation type="vanished">Перейменувати ÑеÑÑ–ÑŽ</translation> </message> <message> <source>Automatically restore the last session when Qt Creator is started.</source> @@ -16477,6 +17006,14 @@ to project '%2'.</source> <source>Automatically restores the last session when Qt Creator is started.</source> <translation>Ðвтоматично відновлювати оÑтанню ÑеÑÑ–ÑŽ, коли запуÑкаєтьÑÑ Qt Creator.</translation> </message> + <message> + <source>New Session Name</source> + <translation>Ðазва нової ÑеÑÑ–Ñ—</translation> + </message> + <message> + <source>Rename Session</source> + <translation>Перейменувати ÑеÑÑ–ÑŽ</translation> + </message> </context> <context> <name>ProjectExplorer::Internal::SessionNameInputDialog</name> @@ -16485,9 +17022,13 @@ to project '%2'.</source> <translation>Введіть назву ÑеÑÑ–Ñ—:</translation> </message> <message> - <source>Switch to</source> + <source>Switch To</source> <translation>ПеремкнутиÑÑŒ до</translation> </message> + <message> + <source>Switch to</source> + <translation type="vanished">ПеремкнутиÑÑŒ до</translation> + </message> </context> <context> <name>ProjectExplorer::Internal::ShowInEditorTaskHandler</name> @@ -17001,8 +17542,24 @@ to project '%2'.</source> <translation>Порт SSH приÑтрою в поточному активному комплекті.</translation> </message> <message> + <source>Failed opening project "%1": Project already open.</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": проект вже відкритий.</translation> + </message> + <message> + <source>Failed opening project "%1": Settings could not be restored.</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": не вдалоÑÑŒ відновити налаштуваннÑ.</translation> + </message> + <message> + <source>Failed opening project "%1": No plugin can open project type "%2".</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": жодний додаток не може відкрити тип проекту "%2".</translation> + </message> + <message> + <source>Failed opening project "%1": Unknown project type.</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": невідомий тип проекту.</translation> + </message> + <message> <source>The user name with which to log into the device in the currently active kit.</source> - <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ на приÑтрій в поточному активному комплекті.</translation> + <translation type="vanished">Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ на приÑтрій в поточному активному комплекті.</translation> </message> <message> <source>The private key file with which to authenticate when logging into the device in the currently active kit.</source> @@ -17025,14 +17582,23 @@ to project '%2'.</source> <translation>Ðазва поточної ÑеÑÑ–Ñ—.</translation> </message> <message> + <source>Project File Factory</source> + <comment>ProjectExplorer::ProjectFileFactory display name.</comment> + <translation>Фабрика файлів проекту</translation> + </message> + <message> <source>Failed to open project</source> - <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ</translation> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ</translation> </message> <message> <source>Cancel Build && Unload</source> <translation>СкаÑувати збірку та вивантажити</translation> </message> <message> + <source>The username with which to log into the device in the currently active kit.</source> + <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ на приÑтрій в поточному активному комплекті.</translation> + </message> + <message> <source>Do Not Unload</source> <translation>Ðе вивантажувати</translation> </message> @@ -17102,12 +17668,16 @@ to project '%2'.</source> <translation>Проект %1 не Ñконфігуровано, пропуÑкаємо його.</translation> </message> <message> + <source>Building "%1" is disabled: %2<br></source> + <translation>Збірка "%1" вимкнена: %2<br></translation> + </message> + <message> <source>No project loaded</source> <translation>Проект не завантажено</translation> </message> <message> <source>Building '%1' is disabled: %2</source> - <translation>Збірка '%1' вимкнена: %2</translation> + <translation type="vanished">Збірка '%1' вимкнена: %2</translation> </message> <message> <source>Could not add following files to project %1:</source> @@ -17127,7 +17697,7 @@ to project '%2'.</source> </message> <message> <source>Building '%1' is disabled: %2<br></source> - <translation>Збірка '%1' вимкнена: %2<br></translation> + <translation type="vanished">Збірка '%1' вимкнена: %2<br></translation> </message> <message> <source>A build is in progress</source> @@ -17144,6 +17714,18 @@ to project '%2'.</source> <translation>Ðе закривати</translation> </message> <message> + <source>The project "%1" has no active kit.</source> + <translation>Проект "%1" не має активного комплекту.</translation> + </message> + <message> + <source>The kit "%1" for the project "%2" has no active run configuration.</source> + <translation>Комплект "%1" проекту "%2" не має активної конфігурації запуÑку.</translation> + </message> + <message> + <source>Cannot run "%1".</source> + <translation>Ðеможливо запуÑтити "%1".</translation> + </message> + <message> <source>A build is still in progress.</source> <translation>ДоÑÑ– здійÑнюєтьÑÑ Ð·Ð±Ñ–Ñ€ÐºÐ°.</translation> </message> @@ -17188,6 +17770,10 @@ to project '%2'.</source> <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ.</translation> </message> <message> + <source>All Projects</source> + <translation>УÑÑ– проекти</translation> + </message> + <message> <source>New Project</source> <comment>Title of dialog</comment> <translation>Ðовий проект</translation> @@ -17241,6 +17827,10 @@ Do you want to ignore them?</source> <translation>Проект немає налаштувань збірки.</translation> </message> <message> + <source>Building "%1" is disabled: %2</source> + <translation>Збірка "%1" вимкнена: %2</translation> + </message> + <message> <source>Cancel Build && Close</source> <translation>СкаÑувати збірку та закрити</translation> </message> @@ -17262,7 +17852,7 @@ Do you want to ignore them?</source> </message> <message> <source>Cannot run '%1'.</source> - <translation>Ðеможливо запуÑтити '%1'.</translation> + <translation type="vanished">Ðеможливо запуÑтити '%1'.</translation> </message> <message> <source>Run %1</source> @@ -17302,27 +17892,27 @@ Do you want to ignore them?</source> </message> <message> <source>Failed opening project '%1': Project already open.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': проект вже відкритий.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': проект вже відкритий.</translation> </message> <message> <source>Failed opening project '%1': Settings could not be restored.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': не вдалоÑÑŒ відновити налаштуваннÑ.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': не вдалоÑÑŒ відновити налаштуваннÑ.</translation> </message> <message> <source>Failed opening project '%1': No plugin can open project type '%2'.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': жодний додаток не може відкрити тип проекту '%2'.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': жодний додаток не може відкрити тип проекту '%2'.</translation> </message> <message> <source>Failed opening project '%1': Unknown project type.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': невідомий тип проекту.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': невідомий тип проекту.</translation> </message> <message> <source>The project '%1' has no active kit.</source> - <translation>Проект '%1' не має активного комплекту.</translation> + <translation type="vanished">Проект '%1' не має активного комплекту.</translation> </message> <message> <source>The kit '%1' for the project '%2' has no active run configuration.</source> - <translation>Комплект '%1' проекту '%2' не має активної конфігурації запуÑку.</translation> + <translation type="vanished">Комплект '%1' проекту '%2' не має активної конфігурації запуÑку.</translation> </message> <message> <source>Delete %1 from file system?</source> @@ -17449,8 +18039,12 @@ Reason: %2</source> <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ</translation> </message> <message> + <source>Loading Session</source> + <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ ÑеÑÑ–Ñ—</translation> + </message> + <message> <source>Session</source> - <translation>СеÑÑ–Ñ</translation> + <translation type="vanished">СеÑÑ–Ñ</translation> </message> <message> <source>Error while saving session</source> @@ -17469,23 +18063,23 @@ Reason: %2</source> <name>ProjectExplorer::SettingsAccessor</name> <message> <source>No valid .user file found for '%1'</source> - <translation>Ðе вдалоÑÑŒ знайти правильний файл .user Ð´Ð»Ñ '%1'</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти правильний файл .user Ð´Ð»Ñ '%1'</translation> </message> <message> <source><p>No valid settings file could be found for this installation of Qt Creator.</p><p>All settings files were either too new or too old to be read.</p></source> - <translation><p>Ðе вдалоÑÑŒ знайти правильний файл налаштувань Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Qt Creator.</p><p>УÑÑ– файли налаштувань або занові, або заÑтарі, щоб бути прочитаними.</p></translation> + <translation type="vanished"><p>Ðе вдалоÑÑŒ знайти правильний файл налаштувань Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Qt Creator.</p><p>УÑÑ– файли налаштувань або занові, або заÑтарі, щоб бути прочитаними.</p></translation> </message> <message> <source><p>No .user settings file created by this instance of Qt Creator was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file '%1'?</p></source> - <translation><p>Ðе знайдено файлу налаштувань .user, Ñтвореного цим екземплÑром Qt Creator.</p><p>Ви працювали раніше з цим проектом на іншому комп'ютері абр викориÑтовуючи інший шлÑÑ… до налаштувань?</p><p>Ви ще бажаєте завантажити файл налаштувань '%1'?</p></translation> + <translation type="vanished"><p>Ðе знайдено файлу налаштувань .user, Ñтвореного цим екземплÑром Qt Creator.</p><p>Ви працювали раніше з цим проектом на іншому комп'ютері абр викориÑтовуючи інший шлÑÑ… до налаштувань?</p><p>Ви ще бажаєте завантажити файл налаштувань '%1'?</p></translation> </message> <message> <source>Using Old Settings File for '%1'</source> - <translation>ВикориÑтовуютьÑÑ Ñтарий файл налаштувань Ð´Ð»Ñ '%1'</translation> + <translation type="vanished">ВикориÑтовуютьÑÑ Ñтарий файл налаштувань Ð´Ð»Ñ '%1'</translation> </message> <message> <source><p>The versioned backup '%1' of the .user settings file is used, because the non-versioned file was created by an incompatible version of Qt Creator.</p><p>Project settings changes made since the last time this version of Qt Creator was used with this project are ignored, and changes made now will <b>not</b> be propagated to the newer version.</p></source> - <translation><p>Буде викориÑтана верÑійна резервна ÐºÐ¾Ð¿Ñ–Ñ Ñ„Ð°Ð¹Ð»Ñƒ налаштувань .user '%1', оÑкільки не-верÑійний файл було Ñтворено неÑуміÑною верÑією Qt Creator.</p><p>Зміни до налаштувань проекту здійÑнені з чаÑу оÑтаннього викориÑÑ‚Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— верÑÑ–Ñ— Qt Creator з цим проектом будуть проігноровані, а зміни здійÑнені зараз <b>не</b> будуть перенеÑені до новішої верÑÑ–Ñ—.</p></translation> + <translation type="vanished"><p>Буде викориÑтана верÑійна резервна ÐºÐ¾Ð¿Ñ–Ñ Ñ„Ð°Ð¹Ð»Ñƒ налаштувань .user '%1', оÑкільки не-верÑійний файл було Ñтворено неÑуміÑною верÑією Qt Creator.</p><p>Зміни до налаштувань проекту здійÑнені з чаÑу оÑтаннього викориÑÑ‚Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— верÑÑ–Ñ— Qt Creator з цим проектом будуть проігноровані, а зміни здійÑнені зараз <b>не</b> будуть перенеÑені до новішої верÑÑ–Ñ—.</p></translation> </message> <message> <source>The version of your .shared file is not supported by Qt Creator. Do you want to try loading it anyway?</source> @@ -17493,7 +18087,7 @@ Reason: %2</source> </message> <message> <source>Settings File for '%1' from a different Environment?</source> - <translation>Файл налаштувань Ð´Ð»Ñ '%1' з іншого Ñередовища?</translation> + <translation type="vanished">Файл налаштувань Ð´Ð»Ñ '%1' з іншого Ñередовища?</translation> </message> <message> <source>Unsupported Shared Settings File</source> @@ -17647,6 +18241,14 @@ Reason: %2</source> <source>Also warns in the code editor about QML features which are not properly supported by the Qt Quick Designer.</source> <translation type="unfinished"></translation> </message> + <message> + <source>Subcomponents</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Always save when leaving subcomponent in bread crumb</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QmlDesigner::InvalidArgumentException</name> @@ -17735,11 +18337,7 @@ Reason: %2</source> </message> <message> <source>Warning</source> - <translation>ПопередженнÑ</translation> - </message> - <message> - <source>Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?</source> - <translation type="unfinished"></translation> + <translation type="vanished">ПопередженнÑ</translation> </message> </context> <context> @@ -17750,11 +18348,11 @@ Reason: %2</source> <translation type="unfinished"></translation> </message> <message> - <source>Become first sibling of parent (CTRL + Left).</source> + <source>Become last sibling of parent (CTRL + Left).</source> <translation type="unfinished"></translation> </message> <message> - <source>Become child of first sibling (CTRL + Right).</source> + <source>Become child of last sibling (CTRL + Right).</source> <translation type="unfinished"></translation> </message> <message> @@ -17771,50 +18369,6 @@ Reason: %2</source> </message> </context> <context> - <name>QmlDesigner::NodeInstanceServerProxy</name> - <message> - <source>Cannot Start QML Puppet Executable</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>The executable of the QML Puppet process (%1) cannot be started. Please check your installation. QML Puppet is a process which runs in the background to render the items.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Wrong QML Puppet Executable Version</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>The QML Puppet version is incompatible with the Qt Creator version.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cannot Find QML Puppet Executable</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>The executable of the QML Puppet process (<code>%1</code>) cannot be found. Check your installation. QML Puppet is a process which runs in the background to render the items.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You can build <code>%1</code> yourself with Qt 5.2.0 or higher. The source can be found in <code>%2</code>.</source> - <extracomment>%1 Puppet binary name ("qmlpuppet", "qml2puppet"), %2 source path.</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <source><code>%1</code> will be installed to the <code>bin</code> directory of your Qt version. Qt Quick Designer will check the <code>bin</code> directory of the currently active Qt version of your project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>QML Puppet Crashed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are recording a puppet stream and the puppet crashed. It is recommended to reopen the Qt Quick Designer and start again.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QmlDesigner::PluginManager</name> <message> <source>About Plugins</source> @@ -17921,7 +18475,11 @@ Reason: %2</source> <name>QmlDumpBuildTask</name> <message> <source>Building helper</source> - <translation>Збірка помічника</translation> + <translation type="vanished">Збірка помічника</translation> + </message> + <message> + <source>Building QML Helpers</source> + <translation>Збірка помічників QML</translation> </message> </context> <context> @@ -18057,11 +18615,11 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <translation type="unfinished"></translation> </message> <message> - <source>Expected only Property, Method, Signal and Enum object definitions, not '%1'.</source> + <source>Expected only Property, Method, Signal and Enum object definitions, not "%1".</source> <translation type="unfinished"></translation> </message> <message> - <source>Expected only name, prototype, defaultProperty, attachedType, exports isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not '%1'.</source> + <source>Expected only name, prototype, defaultProperty, attachedType, exports isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not "%1".</source> <translation type="unfinished"></translation> </message> <message> @@ -18187,8 +18745,12 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <translation>Ð’Ð¶Ð¸Ð²Ð°Ð½Ð½Ñ QML/JS:</translation> </message> <message> + <source>Searching for Usages</source> + <translation>Пошук вживань</translation> + </message> + <message> <source>Searching</source> - <translation>Пошук</translation> + <translation type="vanished">Пошук</translation> </message> </context> <context> @@ -18638,7 +19200,11 @@ Do you want to continue?</source> <name>QmlProjectManager::Internal::Manager</name> <message> <source>Failed opening project '%1': Project is not a file</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + </message> + <message> + <source>Failed opening project "%1": Project is not a file.</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": Проект не Ñ” файлом.</translation> </message> </context> <context> @@ -18772,7 +19338,7 @@ Do you want to continue?</source> <name>QmakeProjectManager::AbstractMobileApp</name> <message> <source>Could not open template file '%1'.</source> - <translation>Ðе вдалоÑÑŒ відкрити файл шаблону '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ відкрити файл шаблону '%1'.</translation> </message> </context> <context> @@ -18795,7 +19361,7 @@ Do you want to continue?</source> </message> <message> <source>Kits</source> - <translation>Комплекти</translation> + <translation type="vanished">Комплекти</translation> </message> </context> <context> @@ -18806,26 +19372,26 @@ Do you want to continue?</source> </message> <message> <source>Type</source> - <translation>Тип</translation> + <translation type="vanished">Тип</translation> </message> <message> <source>Details</source> - <translation>Деталі</translation> + <translation type="vanished">Деталі</translation> </message> <message> <source>Summary</source> - <translation>ПідÑумок</translation> + <translation type="vanished">ПідÑумок</translation> </message> </context> <context> <name>QmakeProjectManager::Internal::BaseQmakeProjectWizardDialog</name> <message> <source>Modules</source> - <translation>Модулі</translation> + <translation type="vanished">Модулі</translation> </message> <message> <source>Kits</source> - <translation>Комплекти</translation> + <translation type="vanished">Комплекти</translation> </message> </context> <context> @@ -19014,6 +19580,10 @@ Preselects a desktop Qt for building the application if available.</source> <source>icons.qrc</source> <translation>icons.qrc</translation> </message> + <message> + <source>Plugin Details</source> + <translation>Деталі додатку</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name> @@ -19037,6 +19607,10 @@ Preselects a desktop Qt for building the application if available.</source> <source>...</source> <translation>...</translation> </message> + <message> + <source>Custom Widgets</source> + <translation>КориÑтувацькі віджети</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::CustomWidgetWizard</name> @@ -19057,11 +19631,11 @@ Preselects a desktop Qt for building the application if available.</source> </message> <message> <source>Custom Widgets</source> - <translation>КориÑтувацькі віджети</translation> + <translation type="vanished">КориÑтувацькі віджети</translation> </message> <message> <source>Plugin Details</source> - <translation>Деталі додатку</translation> + <translation type="vanished">Деталі додатку</translation> </message> </context> <context> @@ -19090,6 +19664,10 @@ Preselects a desktop Qt for building the application if available.</source> <translation>Оберіть файл проекту бібліотеки Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð° шлÑÑ… до заголовків</translation> </message> <message> + <source>Details</source> + <translation>Деталі</translation> + </message> + <message> <source>Choose the project file of the library to link to</source> <translation>Оберіть файл проекту бібліотеки Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ</translation> </message> @@ -19149,6 +19727,10 @@ Preselects a desktop Qt for building the application if available.</source> <source>Specify basic information about the classes for which you want to generate skeleton source code files.</source> <translation>Вкажіть базову інформацію про клаÑи, Ð´Ð»Ñ Ñких ви бажаєте згенерувати каркаÑні файли з кодом.</translation> </message> + <message> + <source>Details</source> + <translation>Деталі</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::GuiAppWizard</name> @@ -19181,20 +19763,20 @@ Preselects a desktop Qt for building the application if available.</source> </message> <message> <source>Details</source> - <translation>Деталі</translation> + <translation type="vanished">Деталі</translation> </message> </context> <context> <name>QmakeProjectManager::Internal::Html5AppWizard</name> <message> <source>HTML5 Application</source> - <translation>Програма HTML5</translation> + <translation type="vanished">Програма HTML5</translation> </message> <message> <source>Creates an HTML5 application project that can contain both HTML5 and C++ code and includes a WebKit view. You can build the application and deploy it on desktop and mobile target platforms.</source> - <translation>Створює проект програми HTML5, Ñкий міÑтить код на HTML5 та C++ Ñ– включає оглÑдач WebKit. + <translation type="vanished">Створює проект програми HTML5, Ñкий міÑтить код на HTML5 та C++ Ñ– включає оглÑдач WebKit. Ви можете зібрати програму та розгорнути Ñ—Ñ— на Ñтаціонарні та мобільні платформи.</translation> </message> @@ -19203,11 +19785,11 @@ You can build the application and deploy it on desktop and mobile target platfor <name>QmakeProjectManager::Internal::Html5AppWizardDialog</name> <message> <source>New HTML5 Application</source> - <translation>Ðова програма HTML5</translation> + <translation type="vanished">Ðова програма HTML5</translation> </message> <message> <source>This wizard generates a HTML5 Application project.</source> - <translation>Цей майÑтер генерує проект програми HTML5.</translation> + <translation type="vanished">Цей майÑтер генерує проект програми HTML5.</translation> </message> <message> <source>This wizard generates a HTML5 application project.</source> @@ -19215,14 +19797,14 @@ You can build the application and deploy it on desktop and mobile target platfor </message> <message> <source>HTML Options</source> - <translation>Опції HTML</translation> + <translation type="vanished">Опції HTML</translation> </message> </context> <context> <name>QmakeProjectManager::Internal::Html5AppWizardOptionsPage</name> <message> <source>Select HTML File</source> - <translation>Виберіть файл HTML</translation> + <translation type="vanished">Виберіть файл HTML</translation> </message> </context> <context> @@ -19356,6 +19938,10 @@ Neither the path to the library nor the path to its includes is added to the .pr <translation>ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð· ÑиÑтемною бібліотекою викориÑтовуючи pkg-config.</translation> </message> <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> <source>External library</source> <translation>Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ°</translation> </message> @@ -19442,6 +20028,10 @@ Adds the library and include paths to the .pro file.</source> <source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source> <translation>Виберіть модулі, Ñкі ви бажаєте включити в ваш проект.Рекомендовані модулі Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ проекту обрано типово.</translation> </message> + <message> + <source>Modules</source> + <translation>Модулі</translation> + </message> </context> <context> <name>QmakeProjectManager::Internal::PluginGenerator</name> @@ -19696,7 +20286,7 @@ Adds the library and include paths to the .pro file.</source> </message> <message> <source>Component Set</source> - <translation>Ðабір компонентів</translation> + <translation type="vanished">Ðабір компонентів</translation> </message> <message> <source>Select existing QML file</source> @@ -19787,7 +20377,7 @@ Adds the library and include paths to the .pro file.</source> </message> <message> <source>Details</source> - <translation>Деталі</translation> + <translation type="vanished">Деталі</translation> </message> </context> <context> @@ -19840,6 +20430,10 @@ Adds the library and include paths to the .pro file.</source> <source>Test Class Information</source> <translation>Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ теÑтовий клаÑ</translation> </message> + <message> + <source>Details</source> + <translation>Деталі</translation> + </message> </context> <context> <name>QmakeProjectManager::MakeStep</name> @@ -19850,7 +20444,7 @@ Adds the library and include paths to the .pro file.</source> </message> <message> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> + <translation type="vanished">Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> </message> <message> <source>Cannot find Makefile. Check your build settings.</source> @@ -19858,7 +20452,7 @@ Adds the library and include paths to the .pro file.</source> </message> <message> <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + <translation type="vanished">ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> </message> <message> <source>Make</source> @@ -19897,7 +20491,7 @@ Adds the library and include paths to the .pro file.</source> </message> <message> <source>Configuration is faulty, please check the Issues view for details.</source> - <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + <translation type="vanished">ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> </message> <message> <source>Configuration unchanged, skipping qmake step.</source> @@ -20074,7 +20668,11 @@ Reason: %2</source> </message> <message> <source>Failed opening project '%1': Project is not a file</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + </message> + <message> + <source>Failed opening project "%1": Project is not a file</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": Проект не Ñ” файлом</translation> </message> <message> <source>QMake</source> @@ -20131,31 +20729,51 @@ Reason: %2</source> <translation>Помилка під Ñ‡Ð°Ñ Ñ€Ð¾Ð·Ð±Ð¾Ñ€Ñƒ файлу %1. ПрипинÑємо.</translation> </message> <message> + <source>Could not find .pro file for sub dir "%1" in "%2"</source> + <translation>Ðе вдалоÑÑŒ знайти файл .pro Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚ÐµÐºÐ¸ "%1" в "%2"</translation> + </message> + <message> <source>Could not find .pro file for sub dir '%1' in '%2'</source> - <translation>Ðе вдалоÑÑŒ знайти файл .pro Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚ÐµÐºÐ¸ '%1' в '%2'</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти файл .pro Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚ÐµÐºÐ¸ '%1' в '%2'</translation> </message> </context> <context> <name>QmakeProjectManager::QmakeProject</name> <message> <source>Evaluating</source> - <translation>Оцінка</translation> + <translation type="vanished">Оцінка</translation> + </message> + <message> + <source>Reading Project "%1"</source> + <translation>Ð§Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1"</translation> </message> <message> <source>No Qt version set in kit.</source> <translation>Ð’ комплекті не задано верÑÑ–ÑŽ Qt.</translation> </message> <message> + <source>The .pro file "%1" does not exist.</source> + <translation>Файл .pro "%1" не Ñ–Ñнує.</translation> + </message> + <message> + <source>The .pro file "%1" is not part of the project.</source> + <translation>Файл .pro "%1" не Ñ” чаÑтиною проекту.</translation> + </message> + <message> + <source>The .pro file "%1" could not be parsed.</source> + <translation>Ðе вдалоÑÑŒ розібрати файл .pro "%1".</translation> + </message> + <message> <source>The .pro file '%1' does not exist.</source> - <translation>Файл .pro '%1' не Ñ–Ñнує.</translation> + <translation type="vanished">Файл .pro '%1' не Ñ–Ñнує.</translation> </message> <message> <source>The .pro file '%1' is not part of the project.</source> - <translation>Файл .pro '%1' не Ñ” чаÑтиною проекту.</translation> + <translation type="vanished">Файл .pro '%1' не Ñ” чаÑтиною проекту.</translation> </message> <message> <source>The .pro file '%1' could not be parsed.</source> - <translation>Ðе вдалоÑÑŒ розібрати файл .pro '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ розібрати файл .pro '%1'.</translation> </message> <message> <source>Debug</source> @@ -20457,11 +21075,11 @@ For more details, see /etc/sysctl.d/10-ptrace.conf </message> <message> <source>Building helpers</source> - <translation>Збірка помічників</translation> + <translation type="vanished">Збірка помічників</translation> </message> <message> <source>Debugging Helper Build Log for '%1'</source> - <translation>Журнал Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¼Ñ–Ñ‡Ð½Ð¸ÐºÐ° Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ '%1'</translation> + <translation type="vanished">Журнал Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¼Ñ–Ñ‡Ð½Ð¸ÐºÐ° Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ '%1'</translation> </message> <message> <source>Select a qmake Executable</source> @@ -20500,6 +21118,14 @@ For more details, see /etc/sysctl.d/10-ptrace.conf <translation>Ðе уÑÑ– можливі цільові Ñередовища можуть бути підтримані через відÑутніÑÑ‚ÑŒ компілÑторів.</translation> </message> <message> + <source>Building Helpers</source> + <translation>Збірка помічників</translation> + </message> + <message> + <source>Debugging Helper Build Log for "%1"</source> + <translation>Журнал Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¼Ñ–Ñ‡Ð½Ð¸ÐºÐ° Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ "%1"</translation> + </message> + <message> <source>This Qt version was already registered as "%1".</source> <translation>Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ Qt вже зареєÑтрована Ñк "%1".</translation> </message> @@ -20560,12 +21186,16 @@ For more details, see /etc/sysctl.d/10-ptrace.conf </message> <message> <source>Clean up</source> - <translation>ПідчиÑтити</translation> + <translation type="vanished">ПідчиÑтити</translation> </message> <message> <source>Add...</source> <translation>Додати...</translation> </message> + <message> + <source>Clean Up</source> + <translation>ПідчиÑтити</translation> + </message> </context> <context> <name>QtVersion</name> @@ -20602,20 +21232,36 @@ For more details, see /etc/sysctl.d/10-ptrace.conf <translation>ÐевÑтановлена збірка з параметром -prefix - лише Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½ÑŒÐ¾Ñ— розробки.</translation> </message> <message> + <source>Cannot start "%1": %2</source> + <translation>Ðеможливо запуÑтити "%1": %2</translation> + </message> + <message> + <source>Timeout running "%1" (%2 ms).</source> + <translation>Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾ Ð´Ð»Ñ "%1"' (%2 мÑ).</translation> + </message> + <message> + <source>"%1" crashed.</source> + <translation>"%1" завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> + </message> + <message> + <source>qmake "%1" is not an executable.</source> + <translation>qmake "%1" не Ñ” виконуваним файлом.</translation> + </message> + <message> <source>Cannot start '%1': %2</source> - <translation>Ðеможливо запуÑтити '%1': %2</translation> + <translation type="vanished">Ðеможливо запуÑтити '%1': %2</translation> </message> <message> <source>Timeout running '%1' (%2 ms).</source> - <translation>Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½ вичерпано Ð´Ð»Ñ '%1' (%2 мÑ).</translation> + <translation type="vanished">Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½ вичерпано Ð´Ð»Ñ '%1' (%2 мÑ).</translation> </message> <message> <source>'%1' crashed.</source> - <translation>'%1' завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> + <translation type="vanished">'%1' завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> </message> <message> <source>qmake '%1' is not an executable.</source> - <translation>qmake '%1' не Ñ” виконуваним файлом.</translation> + <translation type="vanished">qmake '%1' не Ñ” виконуваним файлом.</translation> </message> <message> <source>Qt version has no name</source> @@ -20663,12 +21309,22 @@ For more details, see /etc/sysctl.d/10-ptrace.conf </message> <message> <source>Cannot determine the installation path for Qt version '%1'.</source> - <translation>Ðеможливо визначити шлÑÑ… вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Qt верÑÑ–Ñ— '%1'.</translation> + <translation type="vanished">Ðеможливо визначити шлÑÑ… вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Qt верÑÑ–Ñ— '%1'.</translation> </message> <message> <source>Building helper(s) with toolchain '%1'... </source> - <translation>Збірка помічника(ів) набором інÑтрументів '%1'... + <translation type="vanished">Збірка помічника(ів) набором інÑтрументів '%1'... +</translation> + </message> + <message> + <source>Cannot determine the installation path for Qt version "%1".</source> + <translation>Ðеможливо визначити шлÑÑ… вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Qt верÑÑ–Ñ— "%1".</translation> + </message> + <message> + <source>Building helper(s) with toolchain "%1"... +</source> + <translation>Збірка помічника(ів) набором інÑтрументів "%1"... </translation> </message> <message> @@ -20872,16 +21528,40 @@ Is the device connected and set up for network access?</source> <translation>Збій ініціалізації SFTP: %1</translation> </message> <message> + <source>Upload of file "%1" failed. The server said: "%2".</source> + <translation>Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1". Сервер повідомив: "%2".</translation> + </message> + <message> + <source>If "%1" is currently running on the remote host, you might need to stop it first.</source> + <translation>Якщо "%1" зараз виконуєтьÑÑ Ð½Ð° віддаленому вузлі, вам, можливо, знадобитьÑÑ Ñпочатку його зупинити.</translation> + </message> + <message> + <source>Failed to upload file "%1".</source> + <translation>Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1".</translation> + </message> + <message> + <source>Failed to upload file "%1": Could not open for reading.</source> + <translation>Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1": не вдалоÑÑŒ відкрити Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ.</translation> + </message> + <message> + <source>Warning: No remote path set for local file "%1". Skipping upload.</source> + <translation>ПопередженнÑ: Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ файлу "%1" не задано віддалений шлÑÑ…. ПропуÑк завантаженнÑ.</translation> + </message> + <message> + <source>Uploading file "%1"...</source> + <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1"...</translation> + </message> + <message> <source>Upload of file '%1' failed. The server said: '%2'.</source> - <translation>Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'. Сервер повідомив: '%2'.</translation> + <translation type="vanished">Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'. Сервер повідомив: '%2'.</translation> </message> <message> <source>If '%1' is currently running on the remote host, you might need to stop it first.</source> - <translation>Якщо '%1' зараз виконуєтьÑÑ Ð½Ð° віддаленому вузлі, вам, можливо, знадобитьÑÑ Ñпочатку його зупинити.</translation> + <translation type="vanished">Якщо '%1' зараз виконуєтьÑÑ Ð½Ð° віддаленому вузлі, вам, можливо, знадобитьÑÑ Ñпочатку його зупинити.</translation> </message> <message> <source>Failed to upload file '%1'.</source> - <translation>Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'.</translation> + <translation type="vanished">Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'.</translation> </message> <message> <source>Failed to set executable flag.</source> @@ -20889,7 +21569,7 @@ Is the device connected and set up for network access?</source> </message> <message> <source>Failed to upload file '%1': Could not open for reading.</source> - <translation>Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1': Ðе вдалоÑÑŒ відкрити Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ.</translation> + <translation type="vanished">Збій Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1': Ðе вдалоÑÑŒ відкрити Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ.</translation> </message> <message> <source>All files successfully deployed.</source> @@ -20897,11 +21577,11 @@ Is the device connected and set up for network access?</source> </message> <message> <source>Warning: No remote path set for local file '%1'. Skipping upload.</source> - <translation>ПопередженнÑ: Ð”Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ файлу '%1' не задано віддалений шлÑÑ…. ПропуÑк завантаженнÑ.</translation> + <translation type="vanished">ПопередженнÑ: Ð”Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ файлу '%1' не задано віддалений шлÑÑ…. ПропуÑк завантаженнÑ.</translation> </message> <message> <source>Uploading file '%1'...</source> - <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'...</translation> + <translation type="vanished">Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'...</translation> </message> </context> <context> @@ -21156,6 +21836,10 @@ Remote stderr was: '%1'</source> <translation>Ðеможливо зневадити: недоÑтатньо вільних портів.</translation> </message> <message> + <source>Cannot debug: Local executable is not set.</source> + <translation>Ðеможливо зневадити: локальний виконуваний модуль не задано.</translation> + </message> + <message> <source>No analyzer tool selected.</source> <translation type="vanished">ІнÑтрумент Ð´Ð»Ñ Ð°Ð½Ð°Ð»Ñ–Ð·Ñƒ не обрано.</translation> </message> @@ -21206,7 +21890,11 @@ Remote stderr was: '%1'</source> </message> <message> <source>Starting remote command '%1'...</source> - <translation>ЗапуÑк віддаленої команди '%1'...</translation> + <translation type="vanished">ЗапуÑк віддаленої команди '%1'...</translation> + </message> + <message> + <source>Starting remote command "%1"...</source> + <translation>ЗапуÑк віддаленої команди "%1"...</translation> </message> <message> <source>Remote process failed to start.</source> @@ -21318,28 +22006,52 @@ Remote stderr was: '%1'</source> <translation>Помилка: неможливо відкрити файл tar %1 (%2).</translation> </message> <message> + <source>No remote path specified for file "%1", skipping.</source> + <translation>Ðе вказано віддалений шлÑÑ… Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1", пропуÑкаємо.</translation> + </message> + <message> + <source>Error writing tar file "%1": %2.</source> + <translation>Помилка запиÑу файлу tar "%1": %2.</translation> + </message> + <message> + <source>Error reading file "%1": %2.</source> + <translation>Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ tar "%1": %2.</translation> + </message> + <message> + <source>Adding file "%1" to tarball...</source> + <translation>Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1" до архіву tar...</translation> + </message> + <message> + <source>Cannot add file "%1" to tar-archive: path too long.</source> + <translation>Ðеможливо додати файл "%1" до архіву tar: шлÑÑ… задовгий.</translation> + </message> + <message> + <source>Error writing tar file "%1": %2</source> + <translation>Помилка запиÑу файлу tar "%1": %2.</translation> + </message> + <message> <source>No remote path specified for file '%1', skipping.</source> - <translation>Ðе вказано віддалений шлÑÑ… Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1', пропуÑкаємо.</translation> + <translation type="vanished">Ðе вказано віддалений шлÑÑ… Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1', пропуÑкаємо.</translation> </message> <message> <source>Error writing tar file '%1': %2.</source> - <translation>Помилка запиÑу файлу tar '%1': %2.</translation> + <translation type="vanished">Помилка запиÑу файлу tar '%1': %2.</translation> </message> <message> <source>Error reading file '%1': %2.</source> - <translation>Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ tar '%1': %2.</translation> + <translation type="vanished">Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ tar '%1': %2.</translation> </message> <message> <source>Adding file '%1' to tarball...</source> - <translation>Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1' до архіву tar...</translation> + <translation type="vanished">Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1' до архіву tar...</translation> </message> <message> <source>Cannot add file '%1' to tar-archive: path too long.</source> - <translation>Ðеможливо додати файл '%1' до архіву tar: шлÑÑ… задовгий.</translation> + <translation type="vanished">Ðеможливо додати файл '%1' до архіву tar: шлÑÑ… задовгий.</translation> </message> <message> <source>Error writing tar file '%1': %2</source> - <translation>Помилка запиÑу файлу tar '%1': %2</translation> + <translation type="vanished">Помилка запиÑу файлу tar '%1': %2</translation> </message> <message> <source>Create tarball</source> @@ -21408,6 +22120,14 @@ Remote stderr was: '%1'</source> <translation>Відкрити в текÑтовому редакторі</translation> </message> <message> + <source>Copy path "%1"</source> + <translation>Копіювати шлÑÑ… "%1"</translation> + </message> + <message> + <source>Copy url "%1"</source> + <translation>Копіювати URL "%1"</translation> + </message> + <message> <source>Add Prefix</source> <translation>Додати префікÑ</translation> </message> @@ -21547,17 +22267,6 @@ with a password, which you can enter below.</source> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> - <message> - <source>Checks out a Subversion repository and tries to load the contained project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Subversion Checkout</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Location</source> @@ -21736,7 +22445,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Diff Project</source> - <translation type="unfinished"></translation> + <translation>Зміни в проекті</translation> </message> <message> <source>Diff Project "%1"</source> @@ -21776,7 +22485,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Diff Repository</source> - <translation type="unfinished"></translation> + <translation>Зміни в Ñховищі</translation> </message> <message> <source>Repository Status</source> @@ -21808,7 +22517,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Diff &Selected Files</source> - <translation type="unfinished"></translation> + <translation>&Зміни у вибраних файлах</translation> </message> <message> <source>&Undo</source> @@ -21902,23 +22611,19 @@ with a password, which you can enter below.</source> <context> <name>TaskList::Internal::TaskFileFactory</name> <message> - <source>Task file reader</source> - <translation type="unfinished"></translation> - </message> - <message> <source>File Error</source> - <translation>Помилка файлу</translation> + <translation type="vanished">Помилка файлу</translation> </message> </context> <context> <name>TaskList::TaskListPlugin</name> <message> <source>Cannot open task file %1: %2</source> - <translation>Ðеможливо відкрити файл завдань %1: %2</translation> + <translation type="vanished">Ðеможливо відкрити файл завдань %1: %2</translation> </message> <message> <source>My Tasks</source> - <translation>Мої завданнÑ</translation> + <translation type="vanished">Мої завданнÑ</translation> </message> </context> <context> @@ -21929,7 +22634,7 @@ with a password, which you can enter below.</source> </message> <message> <source>Format</source> - <translation>Формат</translation> + <translation type="vanished">Формат</translation> </message> <message> <source>Text Color</source> @@ -21939,10 +22644,6 @@ with a password, which you can enter below.</source> <source>Selection Color</source> <translation>Колір виділеннÑ</translation> </message> - <message> - <source>Text Input</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>TextEditor</name> @@ -21959,7 +22660,11 @@ with a password, which you can enter below.</source> <name>TextEditor::BaseFileFind</name> <message> <source>Search</source> - <translation>Пошук</translation> + <translation type="vanished">Пошук</translation> + </message> + <message> + <source>Searching</source> + <translation>Шукаю</translation> </message> <message> <source>List of comma separated wildcard filters</source> @@ -21978,6 +22683,10 @@ with a password, which you can enter below.</source> </message> <message> <source>Opening file</source> + <translation type="vanished">Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ñƒ</translation> + </message> + <message> + <source>Opening File</source> <translation>Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ñƒ</translation> </message> </context> @@ -22105,7 +22814,11 @@ with a password, which you can enter below.</source> </message> <message> <source>Directory '%1':</source> - <translation>Тека '%1':</translation> + <translation type="vanished">Тека '%1':</translation> + </message> + <message> + <source>Directory "%1":</source> + <translation>Тека "%1":</translation> </message> <message> <source>Path: %1 @@ -22319,8 +23032,12 @@ The following encodings are likely to fit:</source> <translation>Поточний файл</translation> </message> <message> + <source>File "%1":</source> + <translation>Файл "%1":</translation> + </message> + <message> <source>File '%1':</source> - <translation>Файл '%1':</translation> + <translation type="vanished">Файл '%1':</translation> </message> <message> <source>File path: %1 @@ -22449,23 +23166,23 @@ The following encodings are likely to fit:</source> <name>TextEditor::Internal::Manager</name> <message> <source>Registering definitions</source> - <translation>РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ</translation> + <translation type="vanished">РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ</translation> </message> <message> <source>Downloading definitions</source> - <translation>Ð—Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ</translation> + <translation type="vanished">Ð—Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ</translation> </message> <message> <source>Error downloading selected definition(s).</source> - <translation>Помилка Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… визначень.</translation> + <translation type="vanished">Помилка Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… визначень.</translation> </message> <message> <source>Error downloading one or more definitions.</source> - <translation>Помилка Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ чи більше визначень.</translation> + <translation type="vanished">Помилка Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ чи більше визначень.</translation> </message> <message> <source>Please check the directory's access rights.</source> - <translation>Будь лаÑка, перевірте права доÑтупу до теки.</translation> + <translation type="vanished">Будь лаÑка, перевірте права доÑтупу до теки.</translation> </message> <message> <source> @@ -22474,7 +23191,7 @@ Please check the directory's access rights.</source> </message> <message> <source>Download Error</source> - <translation>Помилка звантаженнÑ</translation> + <translation type="vanished">Помилка звантаженнÑ</translation> </message> </context> <context> @@ -22594,7 +23311,7 @@ Please check the directory's access rights.</source> </message> <message> <source>Triggers a completion in this scope</source> - <translation>Перемикає Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð² цій облаÑÑ‚Ñ–</translation> + <translation type="vanished">Перемикає Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð² цій облаÑÑ‚Ñ–</translation> </message> <message> <source>Ctrl+Space</source> @@ -22606,13 +23323,25 @@ Please check the directory's access rights.</source> </message> <message> <source>Triggers a quick fix in this scope</source> - <translation>Перемикає швидке Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð² цій облаÑÑ‚Ñ–</translation> + <translation type="vanished">Перемикає швидке Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð² цій облаÑÑ‚Ñ–</translation> + </message> + <message> + <source>Trigger Completion</source> + <translation>Доповнити</translation> + </message> + <message> + <source>Trigger Refactoring Action</source> + <translation>Рефакторинг</translation> </message> <message> <source>Alt+Return</source> <translation>Alt+Return</translation> </message> <message> + <source>Create Scratch Buffer Using a Temporary File</source> + <translation>Створює чернетку викориÑтовуючи тимчаÑовий файл</translation> + </message> + <message> <source>Selected text within the current document.</source> <translation>Виділений текÑÑ‚ в поточному документі.</translation> </message> @@ -22641,135 +23370,135 @@ Please check the directory's access rights.</source> <name>TextEditor::TextEditorActionHandler</name> <message> <source>&Undo</source> - <translation>&Повернути</translation> + <translation type="vanished">&Повернути</translation> </message> <message> <source>&Redo</source> - <translation>П&овторити</translation> + <translation type="vanished">П&овторити</translation> </message> <message> <source>Select Encoding...</source> - <translation>Обрати кодуваннÑ...</translation> + <translation type="vanished">Обрати кодуваннÑ...</translation> </message> <message> <source>Auto-&indent Selection</source> - <translation>Ðвтовід&Ñтупи у виділеному</translation> + <translation type="vanished">Ðвтовід&Ñтупи у виділеному</translation> </message> <message> <source>Ctrl+I</source> - <translation>Ctrl+I</translation> + <translation type="vanished">Ctrl+I</translation> </message> <message> <source>&Rewrap Paragraph</source> - <translation>Пере&робити переноÑи в абзаці</translation> + <translation type="vanished">Пере&робити переноÑи в абзаці</translation> </message> <message> <source>&Visualize Whitespace</source> - <translation>&Візуалізовувати пропуÑки</translation> + <translation type="vanished">&Візуалізовувати пропуÑки</translation> </message> <message> <source>Clean Whitespace</source> - <translation>ОчиÑтити пропуÑки</translation> + <translation type="vanished">ОчиÑтити пропуÑки</translation> </message> <message> <source>Enable Text &Wrapping</source> - <translation>Увімкнути &перенеÑÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту</translation> + <translation type="vanished">Увімкнути &перенеÑÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту</translation> </message> <message> <source>Ctrl+/</source> - <translation>Ctrl+/</translation> + <translation type="vanished">Ctrl+/</translation> </message> <message> <source>Cut &Line</source> - <translation>Вирі&зати Ñ€Ñдок</translation> + <translation type="vanished">Вирі&зати Ñ€Ñдок</translation> </message> <message> <source>Shift+Del</source> - <translation>Shift+Del</translation> + <translation type="vanished">Shift+Del</translation> </message> <message> <source>Delete &Line</source> - <translation>Вида&лити Ñ€Ñдок</translation> + <translation type="vanished">Вида&лити Ñ€Ñдок</translation> </message> <message> <source>Delete Word from Cursor On</source> - <translation>Видалити Ñлово під курÑором</translation> + <translation type="vanished">Видалити Ñлово під курÑором</translation> </message> <message> <source>Delete Word Camel Case from Cursor On</source> - <translation>Видалити Ñлово в Camel Case під курÑором</translation> + <translation type="vanished">Видалити Ñлово в Camel Case під курÑором</translation> </message> <message> <source>Delete Word up to Cursor</source> - <translation>Видалити Ñлово перед курÑором</translation> + <translation type="vanished">Видалити Ñлово перед курÑором</translation> </message> <message> <source>Delete Word Camel Case up to Cursor</source> - <translation>Видалити Ñлово в Camel Case перед курÑором</translation> + <translation type="vanished">Видалити Ñлово в Camel Case перед курÑором</translation> </message> <message> <source>Ctrl+<</source> - <translation>Ctrl+<</translation> + <translation type="vanished">Ctrl+<</translation> </message> <message> <source>Ctrl+></source> - <translation>Ctrl+></translation> + <translation type="vanished">Ctrl+></translation> </message> <message> <source>Meta+0</source> - <translation>Meta+0</translation> + <translation type="vanished">Meta+0</translation> </message> <message> <source>Go to Block Start with Selection</source> - <translation>Перейти на початок блока у виділеному</translation> + <translation type="vanished">Перейти на початок блока у виділеному</translation> </message> <message> <source>Go to Block End with Selection</source> - <translation>Перейти на початок блока у виділеному</translation> + <translation type="vanished">Перейти на початок блока у виділеному</translation> </message> <message> <source>Meta+Shift+U</source> - <translation>Meta+Shift+U</translation> + <translation type="vanished">Meta+Shift+U</translation> </message> <message> <source>Meta+U</source> - <translation>Meta+U</translation> + <translation type="vanished">Meta+U</translation> </message> <message> <source>Paste from Clipboard History</source> - <translation>Ð’Ñтавити з Ñ–Ñторії буферу обміну</translation> + <translation type="vanished">Ð’Ñтавити з Ñ–Ñторії буферу обміну</translation> </message> <message> <source>Ctrl+Shift+V</source> - <translation>Ctrl+Shift+V</translation> + <translation type="vanished">Ctrl+Shift+V</translation> </message> <message> <source>Indent</source> - <translation>Зробити відÑтуп</translation> + <translation type="vanished">Зробити відÑтуп</translation> </message> <message> <source>Unindent</source> - <translation>СкаÑувати відÑтуп</translation> + <translation type="vanished">СкаÑувати відÑтуп</translation> </message> <message> <source>Follow Symbol Under Cursor</source> - <translation>Йти за Ñимволом під курÑором</translation> + <translation type="vanished">Йти за Ñимволом під курÑором</translation> </message> <message> <source>Follow Symbol Under Cursor in Next Split</source> - <translation>Йти за Ñимволом під курÑором в наÑтупній розбивці</translation> + <translation type="vanished">Йти за Ñимволом під курÑором в наÑтупній розбивці</translation> </message> <message> <source>Meta+E, F2</source> - <translation>Meta+E, F2</translation> + <translation type="vanished">Meta+E, F2</translation> </message> <message> <source>Ctrl+E, F2</source> - <translation>Ctrl+E, F2</translation> + <translation type="vanished">Ctrl+E, F2</translation> </message> <message> <source>Jump To File Under Cursor</source> - <translation>Перейти до файлу під курÑором</translation> + <translation type="vanished">Перейти до файлу під курÑором</translation> </message> <message> <source>Jump to File Under Cursor in Next Split</source> @@ -22777,267 +23506,267 @@ Please check the directory's access rights.</source> </message> <message> <source>Go to Line Start</source> - <translation>Перейти на початок Ñ€Ñдка</translation> + <translation type="vanished">Перейти на початок Ñ€Ñдка</translation> </message> <message> <source>Go to Line End</source> - <translation>Перейти на кінець Ñ€Ñдка</translation> + <translation type="vanished">Перейти на кінець Ñ€Ñдка</translation> </message> <message> <source>Go to Next Line</source> - <translation>Перейти на наÑтупний Ñ€Ñдок</translation> + <translation type="vanished">Перейти на наÑтупний Ñ€Ñдок</translation> </message> <message> <source>Go to Previous Line</source> - <translation>Перейти на попередній Ñ€Ñдок</translation> + <translation type="vanished">Перейти на попередній Ñ€Ñдок</translation> </message> <message> <source>Go to Previous Character</source> - <translation>Перейти до попереднього Ñимволу</translation> + <translation type="vanished">Перейти до попереднього Ñимволу</translation> </message> <message> <source>Go to Next Character</source> - <translation>Перейти до наÑтупного Ñимволу</translation> + <translation type="vanished">Перейти до наÑтупного Ñимволу</translation> </message> <message> <source>Go to Previous Word</source> - <translation>Перейти до попереднього Ñлова</translation> + <translation type="vanished">Перейти до попереднього Ñлова</translation> </message> <message> <source>Go to Next Word</source> - <translation>Перейти до наÑтупного Ñлова</translation> + <translation type="vanished">Перейти до наÑтупного Ñлова</translation> </message> <message> <source>Go to Previous Word Camel Case</source> - <translation>Перейти до попереднього Ñлова у Camel Case</translation> + <translation type="vanished">Перейти до попереднього Ñлова у Camel Case</translation> </message> <message> <source>Go to Next Word Camel Case</source> - <translation>Перейти до наÑтупного Ñлова у Camel Case</translation> + <translation type="vanished">Перейти до наÑтупного Ñлова у Camel Case</translation> </message> <message> <source>Go to Line Start with Selection</source> - <translation>Перейти на початок Ñ€Ñдка у виділеному</translation> + <translation type="vanished">Перейти на початок Ñ€Ñдка у виділеному</translation> </message> <message> <source>Go to Line End with Selection</source> - <translation>Перейти на кінець Ñ€Ñдка у виділеному</translation> + <translation type="vanished">Перейти на кінець Ñ€Ñдка у виділеному</translation> </message> <message> <source>Go to Next Line with Selection</source> - <translation>Перейти на наÑтупний Ñ€Ñдок у виділеному</translation> + <translation type="vanished">Перейти на наÑтупний Ñ€Ñдок у виділеному</translation> </message> <message> <source>Go to Previous Line with Selection</source> - <translation>Перейти на попередній Ñ€Ñдок у виділеному</translation> + <translation type="vanished">Перейти на попередній Ñ€Ñдок у виділеному</translation> </message> <message> <source>Go to Previous Character with Selection</source> - <translation>Перейти до попереднього Ñимволу у виділеному</translation> + <translation type="vanished">Перейти до попереднього Ñимволу у виділеному</translation> </message> <message> <source>Go to Next Character with Selection</source> - <translation>Перейти до наÑтупного Ñимволу у виділеному</translation> + <translation type="vanished">Перейти до наÑтупного Ñимволу у виділеному</translation> </message> <message> <source>Go to Previous Word with Selection</source> - <translation>Перейти до попереднього Ñлова у виділеному</translation> + <translation type="vanished">Перейти до попереднього Ñлова у виділеному</translation> </message> <message> <source>Go to Next Word with Selection</source> - <translation>Перейти до наÑтупного Ñлова у виділеному</translation> + <translation type="vanished">Перейти до наÑтупного Ñлова у виділеному</translation> </message> <message> <source>Go to Previous Word Camel Case with Selection</source> - <translation>Перейти до попереднього Ñлова у Camel Case у виділеному</translation> + <translation type="vanished">Перейти до попереднього Ñлова у Camel Case у виділеному</translation> </message> <message> <source>Go to Next Word Camel Case with Selection</source> - <translation>Перейти до наÑтупного Ñлова у Camel Case у виділеному</translation> + <translation type="vanished">Перейти до наÑтупного Ñлова у Camel Case у виділеному</translation> </message> <message> <source><line>:<column></source> - <translation><Ñ€Ñдок>:<Ñтовпець></translation> + <translation type="vanished"><Ñ€Ñдок>:<Ñтовпець></translation> </message> <message> <source>Fold</source> - <translation>Згорнути</translation> + <translation type="vanished">Згорнути</translation> </message> <message> <source>Meta+E, R</source> - <translation>Meta+E, R</translation> + <translation type="vanished">Meta+E, R</translation> </message> <message> <source>Ctrl+E, R</source> - <translation>Ctrl+E, R</translation> + <translation type="vanished">Ctrl+E, R</translation> </message> <message> <source>Meta+E, Meta+V</source> - <translation>Meta+E, Meta+V</translation> + <translation type="vanished">Meta+E, Meta+V</translation> </message> <message> <source>Ctrl+E, Ctrl+V</source> - <translation>Ctrl+E, Ctrl+V</translation> + <translation type="vanished">Ctrl+E, Ctrl+V</translation> </message> <message> <source>Meta+E, Meta+W</source> - <translation>Meta+E, Meta+W</translation> + <translation type="vanished">Meta+E, Meta+W</translation> </message> <message> <source>Ctrl+E, Ctrl+W</source> - <translation>Ctrl+E, Ctrl+W</translation> + <translation type="vanished">Ctrl+E, Ctrl+W</translation> </message> <message> <source>Toggle Comment &Selection</source> - <translation>Роз&коментувати/закоментувати виділене</translation> + <translation type="vanished">Роз&коментувати/закоментувати виділене</translation> </message> <message> <source>Copy &Line</source> - <translation>&Копіювати Ñ€Ñдок</translation> + <translation type="vanished">&Копіювати Ñ€Ñдок</translation> </message> <message> <source>Ctrl+Ins</source> - <translation>Ctrl+Ins</translation> + <translation type="vanished">Ctrl+Ins</translation> </message> <message> <source>Unfold</source> - <translation>Розгорнути</translation> + <translation type="vanished">Розгорнути</translation> </message> <message> <source>Increase Font Size</source> - <translation>Збільшити розмір шрифту</translation> + <translation type="vanished">Збільшити розмір шрифту</translation> </message> <message> <source>Ctrl++</source> - <translation>Ctrl++</translation> + <translation type="vanished">Ctrl++</translation> </message> <message> <source>Decrease Font Size</source> - <translation>Зменшити розмір шрифту</translation> + <translation type="vanished">Зменшити розмір шрифту</translation> </message> <message> <source>Ctrl+-</source> - <translation>Ctrl+-</translation> + <translation type="vanished">Ctrl+-</translation> </message> <message> <source>Toggle &Fold All</source> - <translation>Роз&горнути/згорнути вÑе</translation> + <translation type="vanished">Роз&горнути/згорнути вÑе</translation> </message> <message> <source>Reset Font Size</source> - <translation>Відновити розмір шрифту</translation> + <translation type="vanished">Відновити розмір шрифту</translation> </message> <message> <source>Ctrl+0</source> - <translation>Ctrl+0</translation> + <translation type="vanished">Ctrl+0</translation> </message> <message> <source>Go to Block Start</source> - <translation>Перейти на початок блока</translation> + <translation type="vanished">Перейти на початок блока</translation> </message> <message> <source>Ctrl+[</source> - <translation>Ctrl+[</translation> + <translation type="vanished">Ctrl+[</translation> </message> <message> <source>Go to Block End</source> - <translation>Перейти на кінець блока</translation> + <translation type="vanished">Перейти на кінець блока</translation> </message> <message> <source>Ctrl+]</source> - <translation>Ctrl+]</translation> + <translation type="vanished">Ctrl+]</translation> </message> <message> <source>Ctrl+{</source> - <translation>Ctrl+{</translation> + <translation type="vanished">Ctrl+{</translation> </message> <message> <source>Ctrl+}</source> - <translation>Ctrl+}</translation> + <translation type="vanished">Ctrl+}</translation> </message> <message> <source>Select Block Up</source> - <translation>Виділити блок вгору</translation> + <translation type="vanished">Виділити блок вгору</translation> </message> <message> <source>Ctrl+U</source> - <translation>Ctrl+U</translation> + <translation type="vanished">Ctrl+U</translation> </message> <message> <source>Select Block Down</source> - <translation>Виділити блок вниз</translation> + <translation type="vanished">Виділити блок вниз</translation> </message> <message> <source>Move Line Up</source> - <translation>ПереÑунути Ñ€Ñдок вгору</translation> + <translation type="vanished">ПереÑунути Ñ€Ñдок вгору</translation> </message> <message> <source>Ctrl+Shift+Up</source> - <translation>Ctrl+Shift+Up</translation> + <translation type="vanished">Ctrl+Shift+Up</translation> </message> <message> <source>Move Line Down</source> - <translation>ПереÑунути Ñ€Ñдок вниз</translation> + <translation type="vanished">ПереÑунути Ñ€Ñдок вниз</translation> </message> <message> <source>Ctrl+Shift+Down</source> - <translation>Ctrl+Shift+Down</translation> + <translation type="vanished">Ctrl+Shift+Down</translation> </message> <message> <source>Copy Line Up</source> - <translation>Скопіювати Ñ€Ñдок вгору</translation> + <translation type="vanished">Скопіювати Ñ€Ñдок вгору</translation> </message> <message> <source>Ctrl+Alt+Up</source> - <translation>Ctrl+Alt+Up</translation> + <translation type="vanished">Ctrl+Alt+Up</translation> </message> <message> <source>Copy Line Down</source> - <translation>Скопіювати Ñ€Ñдок вниз</translation> + <translation type="vanished">Скопіювати Ñ€Ñдок вниз</translation> </message> <message> <source>Ctrl+Alt+Down</source> - <translation>Ctrl+Alt+Down</translation> + <translation type="vanished">Ctrl+Alt+Down</translation> </message> <message> <source>Join Lines</source> - <translation>Об'єднати Ñ€Ñдки</translation> + <translation type="vanished">Об'єднати Ñ€Ñдки</translation> </message> <message> <source>Ctrl+J</source> - <translation>Ctrl+J</translation> + <translation type="vanished">Ctrl+J</translation> </message> <message> <source>Insert Line Above Current Line</source> - <translation>Ð’Ñтавити Ñ€Ñдок перед поточним</translation> + <translation type="vanished">Ð’Ñтавити Ñ€Ñдок перед поточним</translation> </message> <message> <source>Ctrl+Shift+Return</source> - <translation>Ctrl+Shift+Return</translation> + <translation type="vanished">Ctrl+Shift+Return</translation> </message> <message> <source>Insert Line Below Current Line</source> - <translation>Ð’Ñтавити Ñ€Ñдок піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾</translation> + <translation type="vanished">Ð’Ñтавити Ñ€Ñдок піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾</translation> </message> <message> <source>Ctrl+Return</source> - <translation>Ctrl+Return</translation> + <translation type="vanished">Ctrl+Return</translation> </message> <message> <source>Uppercase Selection</source> - <translation>До верхнього регіÑтру</translation> + <translation type="vanished">До верхнього регіÑтру</translation> </message> <message> <source>Alt+Shift+U</source> - <translation>Alt+Shift+U</translation> + <translation type="vanished">Alt+Shift+U</translation> </message> <message> <source>Lowercase Selection</source> - <translation>До нижнього регіÑтру</translation> + <translation type="vanished">До нижнього регіÑтру</translation> </message> <message> <source>Alt+U</source> - <translation>Alt+U</translation> + <translation type="vanished">Alt+U</translation> </message> </context> <context> @@ -23159,6 +23888,14 @@ Applied to text, if no other rules matching.</source> <translation>Символьний та Ñ€Ñдковий літерали.</translation> </message> <message> + <source>Primitive Type</source> + <translation>Примітивний тип</translation> + </message> + <message> + <source>Name of a primitive data type.</source> + <translation>Ðазва примітивного типу даних.</translation> + </message> + <message> <source>Type</source> <translation>Тип</translation> </message> @@ -23195,6 +23932,10 @@ Applied to text, if no other rules matching.</source> <translation>Ðазва функції, оголошеної віртуальною.</translation> </message> <message> + <source>Reserved keywords of the programming language except keywords denoting primitive types.</source> + <translation>Зарезервовані Ñлова мови програмуваннÑ, окрім назв примітивних типів.</translation> + </message> + <message> <source>Whitespace. Will not be applied to whitespace in comments and strings.</source> <translation>ПропуÑки. @@ -23322,7 +24063,7 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>Reserved keywords of the programming language.</source> - <translation>Зарезервовані Ñлова мови програмуваннÑ.</translation> + <translation type="vanished">Зарезервовані Ñлова мови програмуваннÑ.</translation> </message> <message> <source>Operator</source> @@ -23527,8 +24268,16 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Ðе вдалоÑÑŒ визначити Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð½Ñтрумента обÑлуговуваннÑ. Будь лаÑка, перевірте ваше вÑтановленнÑ, Ñкщо ви не вмикали цей додаток ÑамоÑтійно.</translation> </message> <message> + <source>Could not find maintenance tool at "%1". Check your installation.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Updates Available</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Could not find maintenance tool at '%1'. Check your installation.</source> - <translation>Ðе вдалоÑÑŒ знайти інÑтрумент обÑÐ»ÑƒÐ³Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð² '%1'. Перевірте ваше вÑтановленнÑ.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти інÑтрумент обÑÐ»ÑƒÐ³Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð² '%1'. Перевірте ваше вÑтановленнÑ.</translation> </message> <message> <source>Start Updater</source> @@ -23536,7 +24285,7 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>Updates available</source> - <translation>ДоÑтупні оновленнÑ</translation> + <translation type="vanished">ДоÑтупні оновленнÑ</translation> </message> <message> <source>Update</source> @@ -23588,8 +24337,20 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Ðеможливо запиÑати до тимчаÑового файлу. ДиÑк заповнено?</translation> </message> <message> + <source>Cannot create temporary directory "%1": %2</source> + <translation>Ðеможливо Ñтворити тимчаÑову теку "%1": %2</translation> + </message> + <message> + <source>Cannot change to working directory "%1": %2</source> + <translation>Ðеможливо змінити робочу теку "%1": %2</translation> + </message> + <message> + <source>Cannot execute "%1": %2</source> + <translation>Ðеможливо виконати "%1": %2</translation> + </message> + <message> <source>Cannot create temporary directory '%1': %2</source> - <translation>Ðеможливо Ñтворити тимчаÑову теку '%1': %2</translation> + <translation type="vanished">Ðеможливо Ñтворити тимчаÑову теку '%1': %2</translation> </message> <message> <source>Unexpected output from helper program (%1).</source> @@ -23597,11 +24358,11 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>Cannot change to working directory '%1': %2</source> - <translation>Ðеможливо змінити робочу теку '%1': %2</translation> + <translation type="vanished">Ðеможливо змінити робочу теку '%1': %2</translation> </message> <message> <source>Cannot execute '%1': %2</source> - <translation>Ðеможливо виконати %1': %2</translation> + <translation type="vanished">Ðеможливо виконати %1': %2</translation> </message> <message> <source>Quoting error in command.</source> @@ -23620,16 +24381,28 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Термінальна команда, можливо, не Ñ” командою оболонки.</translation> </message> <message> + <source>Cannot start the terminal emulator "%1", change the setting in the Environment options.</source> + <translation>Ðеможливо запуÑтити емулÑтор терміналу "%1", змініть Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð² опціÑÑ… Ñередовища.</translation> + </message> + <message> + <source>Cannot create socket "%1": %2</source> + <translation>Ðеможливо Ñтворити Ñокет "%1": %2</translation> + </message> + <message> <source>Cannot start the terminal emulator '%1', change the setting in the Environment options.</source> - <translation>Ðеможливо запуÑтити емулÑтор терміналу %1', змініть Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð² Ð¾Ð¿Ñ†Ñ–Ñ Ñередовища.</translation> + <translation type="vanished">Ðеможливо запуÑтити емулÑтор терміналу %1', змініть Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð² Ð¾Ð¿Ñ†Ñ–Ñ Ñередовища.</translation> </message> <message> <source>Cannot create socket '%1': %2</source> - <translation>Ðеможливо Ñтворити Ñокет %1': %2</translation> + <translation type="vanished">Ðеможливо Ñтворити Ñокет %1': %2</translation> </message> <message> <source>The process '%1' could not be started: %2</source> - <translation>Ðе вдалоÑÑŒ запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ '%1': %2</translation> + <translation type="vanished">Ðе вдалоÑÑŒ запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ '%1': %2</translation> + </message> + <message> + <source>The process "%1" could not be started: %2</source> + <translation>Ðе вдалоÑÑŒ запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ "%1": %2</translation> </message> <message> <source>Cannot obtain a handle to the inferior: %1</source> @@ -23676,7 +24449,7 @@ Will not be applied to whitespace in comments and strings.</source> <name>Utils::FancyMainWindow</name> <message> <source>Locked</source> - <translation>ЗафікÑовано</translation> + <translation type="vanished">ЗафікÑовано</translation> </message> <message> <source>Reset to Default Layout</source> @@ -23695,11 +24468,19 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>Invalid character '%1'.</source> - <translation>Ðеправильний Ñимвол '%1'.</translation> + <translation type="vanished">Ðеправильний Ñимвол '%1'.</translation> </message> <message> <source>Invalid characters '%1'.</source> - <translation>Ðеправильні Ñимволи '%1'.</translation> + <translation type="vanished">Ðеправильні Ñимволи '%1'.</translation> + </message> + <message> + <source>Invalid character "%1".</source> + <translation>Ðеправильний Ñимвол "%1".</translation> + </message> + <message> + <source>Invalid characters "%1".</source> + <translation>Ðеправильні Ñимволи "%1".</translation> </message> <message> <source>Name matches MS Windows device. (%1).</source> @@ -23753,19 +24534,35 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>Failed to remove directory '%1'.</source> - <translation>Збій Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1'.</translation> + <translation type="vanished">Збій Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1'.</translation> </message> <message> <source>Failed to remove file '%1'.</source> - <translation>Збій Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'.</translation> + <translation type="vanished">Збій Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ '%1'.</translation> </message> <message> <source>Failed to create directory '%1'.</source> - <translation>Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1'.</translation> + <translation type="vanished">Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1'.</translation> </message> <message> <source>Could not copy file '%1' to '%2'.</source> - <translation>Ðе вдалоÑÑŒ Ñкопіювати файл '%1' до '%2'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ Ñкопіювати файл '%1' до '%2'.</translation> + </message> + <message> + <source>Failed to remove directory "%1".</source> + <translation>Збій Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ "%1".</translation> + </message> + <message> + <source>Failed to remove file "%1".</source> + <translation>Збій Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ "%1".</translation> + </message> + <message> + <source>Failed to create directory "%1".</source> + <translation>Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ "%1".</translation> + </message> + <message> + <source>Could not copy file "%1" to "%2".</source> + <translation>Ðе вдалоÑÑŒ Ñкопіювати файл "%1" до "%1".</translation> </message> <message> <source>Cannot open %1 for reading: %2</source> @@ -23800,7 +24597,7 @@ Will not be applied to whitespace in comments and strings.</source> <name>Utils::FileWizardDialog</name> <message> <source>Location</source> - <translation>РозташуваннÑ</translation> + <translation type="vanished">РозташуваннÑ</translation> </message> </context> <context> @@ -23883,16 +24680,28 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Ðеправильна назва базового клаÑу</translation> </message> <message> + <source>Invalid header file name: "%1"</source> + <translation>Ðеправильне назва файлу заголовка: "%1"</translation> + </message> + <message> + <source>Invalid source file name: "%1"</source> + <translation>Ðеправильне назва файлу коду: "%1"</translation> + </message> + <message> + <source>Invalid form file name: "%1"</source> + <translation>Ðеправильне назва файлу форми: "%1"</translation> + </message> + <message> <source>Invalid header file name: '%1'</source> - <translation>Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ заголовка: '%1'</translation> + <translation type="vanished">Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ заголовка: '%1'</translation> </message> <message> <source>Invalid source file name: '%1'</source> - <translation>Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ коду: '%1'</translation> + <translation type="vanished">Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ коду: '%1'</translation> </message> <message> <source>Invalid form file name: '%1'</source> - <translation>Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ форми: '%1'</translation> + <translation type="vanished">Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ форми: '%1'</translation> </message> <message> <source>Inherits QDeclarativeItem - Qt Quick 1</source> @@ -23930,16 +24739,36 @@ Will not be applied to whitespace in comments and strings.</source> <translation>ШлÑÑ… повинен бути не порожнім.</translation> </message> <message> + <source>The path "%1" expanded to an empty string.</source> + <translation>ШлÑÑ… "%1" перетворивÑÑ Ð½Ð° пуÑтий Ñ€Ñдок.</translation> + </message> + <message> + <source>The path "%1" does not exist.</source> + <translation>ШлÑÑ… "%1" не Ñ–Ñнує.</translation> + </message> + <message> + <source>The path "%1" is not a directory.</source> + <translation>ШлÑÑ… "%1" не Ñ” текою.</translation> + </message> + <message> + <source>The directory "%1" does not exist.</source> + <translation>Тека "%1" не Ñ–Ñнує.</translation> + </message> + <message> + <source>Cannot execute "%1".</source> + <translation>Ðеможливо виконати "%1".</translation> + </message> + <message> <source>The path '%1' expanded to an empty string.</source> - <translation>ШлÑÑ… '%1' перетворивÑÑ Ð½Ð° пуÑтий Ñ€Ñдок.</translation> + <translation type="vanished">ШлÑÑ… '%1' перетворивÑÑ Ð½Ð° пуÑтий Ñ€Ñдок.</translation> </message> <message> <source>The path '%1' does not exist.</source> - <translation>ШлÑÑ… '%1' не Ñ–Ñнує.</translation> + <translation type="vanished">ШлÑÑ… '%1' не Ñ–Ñнує.</translation> </message> <message> <source>The directory '%1' does not exist.</source> - <translation>Тека '%1' не Ñ–Ñнує.</translation> + <translation type="vanished">Тека '%1' не Ñ–Ñнує.</translation> </message> <message> <source>The path <b>%1</b> is not a directory.</source> @@ -23955,7 +24784,7 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>Cannot execute '%1'.</source> - <translation>Ðеможливо виконати %1'.</translation> + <translation type="vanished">Ðеможливо виконати %1'.</translation> </message> <message> <source>Full path: <b>%1</b></source> @@ -23967,7 +24796,7 @@ Will not be applied to whitespace in comments and strings.</source> </message> <message> <source>The path '%1' is not a directory.</source> - <translation>ШлÑÑ… '%1' не Ñ” текою.</translation> + <translation type="vanished">ШлÑÑ… '%1' не Ñ” текою.</translation> </message> </context> <context> @@ -24012,6 +24841,10 @@ Will not be applied to whitespace in comments and strings.</source> <translation><Введіть_назву></translation> </message> <message> + <source>Location</source> + <translation>РозташуваннÑ</translation> + </message> + <message> <source>The project already exists.</source> <translation>Проект вже Ñ–Ñнує.</translation> </message> @@ -24032,7 +24865,11 @@ Will not be applied to whitespace in comments and strings.</source> <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>Invalid character '%1' found!</source> - <translation>Знайдено неправильний Ñимвол '%1'!</translation> + <translation type="vanished">Знайдено неправильний Ñимвол '%1'!</translation> + </message> + <message> + <source>Invalid character "%1" found!</source> + <translation>Знайдено неправильний Ñимвол "%1"!</translation> </message> <message> <source>Invalid character '.'.</source> @@ -24050,23 +24887,43 @@ Will not be applied to whitespace in comments and strings.</source> <name>Utils::SynchronousProcess</name> <message> <source>The command '%1' finished successfully.</source> - <translation>Команда '%1' завершилаÑÑŒ уÑпішно.</translation> + <translation type="vanished">Команда '%1' завершилаÑÑŒ уÑпішно.</translation> </message> <message> <source>The command '%1' terminated with exit code %2.</source> - <translation>Команда '%1' завершилаÑÑ Ð· кодом %2.</translation> + <translation type="vanished">Команда '%1' завершилаÑÑ Ð· кодом %2.</translation> </message> <message> <source>The command '%1' terminated abnormally.</source> - <translation>Команда '%1' завершилаÑÑŒ ненормально.</translation> + <translation type="vanished">Команда '%1' завершилаÑÑŒ ненормально.</translation> </message> <message> <source>The command '%1' could not be started.</source> - <translation>Ðе вдалоÑÑŒ запуÑтити команду '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ запуÑтити команду '%1'.</translation> </message> <message> <source>The command '%1' did not respond within the timeout limit (%2 ms).</source> - <translation>Команда '%1' не відповідає протÑгом заданого чаÑу (%2 мÑ).</translation> + <translation type="vanished">Команда '%1' не відповідає протÑгом заданого чаÑу (%2 мÑ).</translation> + </message> + <message> + <source>The command "%1" finished successfully.</source> + <translation>Команда "%1" завершилаÑÑŒ уÑпішно.</translation> + </message> + <message> + <source>The command "%1" terminated with exit code %2.</source> + <translation>Команда "%1" завершилаÑÑ Ð· кодом %2.</translation> + </message> + <message> + <source>The command "%1" terminated abnormally.</source> + <translation>Команда "%1" завершилаÑÑŒ ненормально.</translation> + </message> + <message> + <source>The command "%1" could not be started.</source> + <translation>Ðе вдалоÑÑŒ запуÑтити команду "%1".</translation> + </message> + <message> + <source>The command "%1" did not respond within the timeout limit (%2 ms).</source> + <translation>Команда "%1" не відповідає протÑгом заданого чаÑу (%2 мÑ).</translation> </message> <message> <source>Process not Responding</source> @@ -24077,8 +24934,12 @@ Will not be applied to whitespace in comments and strings.</source> <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ Ð½Ðµ відповідає.</translation> </message> <message> + <source>The process "%1" is not responding.</source> + <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ "%1" не відповідає.</translation> + </message> + <message> <source>The process '%1' is not responding.</source> - <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ '%1' не відповідає.</translation> + <translation type="vanished">ÐŸÑ€Ð¾Ñ†ÐµÑ '%1' не відповідає.</translation> </message> <message> <source>Would you like to terminate it?</source> @@ -24203,10 +25064,6 @@ Will not be applied to whitespace in comments and strings.</source> <translation type="unfinished"></translation> </message> <message> - <source>Git Diff Editor</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Git Commit Editor</source> <translation type="unfinished"></translation> </message> @@ -25115,7 +25972,7 @@ With cache simulation, further event counters are enabled: <name>Welcome::Internal::CommunityWelcomePage</name> <message> <source>News && Support</source> - <translation>Ðовини та підтримка</translation> + <translation type="vanished">Ðовини та підтримка</translation> </message> </context> <context> @@ -25252,7 +26109,7 @@ With cache simulation, further event counters are enabled: </message> <message> <source>Magic Header</source> - <translation>Магічний заголовок</translation> + <translation type="vanished">Магічний заголовок</translation> </message> <message> <source>Type</source> @@ -25287,11 +26144,11 @@ With cache simulation, further event counters are enabled: <name>Core::Internal::VariableChooser</name> <message> <source>Variables</source> - <translation>Змінні</translation> + <translation type="vanished">Змінні</translation> </message> <message> <source>Select a variable to insert.</source> - <translation>Оберіть змінну Ð´Ð»Ñ Ð²Ñтавки.</translation> + <translation type="vanished">Оберіть змінну Ð´Ð»Ñ Ð²Ñтавки.</translation> </message> </context> <context> @@ -25399,12 +26256,16 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Days</source> - <translation> днів</translation> + <translation type="vanished"> днів</translation> </message> <message> <source>&Expires after:</source> <translation>&ЗаÑтаріє через:</translation> </message> + <message> + <source> Days</source> + <translation> днів</translation> + </message> </context> <context> <name>CodePaster::Internal::SettingsPage</name> @@ -25430,6 +26291,10 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Days</source> + <translation type="vanished"> днів</translation> + </message> + <message> + <source> Days</source> <translation> днів</translation> </message> </context> @@ -25552,7 +26417,7 @@ These prefixes are used in addition to current file name on Switch Header/Source </message> <message> <source>Diff options:</source> - <translation type="unfinished"></translation> + <translation>Опції порівнÑннÑ:</translation> </message> <message> <source>Prompt on submit</source> @@ -25614,28 +26479,28 @@ These prefixes are used in addition to current file name on Switch Header/Source <message> <source><html><head/><body> <p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html></source> - <translation><html><head/><body> + <translation type="vanished"><html><head/><body> <p>Помічник Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтовуєтьÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð·Ñ€ÑƒÑ‡Ð½Ð¾Ð³Ð¾ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±'єктів певних типів, Ñк QString та std::map у виді &quot;Локальних змінних та виразів&quot;. Він не Ñ” вкрай необхідним Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð·Ð° допомогою Qt Creator. </p></body></html></translation> </message> <message> <source>Use Debugging Helper</source> - <translation>ВикориÑтовувати помічник зневадженнÑ</translation> + <translation type="vanished">ВикориÑтовувати помічник зневадженнÑ</translation> </message> <message> <source>Makes use of Qt Creator's code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source> - <translation>Вмикає викориÑÑ‚Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ– коду Qt Creator Ð´Ð»Ñ Ð·'ÑÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾Ð³Ð¾, чи змінній вже було приÑвоєно Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² момент зупинки зневаджувача.</translation> + <translation type="vanished">Вмикає викориÑÑ‚Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ– коду Qt Creator Ð´Ð»Ñ Ð·'ÑÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾Ð³Ð¾, чи змінній вже було приÑвоєно Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² момент зупинки зневаджувача.</translation> </message> <message> <source>Use code model</source> - <translation>ВикориÑтовувати модель коду</translation> + <translation type="vanished">ВикориÑтовувати модель коду</translation> </message> <message> <source>Displays names of QThread based threads.</source> - <translation>Показувати назви ниток, що базуютьÑÑ Ð½Ð° QThread.</translation> + <translation type="vanished">Показувати назви ниток, що базуютьÑÑ Ð½Ð° QThread.</translation> </message> <message> <source>Display thread names</source> - <translation>Показувати імена ниток</translation> + <translation type="vanished">Показувати імена ниток</translation> </message> <message> <source>Show 'std::' prefix for types from the standard library.</source> @@ -25643,7 +26508,7 @@ These prefixes are used in addition to current file name on Switch Header/Source </message> <message> <source>Show "std::" namespace for types</source> - <translation>Показувати проÑÑ‚Ñ–Ñ€ імен "std::" Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð²</translation> + <translation type="vanished">Показувати проÑÑ‚Ñ–Ñ€ імен "std::" Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð²</translation> </message> <message> <source>Show Qt namespace prefix for Qt types. This is only relevant if Qt was configured with '-qtnamespace'.</source> @@ -25651,15 +26516,15 @@ These prefixes are used in addition to current file name on Switch Header/Source </message> <message> <source>Show Qt's namespace for types</source> - <translation>Показувати проÑÑ‚Ñ–Ñ€ імен Qt Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð²</translation> + <translation type="vanished">Показувати проÑÑ‚Ñ–Ñ€ імен Qt Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð²</translation> </message> <message> <source>Shows 'std::' prefix for types from the standard library.</source> - <translation>Показувати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ 'std::' Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð² зі Ñтандартної бібліотеки.</translation> + <translation type="vanished">Показувати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ 'std::' Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð² зі Ñтандартної бібліотеки.</translation> </message> <message> <source>Shows Qt namespace prefix for Qt types. This is only relevant if Qt was configured with '-qtnamespace'.</source> - <translation>Показувати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð¿Ñ€Ð¾Ñтору імен Qt Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð² Qt. Це має ÑенÑ, Ñкщо Qt було Ñконфігуровано з '-qtnamespace'.</translation> + <translation type="vanished">Показувати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð¿Ñ€Ð¾Ñтору імен Qt Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð² Qt. Це має ÑенÑ, Ñкщо Qt було Ñконфігуровано з '-qtnamespace'.</translation> </message> </context> <context> @@ -25888,43 +26753,39 @@ These prefixes are used in addition to current file name on Switch Header/Source <name>QmakeProjectManager::Internal::Html5AppWizardSourcesPage</name> <message> <source>WizardPage</source> - <translation>Сторінка майÑтра</translation> + <translation type="vanished">Сторінка майÑтра</translation> </message> <message> <source>Main HTML File</source> - <translation>Головний файл HTML</translation> + <translation type="vanished">Головний файл HTML</translation> </message> <message> <source>Generate an index.html file</source> - <translation>Генерувати файл index.html</translation> + <translation type="vanished">Генерувати файл index.html</translation> </message> <message> <source>Import an existing .html file</source> - <translation>Імпортувати Ñ–Ñнуючий файл .html</translation> + <translation type="vanished">Імпортувати Ñ–Ñнуючий файл .html</translation> </message> <message> <source>Load a URL</source> - <translation>Звантажити з URL</translation> + <translation type="vanished">Звантажити з URL</translation> </message> <message> <source>http://</source> - <translation>http://</translation> + <translation type="vanished">http://</translation> </message> <message> <source>Note: Unless you chose to load a URL, all files and directories that reside in the same directory as the main HTML file are deployed. You can modify the contents of the directory any time before deploying.</source> - <translation>Примітка: Якщо ви не обрали Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð· URL, то уÑÑ– файли та теки, що знаходÑÑ‚ÑŒÑÑ Ð² тій Ñамій теці, що й оÑновний файл HTML будуть розгорнуті. Ви можете змінити зміÑÑ‚ теки в будь-Ñкий Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ розгортаннÑм.</translation> + <translation type="vanished">Примітка: Якщо ви не обрали Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð· URL, то уÑÑ– файли та теки, що знаходÑÑ‚ÑŒÑÑ Ð² тій Ñамій теці, що й оÑновний файл HTML будуть розгорнуті. Ви можете змінити зміÑÑ‚ теки в будь-Ñкий Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ розгортаннÑм.</translation> </message> <message> <source>Touch optimized navigation</source> - <translation>ÐавігаціÑ, опитимізована Ð´Ð»Ñ Ð´Ð¾Ñ‚Ð¸ÐºÑ–Ð²</translation> + <translation type="vanished">ÐавігаціÑ, опитимізована Ð´Ð»Ñ Ð´Ð¾Ñ‚Ð¸ÐºÑ–Ð²</translation> </message> <message> <source>Enable touch optimized navigation</source> - <translation>Увімкнути навігацію, опитимізовану Ð´Ð»Ñ Ð´Ð¾Ñ‚Ð¸ÐºÑ–Ð²</translation> - </message> - <message> - <source>Touch optimized navigation will make the HTML page flickable and enlarge the area of touch sensitive elements. If you use a JavaScript framework which optimizes the touch interaction, leave the checkbox unchecked.</source> - <translation type="unfinished"></translation> + <translation type="vanished">Увімкнути навігацію, опитимізовану Ð´Ð»Ñ Ð´Ð¾Ñ‚Ð¸ÐºÑ–Ð²</translation> </message> </context> <context> @@ -26078,7 +26939,7 @@ These prefixes are used in addition to current file name on Switch Header/Source </message> <message> <source>The user name to log into the device:</source> - <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ на приÑтрій:</translation> + <translation type="vanished">Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ на приÑтрій:</translation> </message> <message> <source>The authentication type:</source> @@ -26100,6 +26961,10 @@ These prefixes are used in addition to current file name on Switch Header/Source <source>The file containing the user's private key:</source> <translation>Файл, що міÑтить приватний ключ кориÑтувача:</translation> </message> + <message> + <source>The username to log into the device:</source> + <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ на приÑтрій:</translation> + </message> </context> <context> <name>RemoteLinux::Internal::LinuxDeviceTestDialog</name> @@ -26112,11 +26977,11 @@ These prefixes are used in addition to current file name on Switch Header/Source <name>RemoteLinux::Internal::RemoteLinuxDeployConfigurationWidget</name> <message> <source>Form</source> - <translation>Форма</translation> + <translation type="vanished">Форма</translation> </message> <message> <source>Files to deploy:</source> - <translation>Файли до розгортаннÑ:</translation> + <translation type="vanished">Файли до розгортаннÑ:</translation> </message> </context> <context> @@ -26696,7 +27561,7 @@ Influences the indentation of continuation lines. </message> <message> <source>Retrieve list of branches in repository.</source> - <translation type="unfinished"></translation> + <translation>Отримати ÑпиÑок гілок в Ñховищі.</translation> </message> <message> <source>...</source> @@ -26765,10 +27630,6 @@ Influences the indentation of continuation lines. <translation type="unfinished"></translation> </message> <message> - <source>&Patch command:</source> - <translation type="unfinished"></translation> - </message> - <message> <source>&SSH prompt command:</source> <translation type="unfinished"></translation> </message> @@ -26778,7 +27639,7 @@ should a repository require SSH-authentication (see documentation on SSH and the <translation type="unfinished"></translation> </message> <message> - <source>A file listing user names and email addresses in a 4-column mailmap format: + <source>A file listing nicknames in a 4-column mailmap format: 'name <email> alias <email>'.</source> <translation type="unfinished"></translation> </message> @@ -26794,8 +27655,16 @@ should a repository require SSH-authentication (see documentation on SSH and the <translation>Ðазва</translation> </message> <message> + <source>Email</source> + <translation>Email</translation> + </message> + <message> + <source>Alias email</source> + <translation>Email пÑевдоніма</translation> + </message> + <message> <source>E-mail</source> - <translation>E-mail</translation> + <translation type="vanished">E-mail</translation> </message> <message> <source>Alias</source> @@ -26803,7 +27672,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>Alias e-mail</source> - <translation>E-mail пÑевдоніма</translation> + <translation type="vanished">E-mail пÑевдоніма</translation> </message> </context> <context> @@ -26985,7 +27854,11 @@ should a repository require SSH-authentication (see documentation on SSH and the <name>ZeroConf::Internal::ZConfLib</name> <message> <source>AvahiZConfLib could not load the native library '%1': %2</source> - <translation>AvahiZConfLib не зміг завантажити рідну бібліотеку '%1': %2</translation> + <translation type="vanished">AvahiZConfLib не зміг завантажити рідну бібліотеку '%1': %2</translation> + </message> + <message> + <source>AvahiZConfLib could not load the native library "%1": %2</source> + <translation>AvahiZConfLib не зміг завантажити рідну бібліотеку "%1": %2</translation> </message> <message> <source>%1 cannot create a client. The daemon is probably not running.</source> @@ -27013,15 +27886,23 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>%1 failed to kill other daemons with '%2'.</source> - <translation>%1 не зміг вбити інших демонів за допомогою '%2'.</translation> + <translation type="vanished">%1 не зміг вбити інших демонів за допомогою '%2'.</translation> + </message> + <message> + <source>%1 failed to kill other daemons with "%2".</source> + <translation>%1 не зміг вбити інших демонів за допомогою "%1".</translation> </message> <message> <source>%1 detected a file at /tmp/mdnsd, daemon startup will probably fail.</source> <translation>%1 знайшов файл /tmp/mdnsd, запуÑк демона, Ñкоріше за вÑе, не вдавÑÑ.</translation> </message> <message> + <source>%1: log of previous daemon run is: "%2".</source> + <translation>%1: журнал попереднього запуÑка демона: "%1".</translation> + </message> + <message> <source>%1: log of previous daemon run is: '%2'.</source> - <translation>%1: журнал попереднього запуÑка демона: '%2'.</translation> + <translation type="vanished">%1: журнал попереднього запуÑка демона: '%2'.</translation> </message> <message> <source>%1: log of previous daemon run is: '%2'. @@ -27179,7 +28060,11 @@ should a repository require SSH-authentication (see documentation on SSH and the <name>AutotoolsProjectManager::Internal::AutotoolsManager</name> <message> <source>Failed opening project '%1': Project is not a file</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом</translation> + </message> + <message> + <source>Failed opening project "%1": Project is not a file</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": Проект не Ñ” файлом</translation> </message> </context> <context> @@ -27274,11 +28159,11 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> - <translation>Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> + <translation type="vanished">Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> </message> <message> <source>Configuration is faulty. Check the Issues view for details.</source> - <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + <translation type="vanished">ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> </message> </context> <context> @@ -27339,8 +28224,12 @@ should a repository require SSH-authentication (see documentation on SSH and the <translation>ПерезапиÑати?</translation> </message> <message> + <source>An item named "%1" already exists at this location. Do you want to overwrite it?</source> + <translation>Елемент з іменем "%1" вже Ñ–Ñнує в цьому розташуванні. Бажаєте перезапиÑати його?</translation> + </message> + <message> <source>An item named '%1' already exists at this location. Do you want to overwrite it?</source> - <translation>Елемент з іменем '%1' вже Ñ–Ñнує в цьому розташуванні. Бажаєте перезапиÑати його?</translation> + <translation type="vanished">Елемент з іменем '%1' вже Ñ–Ñнує в цьому розташуванні. Бажаєте перезапиÑати його?</translation> </message> <message> <source>Save File As</source> @@ -27393,17 +28282,6 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Cvs::Internal::CheckoutWizard</name> - <message> - <source>Checks out a CVS repository and tries to load the contained project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>CVS Checkout</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>Cvs::Internal::CheckoutWizardPage</name> <message> <source>Location</source> @@ -27429,7 +28307,11 @@ should a repository require SSH-authentication (see documentation on SSH and the <name>Cvs::Internal::CvsPlugin</name> <message> <source>Cannot find repository for '%1'</source> - <translation>Ðеможливо знайти Ñховище Ð´Ð»Ñ '%1'</translation> + <translation type="vanished">Ðеможливо знайти Ñховище Ð´Ð»Ñ '%1'</translation> + </message> + <message> + <source>Cannot find repository for "%1"</source> + <translation>Ðеможливо знайти Ñховище Ð´Ð»Ñ "%1"</translation> </message> <message> <source>Parsing of the log output failed</source> @@ -27541,7 +28423,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>Diff Project</source> - <translation type="unfinished"></translation> + <translation>Зміни в проекті</translation> </message> <message> <source>Diff Project "%1"</source> @@ -27581,7 +28463,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>Diff Repository</source> - <translation type="unfinished"></translation> + <translation>Зміни в Ñховищі</translation> </message> <message> <source>Repository Status</source> @@ -27589,7 +28471,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>Repository Log</source> - <translation type="unfinished"></translation> + <translation>ІÑÑ‚Ð¾Ñ€Ñ–Ñ Ñховища</translation> </message> <message> <source>Update Repository</source> @@ -27609,7 +28491,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>Diff &Selected Files</source> - <translation type="unfinished"></translation> + <translation>&Зміни у вибраних файлах</translation> </message> <message> <source>&Undo</source> @@ -27632,6 +28514,18 @@ should a repository require SSH-authentication (see documentation on SSH and the <translation type="unfinished"></translation> </message> <message> + <source>Would you like to discard your changes to the repository "%1"?</source> + <translation>Бажаєти відкинути ваші зміни до Ñховища "%1"?</translation> + </message> + <message> + <source>Would you like to discard your changes to the file "%1"?</source> + <translation>Бажаєти відкинути ваші зміни до файлу "%1"?</translation> + </message> + <message> + <source>Could not find commits of id "%1" on %2.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>The files do not differ.</source> <translation type="vanished">Файли не відрізнÑÑŽÑ‚ÑŒÑÑ.</translation> </message> @@ -27660,14 +28554,6 @@ should a repository require SSH-authentication (see documentation on SSH and the <translation>Ðемає змінених файлів.</translation> </message> <message> - <source>Would you like to discard your changes to the repository '%1'?</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Would you like to discard your changes to the file '%1'?</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Project status</source> <translation type="unfinished"></translation> </message> @@ -27680,10 +28566,6 @@ should a repository require SSH-authentication (see documentation on SSH and the <translation type="unfinished"></translation> </message> <message> - <source>Could not find commits of id '%1' on %2.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>No cvs executable specified!</source> <translation>Виконуваний модуль cvs не вказано!</translation> </message> @@ -27755,6 +28637,10 @@ should a repository require SSH-authentication (see documentation on SSH and the <context> <name>Debugger::DebuggerEnginePrivate</name> <message> + <source>Debugged executable</source> + <translation>Виконуваний модуль Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ</translation> + </message> + <message> <source>Attempting to interrupt.</source> <translation>ÐамагаємоÑÑŒ перервати.</translation> </message> @@ -27821,11 +28707,11 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>added</source> - <translation type="unfinished"></translation> + <translation>додано</translation> </message> <message> <source>deleted</source> - <translation type="unfinished"></translation> + <translation>видалено</translation> </message> <message> <source>renamed</source> @@ -27833,7 +28719,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> <message> <source>copied</source> - <translation type="unfinished"></translation> + <translation>Ñкопійовано</translation> </message> <message> <source> by both</source> @@ -27968,11 +28854,11 @@ Do you want to kill it?</source> <translation type="unfinished"></translation> </message> <message> - <source>// Rename all outer uses of the id '%1' to '%2.item'.</source> + <source>// Rename all outer uses of the id "%1" to "%2.item".</source> <translation type="unfinished"></translation> </message> <message> - <source>// Rename all outer uses of the id '%1' to '%2.item.%1'. + <source>// Rename all outer uses of the id "%1" to "%2.item.%1". </source> <translation type="unfinished"></translation> </message> @@ -28016,11 +28902,27 @@ Do you want to kill it?</source> <translation type="vanished"> Ñ</translation> </message> <message> + <source><program></source> + <translation><програма></translation> + </message> + <message> + <source>Main Program</source> + <translation>ОÑновна програма</translation> + </message> + <message> + <source><bytecode></source> + <translation><байт-код></translation> + </message> + <message> <source>Binding not optimized (might have side effects or assignments, references to elements in other files, loops, and so on.)</source> <translation type="unfinished"></translation> </message> <message> + <source>Source code not available</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Paint</source> <translation type="unfinished"></translation> </message> @@ -28293,23 +29195,23 @@ references to elements in other files, loops, and so on.)</source> <name>VcsBase::BaseCheckoutWizard</name> <message> <source>Cannot Open Project</source> - <translation>Ðеможливо відкрити проект</translation> + <translation type="vanished">Ðеможливо відкрити проект</translation> </message> <message> <source>Failed to open project in '%1'.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ в '%1'.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ в '%1'.</translation> </message> <message> <source>Could not find any project files matching (%1) in the directory '%2'.</source> - <translation>Ðе вдалоÑÑŒ знайти жодних файлів проекту, що відповідають (%1), в теці '%2'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти жодних файлів проекту, що відповідають (%1), в теці '%2'.</translation> </message> <message> <source>The Project Explorer is not available.</source> - <translation>ОглÑдач проекту не доÑтупний.</translation> + <translation type="vanished">ОглÑдач проекту не доÑтупний.</translation> </message> <message> <source>'%1' does not exist.</source> - <translation>'%1' не Ñ–Ñнує.</translation> + <translation type="vanished">'%1' не Ñ–Ñнує.</translation> </message> </context> <context> @@ -28392,6 +29294,10 @@ references to elements in other files, loops, and so on.)</source> <numerusform>%n байтів, воÑтаннє змінено %1.</numerusform> </translation> </message> + <message> + <source>Cleaning "%1"</source> + <translation>ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ "%1"</translation> + </message> <message numerus="yes"> <source>%n bytes, last modified %1</source> <translation type="vanished"> @@ -28414,7 +29320,7 @@ references to elements in other files, loops, and so on.)</source> </message> <message> <source>Cleaning %1</source> - <translation>ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ %1</translation> + <translation type="vanished">ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ %1</translation> </message> </context> <context> @@ -28447,7 +29353,11 @@ references to elements in other files, loops, and so on.)</source> <name>VcsBase::VcsBaseClient</name> <message> <source>Unable to start process '%1': %2</source> - <translation>Ðеможливо запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ '%1': %2</translation> + <translation type="vanished">Ðеможливо запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ '%1': %2</translation> + </message> + <message> + <source>Unable to start process "%1": %2</source> + <translation>Ðеможливо запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ "%1": %2</translation> </message> <message> <source>Timed out after %1s waiting for the process %2 to finish.</source> @@ -28485,15 +29395,15 @@ references to elements in other files, loops, and so on.)</source> </message> <message> <source>Send to CodePaster...</source> - <translation type="unfinished"></translation> + <translation>ÐадіÑлати до Codepaster...</translation> </message> <message> <source>Apply Chunk...</source> - <translation type="unfinished"></translation> + <translation>ÐаклаÑти чаÑтину латки...</translation> </message> <message> <source>Revert Chunk...</source> - <translation type="unfinished"></translation> + <translation>ЗнÑти чаÑтину латки...</translation> </message> <message> <source>Failed to retrieve data.</source> @@ -28501,27 +29411,27 @@ references to elements in other files, loops, and so on.)</source> </message> <message> <source>Unable to Paste</source> - <translation type="unfinished"></translation> + <translation>Ðеможливо вÑтавити</translation> </message> <message> <source>Code pasting services are not available.</source> - <translation type="unfinished"></translation> + <translation>Служби вÑтавки коду не доÑтупні.</translation> </message> <message> <source>Revert Chunk</source> - <translation type="unfinished"></translation> + <translation>ЗнÑÑ‚Ñ‚Ñ Ñ‡Ð°Ñтини латки</translation> </message> <message> <source>Apply Chunk</source> - <translation type="unfinished"></translation> + <translation>ÐÐ°ÐºÐ»Ð°Ð´Ð°Ð½Ð½Ñ Ñ‡Ð°Ñтини латки</translation> </message> <message> <source>Would you like to revert the chunk?</source> - <translation type="unfinished"></translation> + <translation>Бажаєте знÑти чаÑтину латки?</translation> </message> <message> <source>Would you like to apply the chunk?</source> - <translation type="unfinished"></translation> + <translation>Бажаєте наклаÑти чаÑтину латки?</translation> </message> </context> <context> @@ -28540,11 +29450,11 @@ references to elements in other files, loops, and so on.)</source> </message> <message> <source>Executing: %1 %2</source> - <translation type="unfinished"></translation> + <translation>ВиконаннÑ: %1 %2</translation> </message> <message> <source>Executing in %1: %2 %3</source> - <translation type="unfinished"></translation> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð² %1: %2 %3</translation> </message> </context> <context> @@ -28554,15 +29464,15 @@ references to elements in other files, loops, and so on.)</source> <translation>Контроль верÑій</translation> </message> <message> - <source>The file '%1' could not be deleted.</source> - <translation type="unfinished"></translation> + <source>Choose Repository Directory</source> + <translation>Оберіть теку Ñховища</translation> </message> <message> - <source>Choose Repository Directory</source> - <translation type="unfinished"></translation> + <source>The file "%1" could not be deleted.</source> + <translation>Ðе вдалоÑÑŒ видалити файл "%1".</translation> </message> <message> - <source>The directory '%1' is already managed by a version control system (%2). Would you like to specify another directory?</source> + <source>The directory "%1" is already managed by a version control system (%2). Would you like to specify another directory?</source> <translation type="unfinished"></translation> </message> <message> @@ -28571,7 +29481,7 @@ references to elements in other files, loops, and so on.)</source> </message> <message> <source>Repository Created</source> - <translation type="unfinished"></translation> + <translation>Сховище Ñтворено</translation> </message> <message> <source>A version control repository has been created in %1.</source> @@ -28586,24 +29496,8 @@ references to elements in other files, loops, and so on.)</source> <translation type="unfinished"></translation> </message> <message> - <source>There is no patch-command configured in the common 'Version Control' settings.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Unable to launch '%1': %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>A timeout occurred running '%1'</source> - <translation type="unfinished"></translation> - </message> - <message> <source>'%1' crashed.</source> - <translation>'%1' завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> - </message> - <message> - <source>'%1' failed (exit code %2).</source> - <translation type="unfinished"></translation> + <translation type="vanished">'%1' завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> </message> </context> <context> @@ -28633,15 +29527,15 @@ references to elements in other files, loops, and so on.)</source> <translation type="unfinished"></translation> </message> <message> - <source>The check script '%1' could not be started: %2</source> + <source>The check script "%1" could not be started: %2</source> <translation type="unfinished"></translation> </message> <message> - <source>The check script '%1' timed out.</source> + <source>The check script "%1" timed out.</source> <translation type="unfinished"></translation> </message> <message> - <source>The check script '%1' crashed.</source> + <source>The check script "%1" crashed.</source> <translation type="unfinished"></translation> </message> <message> @@ -28728,7 +29622,11 @@ references to elements in other files, loops, and so on.)</source> </message> <message> <source>Failed to create directory: '%1'.</source> - <translation>Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1'.</translation> + <translation type="vanished">Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1'.</translation> + </message> + <message> + <source>Failed to create directory: "%1".</source> + <translation>Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ "%1".</translation> </message> <message> <source>Cannot Save Private Key File</source> @@ -29010,7 +29908,7 @@ The APK will not be usable on any other device.</source> </message> <message> <source>Browse</source> - <translation>ОглÑд</translation> + <translation type="vanished">ОглÑд</translation> </message> <message> <source>Android NDK location:</source> @@ -29088,6 +29986,10 @@ The APK will not be usable on any other device.</source> <source>Add...</source> <translation>Додати...</translation> </message> + <message> + <source><a href="xx">The GDB in the NDK appears to have broken python support.</a></source> + <translation><a href="xx">Схоже, що GDB з NDK має зіпÑуту підтримку Python.</a></translation> + </message> </context> <context> <name>ClearCase::Internal::CheckOutDialog</name> @@ -29650,19 +30552,35 @@ The APK will not be usable on any other device.</source> </message> <message> <source>Created remote directory '%1'.</source> - <translation>Створено віддалену теку '%1'.</translation> + <translation type="vanished">Створено віддалену теку '%1'.</translation> </message> <message> <source>Remote directory '%1' already exists.</source> - <translation>Віддалена тека '%1' вже Ñ–Ñнує.</translation> + <translation type="vanished">Віддалена тека '%1' вже Ñ–Ñнує.</translation> </message> <message> <source>Error creating directory '%1': %2</source> - <translation>Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1': %2</translation> + <translation type="vanished">Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1': %2</translation> </message> <message> <source>Could not open local file '%1': %2</source> - <translation>Ðе вдалоÑÑŒ відкрити локальний файл '%1': %2</translation> + <translation type="vanished">Ðе вдалоÑÑŒ відкрити локальний файл '%1': %2</translation> + </message> + <message> + <source>Created remote directory "%1".</source> + <translation>Створено віддалену теку "%1".</translation> + </message> + <message> + <source>Remote directory "%1" already exists.</source> + <translation>Віддалена тека "%1" вже Ñ–Ñнує.</translation> + </message> + <message> + <source>Error creating directory "%1": %2</source> + <translation>Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ "%1": %2</translation> + </message> + <message> + <source>Could not open local file "%1": %2</source> + <translation>Ðе вдалоÑÑŒ відкрити локальний файл "%1": %2</translation> </message> <message> <source>Remote directory could not be opened for reading.</source> @@ -29728,12 +30646,20 @@ The APK will not be usable on any other device.</source> <translation>Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ</translation> </message> <message> + <source>Error getting "stat" info about "%1": %2</source> + <translation>Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— "stat" про "%1": %2</translation> + </message> + <message> + <source>Error listing contents of directory "%1": %2</source> + <translation>Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ñту теки "%1": %2</translation> + </message> + <message> <source>Error getting 'stat' info about '%1': %2</source> - <translation>Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— 'stat' про '%1': %2</translation> + <translation type="vanished">Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— 'stat' про '%1': %2</translation> </message> <message> <source>Error listing contents of directory '%1': %2</source> - <translation>Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ñту теки '%1': %2</translation> + <translation type="vanished">Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ñту теки '%1': %2</translation> </message> </context> <context> @@ -29767,11 +30693,19 @@ The APK will not be usable on any other device.</source> </message> <message> <source>Server Identification string '%1' is invalid.</source> - <translation>Ð Ñдок ідентифікації Ñервера '%1' неправильний.</translation> + <translation type="vanished">Ð Ñдок ідентифікації Ñервера '%1' неправильний.</translation> </message> <message> <source>Server protocol version is '%1', but needs to be 2.0 or 1.99.</source> - <translation>ВерÑÑ–Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ Ñервера '%1' при необхідній 2.0 або 1.99.</translation> + <translation type="vanished">ВерÑÑ–Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ Ñервера '%1' при необхідній 2.0 або 1.99.</translation> + </message> + <message> + <source>Server Identification string "%1" is invalid.</source> + <translation>Ð Ñдок ідентифікації Ñервера "%1" неправильний.</translation> + </message> + <message> + <source>Server protocol version is "%1", but needs to be 2.0 or 1.99.</source> + <translation>ВерÑÑ–Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ Ñервера "%1" при необхідній 2.0 або 1.99.</translation> </message> <message> <source>Server identification string is invalid (missing carriage return).</source> @@ -29840,30 +30774,46 @@ The APK will not be usable on any other device.</source> <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ Ð²Ð±Ð¸Ñ‚Ð¾ Ñигналом</translation> </message> <message> + <source>Server sent invalid signal "%1"</source> + <translation>Сервер надіÑлав неправильний Ñигнал "%1"</translation> + </message> + <message> <source>Server sent invalid signal '%1'</source> - <translation>Сервер надіÑлав неправильний Ñигнал '%1'</translation> + <translation type="vanished">Сервер надіÑлав неправильний Ñигнал '%1'</translation> </message> </context> <context> <name>Utils::BaseTreeView</name> <message> <source>Adjust Column Widths to Contents</source> - <translation>Підігнати ширину Ñтовпців до зміÑту</translation> + <translation type="vanished">Підігнати ширину Ñтовпців до зміÑту</translation> </message> </context> <context> <name>Utils::ElfReader</name> <message> <source>'%1' is an invalid ELF object (%2)</source> - <translation>'%1' не Ñ” правильним об'єктом ELF (%2)</translation> + <translation type="vanished">'%1' не Ñ” правильним об'єктом ELF (%2)</translation> </message> <message> <source>'%1' is not an ELF object (file too small)</source> - <translation>'%1' не Ñ” об'єктом ELF (файл замалий)</translation> + <translation type="vanished">'%1' не Ñ” об'єктом ELF (файл замалий)</translation> </message> <message> <source>'%1' is not an ELF object</source> - <translation>'%1' не Ñ” об'єктом ELF</translation> + <translation type="vanished">'%1' не Ñ” об'єктом ELF</translation> + </message> + <message> + <source>"%1" is an invalid ELF object (%2)</source> + <translation>"%1" не Ñ” правильним об'єктом ELF (%2)</translation> + </message> + <message> + <source>"%1" is not an ELF object (file too small)</source> + <translation>"%1" не Ñ” об'єктом ELF (файл замалий)</translation> + </message> + <message> + <source>"%1" is not an ELF object</source> + <translation>"%1" не Ñ” об'єктом ELF</translation> </message> <message> <source>odd cpu architecture</source> @@ -30197,7 +31147,11 @@ Please install an SDK of at least API version %1.</source> <name>Android::Internal::AndroidManager</name> <message> <source>Error creating Android directory '%1'.</source> - <translation>Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1' Ð´Ð»Ñ Android.</translation> + <translation type="vanished">Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ '%1' Ð´Ð»Ñ Android.</translation> + </message> + <message> + <source>Error creating Android directory "%1".</source> + <translation>Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÐ¸ "%1" Ð´Ð»Ñ Android.</translation> </message> <message> <source>No Qt for Android SDKs were found. @@ -30214,8 +31168,20 @@ Please install at least one SDK.</source> <translation>Файли Android були автоматично оновлені.</translation> </message> <message> + <source>Unknown Android version. API Level: %1</source> + <translation>Ðевідома верÑÑ–Ñ Android. Рівень API: %1</translation> + </message> + <message> + <source>Cannot parse "%1".</source> + <translation>Ðеможливо розібрати "%1".</translation> + </message> + <message> + <source>Cannot open "%1".</source> + <translation>Ðеможливо відкрити "%1".</translation> + </message> + <message> <source>Unknown Android version.</source> - <translation>Ðевідома верÑÑ–Ñ Android.</translation> + <translation type="vanished">Ðевідома верÑÑ–Ñ Android.</translation> </message> <message> <source>Error creating Android templates.</source> @@ -30223,11 +31189,11 @@ Please install at least one SDK.</source> </message> <message> <source>Cannot parse '%1'.</source> - <translation>Ðеможливо розібрати '%1'.</translation> + <translation type="vanished">Ðеможливо розібрати '%1'.</translation> </message> <message> <source>Cannot open '%1'.</source> - <translation>Ðеможливо відкрити '%1'.</translation> + <translation type="vanished">Ðеможливо відкрити '%1'.</translation> </message> <message> <source>Starting Android virtual device failed.</source> @@ -30282,7 +31248,7 @@ Please install at least one SDK.</source> <message> <source>Cannot find '%1'. Please make sure your application is built successfully and is selected in Application tab ('Run option').</source> - <translation>Ðеможливо знайти '%1'. + <translation type="vanished">Ðеможливо знайти '%1'. Будь лаÑка, переконайтеÑÑŒ, що ваша програма була уÑпішно зібрана та вибрана у вкладці Програма ('Параметри запуÑку').</translation> </message> <message> @@ -30303,7 +31269,17 @@ Please make sure your application is built successfully and is selected in Appli </message> <message> <source>Can't copy gdbserver from '%1' to '%2'</source> - <translation>Ðеможливо Ñкопіювати gdbserver з '%1' до '%2'</translation> + <translation type="vanished">Ðеможливо Ñкопіювати gdbserver з '%1' до '%2'</translation> + </message> + <message> + <source>Cannot find "%1". +Please make sure your application is built successfully and is selected in Application tab ('Run option').</source> + <translation>Ðеможливо знайти "%1". +Будь лаÑка, переконайтеÑÑŒ, що ваша програма була уÑпішно зібрана та вибрана у вкладці Програма ('Параметри запуÑку').</translation> + </message> + <message> + <source>Can't copy gdbserver from "%1" to "%2"</source> + <translation>Ðеможливо Ñкопіювати gdbserver з "%1" до "%2"</translation> </message> <message> <source>Creating package file ...</source> @@ -30419,7 +31395,11 @@ Please make sure your application is built successfully and is selected in Appli <name>Android::Internal::AndroidRunConfiguration</name> <message> <source>The .pro file '%1' is currently being parsed.</source> - <translation>ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro '%1'.</translation> + <translation type="vanished">ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro '%1'.</translation> + </message> + <message> + <source>The .pro file "%1" is currently being parsed.</source> + <translation>ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro "%1".</translation> </message> <message> <source>Run on Android device</source> @@ -30477,7 +31457,7 @@ Please make sure your application is built successfully and is selected in Appli </message> <message> <source>Unable to start '%1'.</source> - <translation>Ðеможливо запуÑтити '%1'.</translation> + <translation type="vanished">Ðеможливо запуÑтити '%1'.</translation> </message> <message> <source>"%1" terminated.</source> @@ -30526,6 +31506,10 @@ Please make sure your application is built successfully and is selected in Appli <translation>"%1" не Ñхожа на кореневу теку Android NDK.</translation> </message> <message> + <source>Select JDK Path</source> + <translation>Виберіть шлÑÑ… до JDK</translation> + </message> + <message> <source>The Android NDK cannot be installed into a path with spaces.</source> <translation>Ðеможливо вÑтановити Android NDK до шлÑху з пропуÑками.</translation> </message> @@ -30558,6 +31542,22 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s <translation>"%1" не Ñхожа на теку JDK.</translation> </message> <message> + <source>Remove Android Virtual Device</source> + <translation>Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ приÑтрою Android</translation> + </message> + <message> + <source>Remove device "%1"? This cannot be undone.</source> + <translation>Видалити приÑтій "%1"? СкаÑувати буде неможливо.</translation> + </message> + <message> + <source>Unsupported GDB</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The GDB inside this NDK seems to not support Python. The Qt Project offers fixed GDB builds at: <a href="http://download.qt-project.org/official_releases/gdb/">http://download.qt-project.org/official_releases/gdb/</a></source> + <translation type="unfinished"></translation> + </message> + <message> <source>Qt version for architecture %1 is missing. To add the Qt version, select Options > Build & Run > Qt Versions.</source> <translation type="vanished">ВідÑÑƒÑ‚Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ Qt Ð´Ð»Ñ Ð°Ñ€Ñ…Ñ–Ñ‚ÐµÐºÑ‚ÑƒÑ€Ð¸ %1. @@ -30583,7 +31583,7 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s </message> <message> <source>Select OpenJDK Path</source> - <translation>Виберіть шлÑÑ… до OpenJDK</translation> + <translation type="vanished">Виберіть шлÑÑ… до OpenJDK</translation> </message> </context> <context> @@ -30851,15 +31851,19 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s <translation type="unfinished"></translation> </message> <message> - <source>Do you want to undo the check out of '%1'?</source> + <source>Do you want to undo the check out of "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <source>Undo Hijack File</source> + <source>Do you want to undo hijack of "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <source>Do you want to undo hijack of '%1'?</source> + <source>Updating ClearCase Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Undo Hijack File</source> <translation type="unfinished"></translation> </message> <message> @@ -30934,10 +31938,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s <source>Enter activity headline</source> <translation type="unfinished"></translation> </message> - <message> - <source>CC Indexing</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>ClearCase::Internal::ClearCaseSubmitEditor</name> @@ -31106,7 +32106,7 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s </message> <message> <source>Adjust Column Widths to Contents</source> - <translation>Підігнати ширину Ñтовпців до зміÑту</translation> + <translation type="vanished">Підігнати ширину Ñтовпців до зміÑту</translation> </message> <message> <source>Edit Breakpoint...</source> @@ -31294,11 +32294,19 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s </message> <message> <source>Debugger '%1' not found.</source> - <translation>Зневаджувач '%1' не знайдено.</translation> + <translation type="vanished">Зневаджувач '%1' не знайдено.</translation> </message> <message> <source>Debugger '%1' not executable.</source> - <translation>Зневаджувач '%1' не Ñ” виконуваним модулем.</translation> + <translation type="vanished">Зневаджувач '%1' не Ñ” виконуваним модулем.</translation> + </message> + <message> + <source>Debugger "%1" not found.</source> + <translation>Зневаджувач "%1" не знайдено.</translation> + </message> + <message> + <source>Debugger "%1" not executable.</source> + <translation>Зневаджувач "%1" не Ñ” виконуваним модулем.</translation> </message> <message> <source>The debugger location must be given as an absolute path (%1).</source> @@ -31345,7 +32353,7 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s <name>DebuggerPlugin</name> <message> <source>Unable to create a debugger engine of the type '%1'</source> - <translation>Ðеможливо Ñтворити рушій Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¿Ñƒ '%1'</translation> + <translation type="vanished">Ðеможливо Ñтворити рушій Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¿Ñƒ '%1'</translation> </message> <message> <source>Install &Debug Information</source> @@ -31355,6 +32363,10 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s <source>Tries to install missing debug information.</source> <translation>Спробувати вÑтановити відÑутню зневаджувальну інформацію.</translation> </message> + <message> + <source>Unable to create a debugger engine of the type "%1"</source> + <translation>Ðеможливо Ñтворити рушій Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¿Ñƒ "%1"</translation> + </message> </context> <context> <name>Debugger::Internal::GdbAbstractPlainEngine</name> @@ -31733,20 +32745,20 @@ Stepping into the module or setting breakpoints by file and is expected to work. <name>Debugger::Internal::QmlAdapter</name> <message> <source>Connecting to debug server %1:%2</source> - <translation>ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ñервера Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ð° %1: %2</translation> + <translation type="vanished">ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ñервера Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ð° %1: %2</translation> </message> <message> <source>Error: (%1) %2</source> <comment>%1=error code, %2=error message</comment> - <translation>Помилка: (%1) %2</translation> + <translation type="vanished">Помилка: (%1) %2</translation> </message> <message> <source>Disconnected.</source> - <translation>Відключено.</translation> + <translation type="vanished">Відключено.</translation> </message> <message> <source>Connected.</source> - <translation>Підключено.</translation> + <translation type="vanished">Підключено.</translation> </message> <message> <source>Disconnected. @@ -31758,11 +32770,11 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Resolving host.</source> - <translation>Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ–Ð¼ÐµÐ½Ñ– вузла.</translation> + <translation type="vanished">Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ–Ð¼ÐµÐ½Ñ– вузла.</translation> </message> <message> <source>Connecting to debug server.</source> - <translation>ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ñервера зневадженнÑ.</translation> + <translation type="vanished">ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ñервера зневадженнÑ.</translation> </message> <message> <source>Connected. @@ -31772,7 +32784,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Closing.</source> - <translation>ЗакриттÑ.</translation> + <translation type="vanished">ЗакриттÑ.</translation> </message> <message> <source>Error: (%1) %2</source> @@ -32030,10 +33042,38 @@ Stepping into the module or setting breakpoints by file and is expected to work. <translation>Видалити обчиÑлюваний вираз Ð´Ð»Ñ "%1"</translation> </message> <message> + <source>Add Data Breakpoint at Pointer's Address</source> + <translation>Додати точку перепину за даними за адреÑою вказівника</translation> + </message> + <message> + <source>Add New Expression Evaluator...</source> + <translation>Додати новий обчиÑлюваний вираз...</translation> + </message> + <message> <source>Change Local Display Format...</source> <translation>Змінити локальний формат відображеннÑ...</translation> </message> <message> + <source>Copy View Contents to Clipboard</source> + <translation>Скопіювати зміÑÑ‚ переглÑду до буферу обміну</translation> + </message> + <message> + <source>Open View Contents in Editor</source> + <translation>Відкрити зміÑÑ‚ переглÑду в редакторі</translation> + </message> + <message> + <source>New Evaluated Expression</source> + <translation>Ðовий обчиÑлюваний вираз</translation> + </message> + <message> + <source>Enter an expression to evaluate.</source> + <translation>Введіть вираз Ð´Ð»Ñ Ð¾Ð±Ñ‡Ð¸ÑленнÑ.</translation> + </message> + <message> + <source>Note: Evaluators will be re-evaluated after each step. For details check the <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">documentation</a>.</source> + <translation>Примітка: Вирази будуть обчиÑлювати піÑÐ»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ кроку. ЗвернітьÑÑ Ð´Ð¾ <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">документації</a> за деталÑми.</translation> + </message> + <message> <source>Treat All Characters as Printable</source> <translation>Вважати уÑÑ– Ñимволи друкованими</translation> </message> @@ -32071,7 +33111,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Change Display for Type or Item...</source> - <translation>Змінити Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñƒ чи елемента...</translation> + <translation type="vanished">Змінити Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñƒ чи елемента...</translation> </message> <message> <source>Add Data Breakpoint...</source> @@ -32127,7 +33167,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Insert New Expression Evaluator</source> - <translation>Ð’Ñтавити новий обчиÑлюваний вираз</translation> + <translation type="vanished">Ð’Ñтавити новий обчиÑлюваний вираз</translation> </message> <message> <source>Select Widget to Add into Expression Evaluator</source> @@ -32135,7 +33175,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Remove All Expression Evaluators</source> - <translation>Видалити уÑÑ– обчиÑлювані вирази</translation> + <translation type="vanished">Видалити уÑÑ– обчиÑлювані вирази</translation> </message> <message> <source>Open Memory Editor...</source> @@ -32163,7 +33203,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Copy Contents to Clipboard</source> - <translation>Скопіювати зміÑÑ‚ до буферу обміну</translation> + <translation type="vanished">Скопіювати зміÑÑ‚ до буферу обміну</translation> </message> <message> <source>Copy Value to Clipboard</source> @@ -32171,7 +33211,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Show View Contents in Editor</source> - <translation>Показати зміÑÑ‚ виду в редакторі</translation> + <translation type="vanished">Показати зміÑÑ‚ виду в редакторі</translation> </message> <message> <source>Close Editor Tooltips</source> @@ -32179,11 +33219,11 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Enter Expression for Evaluator</source> - <translation>Введіть вираз Ð´Ð»Ñ Ð¾Ð±Ñ‡Ð¸ÑленнÑ</translation> + <translation type="vanished">Введіть вираз Ð´Ð»Ñ Ð¾Ð±Ñ‡Ð¸ÑленнÑ</translation> </message> <message> <source>Expression:</source> - <translation>Вираз:</translation> + <translation type="vanished">Вираз:</translation> </message> <message> <source>Locals & Expressions</source> @@ -32210,7 +33250,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>Change #, SHA-1, tr:id, owner:email or reviewer:email</source> - <translation type="unfinished"></translation> + <translation># зміни, SHA-1, tr:id, влаÑник:email або рецензент:email</translation> </message> <message> <source>Details</source> @@ -32222,15 +33262,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. </message> <message> <source>&Show...</source> - <translation>&Показати...</translation> - </message> - <message> - <source>Cherry &Pick...</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Checkout...</source> - <translation type="unfinished"></translation> + <translation type="vanished">&Показати...</translation> </message> <message> <source>&Show</source> @@ -32253,7 +33285,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. <name>Gerrit::Internal::GerritModel</name> <message> <source><html><head/><body><table><tr><td>Subject</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>Owner</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Project</td><td>%5 (%6)</td></tr><tr><td>Status</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html></source> - <translation><html><head/><body><table><tr><td>Тема</td><td>%1</td></tr><tr><td>Ðомер</td><td><a href="%11">%2</a></td></tr><tr><td>ВлаÑник</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Проект</td><td>%5 (%6)</td></tr><tr><td>СтатуÑ</td><td>%7, %8</td></tr><tr><td>Ðабір латок</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html></translation> + <translation type="vanished"><html><head/><body><table><tr><td>Тема</td><td>%1</td></tr><tr><td>Ðомер</td><td><a href="%11">%2</a></td></tr><tr><td>ВлаÑник</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Проект</td><td>%5 (%6)</td></tr><tr><td>СтатуÑ</td><td>%7, %8</td></tr><tr><td>Ðабір латок</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html></translation> </message> <message> <source>Subject</source> @@ -32280,23 +33312,59 @@ Stepping into the module or setting breakpoints by file and is expected to work. <translation>СтатуÑ</translation> </message> <message> + <source>Number</source> + <translation>Ðомер</translation> + </message> + <message> + <source>Patch set</source> + <translation>Ðабір латок</translation> + </message> + <message> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <source>Depends on</source> + <translation>Залежить від</translation> + </message> + <message> + <source>Needed by</source> + <translation>Потрібна длÑ</translation> + </message> + <message> + <source>Parse error: "%1" -> %2</source> + <translation>Помилка розбору: "%1" -> %2</translation> + </message> + <message> + <source>Parse error: "%1"</source> + <translation>Помилка розбору: "%1"</translation> + </message> + <message> + <source>Parse error in line "%1"</source> + <translation>Помилка розбору в Ñ€Ñдку "%1"</translation> + </message> + <message> <source>Parse error: '%1' -> %2</source> - <translation>Помилка розбору: '%1' -> %2</translation> + <translation type="vanished">Помилка розбору: '%1' -> %2</translation> </message> <message> <source>Parse error: '%1'</source> - <translation>Помилка розбору: '%1'</translation> + <translation type="vanished">Помилка розбору: '%1'</translation> </message> <message> <source>Parse error in line '%1'</source> - <translation>Помилка розбору в Ñ€Ñдку'%1'</translation> + <translation type="vanished">Помилка розбору в Ñ€Ñдку'%1'</translation> </message> </context> <context> <name>Gerrit::Internal::QueryContext</name> <message> <source>Gerrit</source> - <translation>Gerrit</translation> + <translation type="vanished">Gerrit</translation> + </message> + <message> + <source>Querying Gerrit</source> + <translation type="unfinished"></translation> </message> <message> <source>Error running %1: %2</source> @@ -32344,7 +33412,7 @@ Would you like to terminate it?</source> </message> <message> <source>Always prompt for repository folder</source> - <translation>Завжди запитувати про теку Ñховища</translation> + <translation type="vanished">Завжди запитувати про теку Ñховища</translation> </message> <message> <source>&Host:</source> @@ -32360,20 +33428,11 @@ Would you like to terminate it?</source> </message> <message> <source>&Repository:</source> - <translation>&Сховище:</translation> - </message> - <message> - <source>Default repository where patches will be applied.</source> - <translation type="unfinished"></translation> + <translation type="vanished">&Сховище:</translation> </message> <message> <source>Pr&ompt:</source> - <translation>&Запит:</translation> - </message> - <message> - <source>If checked, user will always be -asked to confirm the repository path.</source> - <translation type="unfinished"></translation> + <translation type="vanished">&Запит:</translation> </message> <message> <source>&Port:</source> @@ -32387,14 +33446,20 @@ asked to confirm the repository path.</source> <source>Determines the protocol used to form a URL in case "canonicalWebUrl" is not configured in the file "gerrit.config".</source> - <translation type="unfinished"></translation> + <translation>Визначає протокол, що буде викориÑтовуватиÑÑŒ +Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ URL у випадку, Ñкщо "canonicalWebUrl" +не налаштовано в файлі"gerrit.config".</translation> </message> </context> <context> <name>Gerrit::Internal::FetchContext</name> <message> <source>Gerrit Fetch</source> - <translation>Отримати з Gerrit</translation> + <translation type="vanished">Отримати з Gerrit</translation> + </message> + <message> + <source>Fetching from Gerrit</source> + <translation>ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð· Gerrit</translation> </message> <message> <source>%1 crashed.</source> @@ -32425,7 +33490,7 @@ asked to confirm the repository path.</source> </message> <message> <source>Failed to initialize dialog. Aborting.</source> - <translation type="unfinished"></translation> + <translation>Збій ініціалізації діалового вікна. Ðварійне припиненнÑ.</translation> </message> <message> <source>Error</source> @@ -32451,8 +33516,12 @@ were not verified among remotes in %3. Select different folder?</source> <translation type="unfinished"></translation> </message> <message> + <source>Enter Local Repository for "%1" (%2)</source> + <translation>Введіть локальне Ñховище Ð´Ð»Ñ "%1" (%2)</translation> + </message> + <message> <source>Enter Local Repository for '%1' (%2)</source> - <translation>Введіть локальне Ñховище Ð´Ð»Ñ '%1' (%2)</translation> + <translation type="vanished">Введіть локальне Ñховище Ð´Ð»Ñ '%1' (%2)</translation> </message> </context> <context> @@ -32463,7 +33532,7 @@ were not verified among remotes in %3. Select different folder?</source> </message> <message> <source>Select Change</source> - <translation type="unfinished"></translation> + <translation>Оберіть зміну</translation> </message> <message> <source>&Commit only</source> @@ -32989,6 +34058,14 @@ Remote stderr was: %1</source> <translation>Ðазва комплекту та піктограма.</translation> </message> <message> + <source><html><head/><body><p>The name of the kit suitable for generating directory names. This value is used for the variable <i>%1</i>, which for example determines the name of the shadow build directory.</p></body></html></source> + <translation><html><head/><body><p>Ðазва комплекту придатна Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð² тек. Це Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтовуєтьÑÑ Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— <i>%1</i>, Ñка визначає, наприклад, назву тіньової теки збірки.</p></body></html></translation> + </message> + <message> + <source>File system name:</source> + <translation>Ðазва на диÑку:</translation> + </message> + <message> <source>Mark as Mutable</source> <translation>Позначити Ñк змінний</translation> </message> @@ -33111,11 +34188,15 @@ Do you want to retry?</source> <translation type="unfinished"></translation> </message> <message> - <source>QML Profiler: Connecting to %1:%2 ...</source> + <source>Debug connection opened</source> <translation type="unfinished"></translation> </message> <message> - <source>QML Profiler: connected and running</source> + <source>Debug connection closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Failed to connect!</source> <translation type="unfinished"></translation> </message> </context> @@ -33183,26 +34264,6 @@ Do you want to retry?</source> <context> <name>QmlProfiler::Internal::QmlProfilerTraceView</name> <message> - <source>Jump to previous event.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Jump to next event.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Show zoom slider.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Select range.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>View event information on mouseover.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Limit Events Pane to Current Range</source> <translation type="unfinished"></translation> </message> @@ -33263,7 +34324,7 @@ Do you want to retry?</source> <translation type="unfinished"></translation> </message> <message> - <source>The device runtime version(%1) does not match the API level version(%2). + <source>The device runtime version (%1) does not match the API level version (%2). This may cause unexpected behavior when debugging. Do you want to continue anyway?</source> <translation type="unfinished"></translation> @@ -33293,7 +34354,7 @@ Do you want to continue anyway?</source> <translation type="unfinished"></translation> </message> <message> - <source>Internal error: Cannot create temporary manifest file '%1'</source> + <source>Internal error: Cannot create temporary manifest file "%1"</source> <translation type="unfinished"></translation> </message> <message> @@ -33308,7 +34369,7 @@ Do you want to continue anyway?</source> <translation type="unfinished"></translation> </message> <message> - <source>Could not find packager command '%1' in the build environment.</source> + <source>Could not find packager command "%1" in the build environment.</source> <translation type="unfinished"></translation> </message> <message> @@ -33324,23 +34385,41 @@ Do you want to continue anyway?</source> <translation type="unfinished"></translation> </message> <message> - <source>Could not create build directory '%1'.</source> + <source>Could not create build directory "%1".</source> <translation type="unfinished"></translation> </message> <message> - <source>Missing passwords for signing packages.</source> + <source>In order to link to the correct Qt library specified in the deployment settings Qt Creator needs to update the Qt environment variables in the BAR application file as follows: + +<env var="LD_LIBRARY_PATH" value="%1"/> +<env var="QT_PLUGIN_PATH" value="%2"/> +<env var="QML_IMPORT_PATH" value="%3"/> +</source> <translation type="unfinished"></translation> </message> <message> - <source>Error preparing BAR application descriptor file.</source> + <source> +Do you want to update it?</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <source>Error opening BAR application descriptor file '%1' - %2</source> + <source>Error saving BAR application descriptor file "%1" - %2</source> <translation type="unfinished"></translation> </message> <message> - <source>Error saving prepared BAR application descriptor file '%1' - %2</source> + <source>Missing passwords for signing packages.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Error opening BAR application descriptor file "%1" - %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Error preparing BAR application descriptor file.</source> <translation type="unfinished"></translation> </message> </context> @@ -33432,31 +34511,6 @@ Do you want to continue anyway?</source> <source>Deploy to BlackBerry Device</source> <translation>Ð Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð° приÑтрій BlackBerry</translation> </message> - <message> - <source>Setup Application Descriptor File</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You need to set up a BAR descriptor file to enable packaging. -Do you want Qt Creator to generate it for your project (%1)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Do not ask again for this project</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Reading the BAR descriptor template failed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Writing the BAR descriptor file failed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cannot Set up Application Descriptor File</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>Qnx::Internal::BlackBerryDeployConfigurationFactory</name> @@ -33487,7 +34541,7 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation type="unfinished"></translation> </message> <message> - <source>Could not find deploy command '%1' in the build environment</source> + <source>Could not find deploy command "%1" in the build environment</source> <translation type="unfinished"></translation> </message> <message> @@ -33499,7 +34553,7 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <translation type="unfinished"></translation> </message> <message> - <source>Package '%1' does not exist. Create the package first.</source> + <source>Package "%1" does not exist. Create the package first.</source> <translation type="unfinished"></translation> </message> </context> @@ -33652,6 +34706,10 @@ Do you want Qt Creator to generate it for your project (%1)?</source> <source>QNX</source> <translation>QNX</translation> </message> + <message> + <source>Deploy Qt libraries...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Qnx::Internal::QnxDeviceConfigurationFactory</name> @@ -33882,8 +34940,16 @@ cannot be found in the path.</source> <translation>Віддалений Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> </message> <message> + <source>Unexpected output from remote process: "%1"</source> + <translation>Ðеочікуване Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ віддаленого процеÑу: "%1".</translation> + </message> + <message> + <source>Cannot check for free disk space: "%1" is not an absolute path.</source> + <translation>Ðеможливо перевірити вільний диÑковий проÑÑ‚Ñ–Ñ€: "%1" не Ñ” абÑолютним шлÑхом.</translation> + </message> + <message> <source>Unexpected output from remote process: '%1'.</source> - <translation>Ðеочікуване Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ віддаленого процеÑу: '%1'.</translation> + <translation type="vanished">Ðеочікуване Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ віддаленого процеÑу: '%1'.</translation> </message> <message numerus="yes"> <source>The remote file system has only %n megabytes of free space, but %1 megabytes are required.</source> @@ -33903,7 +34969,7 @@ cannot be found in the path.</source> </message> <message> <source>Cannot check for free disk space: '%1' is not an absolute path.</source> - <translation>Ðеможливо перевірити вільний диÑковий проÑÑ‚Ñ–Ñ€: '%1' не Ñ” абÑолютним шлÑхом.</translation> + <translation type="vanished">Ðеможливо перевірити вільний диÑковий проÑÑ‚Ñ–Ñ€: '%1' не Ñ” абÑолютним шлÑхом.</translation> </message> </context> <context> @@ -34014,7 +35080,7 @@ cannot be found in the path.</source> </message> <message> <source>Cannot write file. Disk full?</source> - <translation>Ðеможливо запиÑати файл. ДиÑк заповнено?</translation> + <translation type="vanished">Ðеможливо запиÑати файл. ДиÑк заповнено?</translation> </message> </context> <context> @@ -34077,7 +35143,7 @@ cannot be found in the path.</source> </message> <message> <source>RadioButton</source> - <translation type="unfinished"></translation> + <translation>Перемикач</translation> </message> <message> <source>Discard Local Changes</source> @@ -34093,7 +35159,7 @@ cannot be found in the path.</source> </message> <message> <source>Move Local Changes to "%1"</source> - <translation type="unfinished"></translation> + <translation>ПереÑунути локальні зміни до "%1"</translation> </message> <message> <source>Pop Stash of "%1"</source> @@ -34347,11 +35413,7 @@ cannot be found in the path.</source> </message> <message> <source>Tool tip</source> - <translation>Підказка</translation> - </message> - <message> - <source>The tool tip shown for the combobox.</source> - <translation type="unfinished"></translation> + <translation type="vanished">Підказка</translation> </message> <message> <source>Focus on press</source> @@ -34495,14 +35557,6 @@ cannot be found in the path.</source> <translation type="unfinished"></translation> </message> <message> - <source>Password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Determines whether the text field is in password mode.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Input mask</source> <translation type="unfinished"></translation> </message> @@ -34640,7 +35694,7 @@ cannot be found in the path.</source> <translation type="unfinished"></translation> </message> <message> - <source>The file '%1' will be overwritten. Do you want to proceed?</source> + <source>The file "%1" will be overwritten. Do you want to proceed?</source> <translation type="unfinished"></translation> </message> <message> @@ -34719,7 +35773,7 @@ cannot be found in the path.</source> <translation type="unfinished"></translation> </message> <message> - <source>The file '%1' will be overwritten. Do you want to proceed?</source> + <source>The file "%1" will be overwritten. Do you want to proceed?</source> <translation type="unfinished"></translation> </message> <message> @@ -35188,7 +36242,7 @@ cannot be found in the path.</source> </message> <message> <source>Check a&ll</source> - <translation>&Позначити вÑе</translation> + <translation type="vanished">&Позначити вÑе</translation> </message> <message numerus="yes"> <source>%1 %2/%n File(s)</source> @@ -35203,14 +36257,28 @@ cannot be found in the path.</source> <translation type="unfinished"></translation> </message> <message> + <source>Select All</source> + <extracomment>Check all for submit</extracomment> + <translation>Виділити вÑе</translation> + </message> + <message> + <source>Unselect All</source> + <extracomment>Uncheck all for submit</extracomment> + <translation type="unfinished"></translation> + </message> + <message> <source>Check All</source> <extracomment>Check all for submit</extracomment> - <translation>Позначити вÑе</translation> + <translation type="vanished">Позначити вÑе</translation> </message> <message> <source>Uncheck All</source> <extracomment>Uncheck all for submit</extracomment> - <translation>ЗнÑти позначки з уÑÑ–Ñ…</translation> + <translation type="vanished">ЗнÑти позначки з уÑÑ–Ñ…</translation> + </message> + <message> + <source>Select a&ll</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -35260,10 +36328,6 @@ cannot be found in the path.</source> <context> <name>QmlJS::StaticAnalysisMessages</name> <message> - <source>Do not use '%1' as a constructor.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Invalid value for enum.</source> <translation type="unfinished"></translation> </message> @@ -35316,159 +36380,163 @@ cannot be found in the path.</source> <translation type="unfinished"></translation> </message> <message> - <source>Invalid property name '%1'.</source> + <source>Assignment in condition.</source> <translation type="unfinished"></translation> </message> <message> - <source>'%1' does not have members.</source> + <source>Unterminated non-empty case block.</source> <translation type="unfinished"></translation> </message> <message> - <source>'%1' is not a member of '%2'.</source> + <source>Do not use 'eval'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Assignment in condition.</source> + <source>Unreachable.</source> <translation type="unfinished"></translation> </message> <message> - <source>Unterminated non-empty case block.</source> + <source>Do not use 'with'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Do not use 'eval'.</source> + <source>Do not use comma expressions.</source> <translation type="unfinished"></translation> </message> <message> - <source>Unreachable.</source> + <source>Unnecessary message suppression.</source> <translation type="unfinished"></translation> </message> <message> - <source>Do not use 'with'.</source> + <source>The 'function' keyword and the opening parenthesis should be separated by a single space.</source> <translation type="unfinished"></translation> </message> <message> - <source>Do not use comma expressions.</source> + <source>Do not use stand-alone blocks.</source> <translation type="unfinished"></translation> </message> <message> - <source>'%1' already is a formal parameter.</source> + <source>Do not use void expressions.</source> <translation type="unfinished"></translation> </message> <message> - <source>Unnecessary message suppression.</source> + <source>Confusing pluses.</source> <translation type="unfinished"></translation> </message> <message> - <source>'%1' already is a function.</source> + <source>Confusing minuses.</source> <translation type="unfinished"></translation> </message> <message> - <source>var '%1' is used before its declaration.</source> + <source>Declare all function vars on a single line.</source> <translation type="unfinished"></translation> </message> <message> - <source>'%1' already is a var.</source> + <source>Unnecessary parentheses.</source> <translation type="unfinished"></translation> </message> <message> - <source>'%1' is declared more than once.</source> + <source>== and != may perform type coercion, use === or !== to avoid it.</source> <translation type="unfinished"></translation> </message> <message> - <source>Function '%1' is used before its declaration.</source> + <source>Expression statements should be assignments, calls or delete expressions only.</source> <translation type="unfinished"></translation> </message> <message> - <source>The 'function' keyword and the opening parenthesis should be separated by a single space.</source> + <source>Place var declarations at the start of a function.</source> <translation type="unfinished"></translation> </message> <message> - <source>Do not use stand-alone blocks.</source> + <source>Use only one statement per line.</source> <translation type="unfinished"></translation> </message> <message> - <source>Do not use void expressions.</source> + <source>Unknown component.</source> <translation type="unfinished"></translation> </message> <message> - <source>Confusing pluses.</source> + <source>== and != perform type coercion, use === or !== to avoid it.</source> <translation type="unfinished"></translation> </message> <message> - <source>Confusing minuses.</source> + <source>Calls of functions that start with an uppercase letter should use 'new'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Declare all function vars on a single line.</source> + <source>Use 'new' only with functions that start with an uppercase letter.</source> <translation type="unfinished"></translation> </message> <message> - <source>Unnecessary parentheses.</source> + <source>Use spaces around binary operators.</source> <translation type="unfinished"></translation> </message> <message> - <source>== and != may perform type coercion, use === or !== to avoid it.</source> + <source>Unintentional empty block, use ({}) for empty object literal.</source> <translation type="unfinished"></translation> </message> <message> - <source>Expression statements should be assignments, calls or delete expressions only.</source> + <source>Use %1 instead of 'var' or 'variant' to improve performance.</source> <translation type="unfinished"></translation> </message> <message> - <source>Place var declarations at the start of a function.</source> + <source>Do not use "%1" as a constructor.</source> <translation type="unfinished"></translation> </message> <message> - <source>Use only one statement per line.</source> + <source>Invalid property name "%1".</source> <translation type="unfinished"></translation> </message> <message> - <source>Unknown component.</source> + <source>"%1" does not have members.</source> <translation type="unfinished"></translation> </message> <message> - <source>Could not resolve the prototype '%1' of '%2'.</source> + <source>"%1" is not a member of "%2".</source> <translation type="unfinished"></translation> </message> <message> - <source>Could not resolve the prototype '%1'.</source> + <source>"%1" already is a formal parameter.</source> <translation type="unfinished"></translation> </message> <message> - <source>Prototype cycle, the last non-repeated component is '%1'.</source> + <source>"%1" already is a function.</source> <translation type="unfinished"></translation> </message> <message> - <source>Invalid property type '%1'.</source> + <source>var "%1" is used before its declaration.</source> <translation type="unfinished"></translation> </message> <message> - <source>== and != perform type coercion, use === or !== to avoid it.</source> + <source>"%1" already is a var.</source> <translation type="unfinished"></translation> </message> <message> - <source>Calls of functions that start with an uppercase letter should use 'new'.</source> + <source>"%1" is declared more than once.</source> <translation type="unfinished"></translation> </message> <message> - <source>Use 'new' only with functions that start with an uppercase letter.</source> + <source>Function "%1" is used before its declaration.</source> <translation type="unfinished"></translation> </message> <message> - <source>Use spaces around binary operators.</source> + <source>Could not resolve the prototype "%1" of "%2".</source> <translation type="unfinished"></translation> </message> <message> - <source>Unintentional empty block, use ({}) for empty object literal.</source> + <source>Could not resolve the prototype "%1".</source> <translation type="unfinished"></translation> </message> <message> - <source>Use %1 instead of 'var' or 'variant' to improve performance.</source> + <source>Prototype cycle, the last non-repeated component is "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Invalid property type "%1".</source> <translation type="unfinished"></translation> </message> <message> - <source>Missing property '%1'.</source> + <source>Missing property "%1".</source> <translation type="unfinished"></translation> </message> <message> @@ -35582,12 +36650,20 @@ cannot be found in the path.</source> <name>Bookmarks::Internal::BookmarkManager</name> <message> <source>Edit Note</source> - <translation>Редагувати примітку</translation> + <translation type="vanished">Редагувати примітку</translation> + </message> + <message> + <source>Edit Bookmark</source> + <translation>Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸</translation> </message> <message> <source>Note text:</source> <translation>ТекÑÑ‚ примітки:</translation> </message> + <message> + <source>Line number:</source> + <translation>Ðомер Ñ€Ñдка:</translation> + </message> </context> <context> <name>CMakeProjectManager::Internal::GeneratorInfo</name> @@ -35642,7 +36718,11 @@ cannot be found in the path.</source> <name>CppTools::Internal::BuiltinIndexingSupport</name> <message> <source>Parsing</source> - <translation>Розбір</translation> + <translation type="vanished">Розбір</translation> + </message> + <message> + <source>Parsing C/C++ Files</source> + <translation>Розбір файлів C/C++</translation> </message> </context> <context> @@ -35728,6 +36808,14 @@ cannot be found in the path.</source> <translation>Показувати Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ запуÑку зневаджувача з виконуваним модулем без зневаджувальної інформації.</translation> </message> <message> + <source>Keep editor stationary when stepping</source> + <translation>ЗафікÑувати редактор під Ñ‡Ð°Ñ ÐºÑ€Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ</translation> + </message> + <message> + <source>Scrolls the editor only when it is necessary to keep the current line in view, instead of keeping the next statement centered at all times.</source> + <translation>Ðе тримати наÑтупний вираз завжди поÑередині, а прокручувати код в редакторі лише тоді, коли поточна Ð»Ñ–Ð½Ñ–Ñ Ð²Ð¸Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒ за екран.</translation> + </message> + <message> <source>Show QML object tree in Locals & Expressions when connected and not stepping.</source> <translation type="vanished">Показувати дерево об'єктів QML у виді "Локальні змінні та вирази", коли підключені Ñ– не здійÑнюємо покрокове зневадженнÑ.</translation> </message> @@ -35770,7 +36858,7 @@ cannot be found in the path.</source> </message> <message> <source>Maximum string length:</source> - <translation>МакÑимальна довжина Ñ€Ñдка:</translation> + <translation type="vanished">МакÑимальна довжина Ñ€Ñдка:</translation> </message> </context> <context> @@ -35819,7 +36907,6 @@ cannot be found in the path.</source> </message> <message> <source>Diff "%1", "%2"</source> - <extracomment>Editor title</extracomment> <translation>ПорівнÑÐ½Ð½Ñ "%1" з "%2"</translation> </message> </context> @@ -35850,7 +36937,7 @@ cannot be found in the path.</source> </message> <message> <source>Normal</source> - <translation type="unfinished"></translation> + <translation>Звичайний</translation> </message> <message> <source>Submodule</source> @@ -35858,7 +36945,7 @@ cannot be found in the path.</source> </message> <message> <source>Deleted</source> - <translation>Видалено</translation> + <translation>Видалений</translation> </message> <message> <source>Symbolic link</source> @@ -35866,11 +36953,11 @@ cannot be found in the path.</source> </message> <message> <source>Modified</source> - <translation>Змінено</translation> + <translation>Змінений</translation> </message> <message> <source>Created</source> - <translation type="unfinished"></translation> + <translation>Створений</translation> </message> <message> <source>Submodule commit %1</source> @@ -35878,21 +36965,23 @@ cannot be found in the path.</source> </message> <message> <source>Symbolic link -> %1</source> - <translation type="unfinished"></translation> + <translation>Cимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ > %1</translation> </message> <message> <source>Merge Conflict</source> - <translation type="unfinished"></translation> + <translation>Конфлікт злиттÑ</translation> </message> <message> - <source>%1 merge conflict for '%2' + <source>%1 merge conflict for "%2" Local: %3 Remote: %4</source> - <translation type="unfinished"></translation> + <translation>%1: конфлікт Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð² "%2" +Локальний: %3 +Зовнішній: %4</translation> </message> <message> <source>&Local</source> - <translation type="unfinished"></translation> + <translation>&Локальний</translation> </message> <message> <source>&Remote</source> @@ -35900,31 +36989,31 @@ Remote: %4</source> </message> <message> <source>&Created</source> - <translation type="unfinished"></translation> + <translation>&Створений</translation> </message> <message> <source>&Modified</source> - <translation type="unfinished"></translation> + <translation>&Змінений</translation> </message> <message> <source>&Deleted</source> - <translation type="unfinished"></translation> + <translation>&Видалений</translation> </message> <message> <source>Continue Merging</source> - <translation type="unfinished"></translation> + <translation>ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ</translation> </message> <message> <source>Continue merging other unresolved paths?</source> - <translation type="unfinished"></translation> + <translation>Продовжити Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ–Ð½ÑˆÐ¸Ñ… нерозв'Ñзаних Ñтежок?</translation> </message> <message> <source>Merge tool process finished successfully.</source> - <translation type="unfinished"></translation> + <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ Ñ–Ð½Ñтрументу Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ ÑƒÑпішно.</translation> </message> <message> <source>Merge tool process terminated with exit code %1</source> - <translation type="unfinished"></translation> + <translation>ÐŸÑ€Ð¾Ñ†ÐµÑ Ñ–Ð½Ñтрументу Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð· кодом %1</translation> </message> </context> <context> @@ -36122,7 +37211,11 @@ Remote: %4</source> <name>QbsProjectManager::Internal::QbsProject</name> <message> <source>Evaluating</source> - <translation>Оцінка</translation> + <translation type="vanished">Оцінка</translation> + </message> + <message> + <source>Reading Project "%1"</source> + <translation>Ð§Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1"</translation> </message> </context> <context> @@ -36208,7 +37301,7 @@ Remote: %4</source> </message> <message> <source>Cut</source> - <translation type="unfinished"></translation> + <translation>Вирізати</translation> </message> <message> <source>Copy</source> @@ -36318,6 +37411,10 @@ Remote: %4</source> <source>Select parent: %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>Step into: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QmlDesigner::Internal::DebugView</name> @@ -36549,10 +37646,6 @@ Remote: %4</source> <source>Unsupported QtQuick version</source> <translation>Ðепідтримувана верÑÑ–Ñ QtQuick</translation> </message> - <message> - <source>This .qml file contains features which are not supported by Qt Quick Designer</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>QmlDesigner::QmlDesignerPlugin</name> @@ -36612,7 +37705,7 @@ Remote: %4</source> <translation>Виділити вÑе "%1"</translation> </message> <message> - <source>Toggle Full Screen</source> + <source>Toggle Sidebars</source> <translation type="unfinished"></translation> </message> <message> @@ -36735,7 +37828,7 @@ Remote: %4</source> </message> <message> <source>Component Set</source> - <translation>Ðабір компонентів</translation> + <translation type="vanished">Ðабір компонентів</translation> </message> </context> <context> @@ -36976,18 +38069,22 @@ Remote: %4</source> <name>QtSupport::QtVersionFactory</name> <message> <source>No factory found for qmake: '%1'</source> - <translation>Ðе знайдено фабрику Ð´Ð»Ñ qmake: '%1'</translation> + <translation type="vanished">Ðе знайдено фабрику Ð´Ð»Ñ qmake: '%1'</translation> + </message> + <message> + <source>No factory found for qmake: "%1"</source> + <translation>Ðе знайдено фабрику Ð´Ð»Ñ qmake: "%1"</translation> </message> </context> <context> <name>RemoteLinux::RemoteLinuxDeploymentDataModel</name> <message> <source>Local File Path</source> - <translation>Локальний шлÑÑ… до файлу</translation> + <translation type="vanished">Локальний шлÑÑ… до файлу</translation> </message> <message> <source>Remote Directory</source> - <translation>Віддалена тека</translation> + <translation type="vanished">Віддалена тека</translation> </message> </context> <context> @@ -37377,7 +38474,7 @@ Partial names can be used if they are unambiguous.</source> <translation type="unfinished"></translation> </message> <message> - <source><font color="red">Could not open '%1' for reading.</font></source> + <source><font color="red">Could not open "%1" for reading.</font></source> <translation type="unfinished"></translation> </message> <message> @@ -37679,12 +38776,20 @@ Partial names can be used if they are unambiguous.</source> <translation>API %1: %2</translation> </message> <message> + <source>Could not parse file: "%1".</source> + <translation>Ðе вдалоÑÑŒ розібрати файл: "%1".</translation> + </message> + <message> + <source>%2: Could not parse file: "%1".</source> + <translation>%2: Ðе вдалоÑÑŒ розібрати файл: "%1".</translation> + </message> + <message> <source>Could not parse file: '%1'.</source> - <translation>Ðе вдалоÑÑŒ розібрати файл: '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ розібрати файл: '%1'.</translation> </message> <message> <source>%2: Could not parse file: '%1'.</source> - <translation>%2: Ðе вдалоÑÑŒ розібрати файл: '%1'.</translation> + <translation type="vanished">%2: Ðе вдалоÑÑŒ розібрати файл: '%1'.</translation> </message> <message> <source>Select low dpi icon</source> @@ -38126,11 +39231,11 @@ Partial names can be used if they are unambiguous.</source> <name>Git::Internal::GitDiffHandler</name> <message> <source>Working tree</source> - <translation>Робоче дерево</translation> + <translation type="vanished">Робоче дерево</translation> </message> <message> <source>Index</source> - <translation>Покажчик</translation> + <translation type="vanished">Покажчик</translation> </message> <message> <source>Waiting for data...</source> @@ -38156,7 +39261,7 @@ Partial names can be used if they are unambiguous.</source> </message> <message> <source>Select change:</source> - <translation type="unfinished"></translation> + <translation>Оберіть зміну:</translation> </message> <message> <source>Reset type:</source> @@ -38294,7 +39399,11 @@ Partial names can be used if they are unambiguous.</source> </message> <message> <source>Failed opening project '%1': Project is not a file.</source> - <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом.</translation> + <translation type="vanished">Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ '%1': Проект не Ñ” файлом.</translation> + </message> + <message> + <source>Failed opening project "%1": Project is not a file.</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ "%1": Проект не Ñ” файлом.</translation> </message> <message> <source>Failed to set up kit for Qbs: %1</source> @@ -38666,6 +39775,10 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <context> <name>DiffEditor::DiffEditor</name> <message> + <source>Could not parse patch file "%1". The contents is not of unified diff format.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Ignore Whitespace</source> <translation>Ігнорувати пропуÑки</translation> </message> @@ -38674,6 +39787,10 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <translation>КонтекÑтні Ñ€Ñдки:</translation> </message> <message> + <source>Reload Editor</source> + <translation>Перезавантажити редактор</translation> + </message> + <message> <source>Synchronize Horizontal Scroll Bars</source> <translation>Синхронізувати горизонтальні Ñмуги прокрутки</translation> </message> @@ -38697,6 +39814,14 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <source>Show Change Description</source> <translation>Показати Ð¾Ð¿Ð¸Ñ Ð·Ð¼Ñ–Ð½Ð¸</translation> </message> + <message> + <source>Switch to Side By Side Diff Editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Switch to Unified Diff Editor</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectExplorer::DeviceCheckBuildStep</name> @@ -38754,12 +39879,16 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> <message> <source>User name:</source> - <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача:</translation> + <translation type="vanished">Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача:</translation> </message> <message> <source>Password:</source> <translation>Пароль:</translation> </message> + <message> + <source>Username:</source> + <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача:</translation> + </message> </context> <context> <name>ShowEditor</name> @@ -39007,7 +40136,7 @@ The APK will not be usable on any other device.</source> </message> <message> <source>Uses the external Ministro application to download and maintain Qt libraries.</source> - <translation>ВикориÑтовувати зовнішню програму Ministro Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° підтримки бібліотек Qt.</translation> + <translation type="vanished">ВикориÑтовувати зовнішню програму Ministro Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° підтримки бібліотек Qt.</translation> </message> <message> <source>Pushes local Qt libraries to device. You must have Qt libraries compiled for that platform. @@ -39019,6 +40148,10 @@ The APK will not be usable on any other device.</source> <source>Add...</source> <translation>Додати...</translation> </message> + <message> + <source>Uses the external Ministro application to download and maintain Qt libraries.<br/><br/>Ministro is a third-party tool which provides the open source Qt libraries on demand. These libraries are compatible with the default open source binary package and will not always be up-to-date.</source> + <translation>ВикориÑтовувати зовнішню програму Ministro Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° підтримки бібліотек Qt.<br/><br/>Ministro Ñ” Ñтороннім заÑобом, що надає бібліотеки з відкритим кодом Qt на вимогу. Ці бібліотеки Ñ” ÑуміÑними з типовим двійковим пакунком (Ð´Ð»Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¾Ð³Ð¾ коду), однак не завжди оÑтанньої верÑÑ–Ñ—.</translation> + </message> </context> <context> <name>Android::Internal::AndroidDeviceDialog</name> @@ -39087,34 +40220,50 @@ The APK will not be usable on any other device.</source> <name>BareMetal::BareMetalDeviceConfigurationWidget</name> <message> <source>Form</source> - <translation>Форма</translation> + <translation type="vanished">Форма</translation> </message> <message> <source>GDB host:</source> - <translation>Вузол GDB:</translation> + <translation type="vanished">Вузол GDB:</translation> </message> <message> <source>GDB port:</source> - <translation>Порт GDB:</translation> + <translation type="vanished">Порт GDB:</translation> </message> <message> <source>GDB commands:</source> - <translation>Команди GDB:</translation> + <translation type="vanished">Команди GDB:</translation> </message> </context> <context> <name>BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage</name> <message> <source>Form</source> - <translation>Форма</translation> + <translation type="vanished">Форма</translation> + </message> + <message> + <source>Set up GDB Server or Hardware Debugger</source> + <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñервера GDB або апаратного зневаджувача</translation> </message> <message> <source>Name:</source> <translation>Ðазва:</translation> </message> <message> + <source>Init commands:</source> + <translation>Команди ініціалізації:</translation> + </message> + <message> + <source>Reset commands:</source> + <translation>Команди ÑкиданнÑ:</translation> + </message> + <message> + <source>Bare Metal Device</source> + <translation>Голий приÑтрій</translation> + </message> + <message> <source>localhost</source> - <translation>localhost</translation> + <translation type="vanished">localhost</translation> </message> <message> <source>GDB port:</source> @@ -39126,12 +40275,12 @@ The APK will not be usable on any other device.</source> </message> <message> <source>GDB commands:</source> - <translation>Команди GDB:</translation> + <translation type="vanished">Команди GDB:</translation> </message> <message> <source>load monitor reset</source> - <translation>load + <translation type="vanished">load monitor reset</translation> </message> </context> @@ -39228,11 +40377,11 @@ monitor reset</translation> </message> <message> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit preferences.</source> - <translation>Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> + <translation type="vanished">Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> </message> <message> <source>Configuration is faulty. Check the Issues output pane for details.</source> - <translation>ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> + <translation type="vanished">ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð±Ñ–Ð¹Ð½Ð°. Перевірте вид "Проблеми" Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÐµÐ¹.</translation> </message> </context> <context> @@ -39258,11 +40407,11 @@ monitor reset</translation> </message> <message> <source>iPhone 3.5-inch Retina display</source> - <translation>iPhone 3.5 дюйми з екраном Retina</translation> + <translation type="vanished">iPhone 3.5 дюйми з екраном Retina</translation> </message> <message> <source>iPhone 4-inch Retina display</source> - <translation>iPhone 4 дюйми з екраном Retina</translation> + <translation type="vanished">iPhone 4 дюйми з екраном Retina</translation> </message> <message> <source>iPad</source> @@ -39270,10 +40419,26 @@ monitor reset</translation> </message> <message> <source>iPad Retina display</source> - <translation>iPad з екраном Retina</translation> + <translation type="vanished">iPad з екраном Retina</translation> </message> <message> <source>Device Type:</source> + <translation type="vanished">Тип приÑтрою:</translation> + </message> + <message> + <source>iPhone 3.5-inch Retina Display</source> + <translation>iPhone 3.5 дюйми з екраном Retina</translation> + </message> + <message> + <source>iPhone 4-inch Retina Display</source> + <translation>iPhone 4 дюйми з екраном Retina</translation> + </message> + <message> + <source>iPad Retina Display</source> + <translation>iPad з екраном Retina</translation> + </message> + <message> + <source>Device type:</source> <translation>Тип приÑтрою:</translation> </message> </context> @@ -39597,6 +40762,10 @@ monitor reset</translation> <source>Project path:</source> <translation>ШлÑÑ… до проекту:</translation> </message> + <message> + <source>Momentics</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UpdateInfo::Internal::SettingsWidget</name> @@ -39715,6 +40884,10 @@ monitor reset</translation> <source>Alignment</source> <translation>ВирівнюваннÑ</translation> </message> + <message> + <source>Format</source> + <translation>Формат</translation> + </message> </context> <context> <name>AdvancedSection</name> @@ -40200,6 +41373,10 @@ monitor reset</translation> <name>Android::Internal::ChooseDirectoryPage</name> <message> <source>The Android package source directory can not be the same as the project directory.</source> + <translation type="vanished">Тека джерел пакунка Android не може збігатиÑÑŒ з текою проекту.</translation> + </message> + <message> + <source>The Android package source directory cannot be the same as the project directory.</source> <translation>Тека джерел пакунка Android не може збігатиÑÑŒ з текою проекту.</translation> </message> <message> @@ -40269,25 +41446,25 @@ The files in the Android package source directory are copied to the build direct <name>BareMetal::BareMetalDeviceConfigurationFactory</name> <message> <source>Bare Metal Device</source> - <translation>Голий приÑтрій</translation> + <translation type="vanished">Голий приÑтрій</translation> </message> </context> <context> <name>BareMetal::BareMetalDeviceConfigurationWizard</name> <message> <source>New Bare Metal Device Configuration Setup</source> - <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ— конфігурації голого приÑтрою</translation> + <translation type="vanished">ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ— конфігурації голого приÑтрою</translation> </message> </context> <context> <name>BareMetal::BareMetalDeviceConfigurationWizardSetupPage</name> <message> <source>Set up GDB Server or Hardware Debugger</source> - <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñервера GDB або апаратного зневаджувача</translation> + <translation type="vanished">ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñервера GDB або апаратного зневаджувача</translation> </message> <message> <source>Bare Metal Device</source> - <translation>Голий приÑтрій</translation> + <translation type="vanished">Голий приÑтрій</translation> </message> </context> <context> @@ -40301,19 +41478,19 @@ The files in the Android package source directory are copied to the build direct <name>BareMetal::BareMetalGdbCommandsDeployStep</name> <message> <source>GDB commands</source> - <translation>Команди GDB</translation> + <translation type="vanished">Команди GDB</translation> </message> </context> <context> <name>BareMetal::BareMetalRunConfiguration</name> <message> <source>%1 (via GDB server or hardware debugger)</source> - <translation>%1 (через Ñервер GDB або апаратний зневаджувач)</translation> + <translation type="vanished">%1 (через Ñервер GDB або апаратний зневаджувач)</translation> </message> <message> <source>Run on GDB server or hardware debugger</source> <extracomment>Bare Metal run configuration default run name</extracomment> - <translation>Виконати на Ñервері GDB або апаратному зневаджувачі</translation> + <translation type="vanished">Виконати на Ñервері GDB або апаратному зневаджувачі</translation> </message> </context> <context> @@ -40327,23 +41504,23 @@ The files in the Android package source directory are copied to the build direct <name>BareMetal::BareMetalRunConfigurationWidget</name> <message> <source>Executable:</source> - <translation>Виконуваний модуль:</translation> + <translation type="vanished">Виконуваний модуль:</translation> </message> <message> <source>Arguments:</source> - <translation>Ðргументи:</translation> + <translation type="vanished">Ðргументи:</translation> </message> <message> <source><default></source> - <translation><типово></translation> + <translation type="vanished"><типово></translation> </message> <message> <source>Working directory:</source> - <translation>Робоча тека:</translation> + <translation type="vanished">Робоча тека:</translation> </message> <message> <source>Unknown</source> - <translation>Ðевідомо</translation> + <translation type="vanished">Ðевідомо</translation> </message> </context> <context> @@ -40357,11 +41534,11 @@ The files in the Android package source directory are copied to the build direct <name>Core::DocumentModel</name> <message> <source><no document></source> - <translation><немає документа></translation> + <translation type="vanished"><немає документа></translation> </message> <message> <source>No document is selected.</source> - <translation>Документ не обрано.</translation> + <translation type="vanished">Документ не обрано.</translation> </message> </context> <context> @@ -40548,17 +41725,6 @@ The files in the Android package source directory are copied to the build direct </message> </context> <context> - <name>Git::Internal::GitDiffSwitcher</name> - <message> - <source>Switch to Text Diff Editor</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Switch to Side By Side Diff Editor</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>Ios::Internal::IosBuildStepConfigWidget</name> <message> <source>iOS build</source> @@ -40603,8 +41769,16 @@ The files in the Android package source directory are copied to the build direct <translation>Отримано неправильний ідентифікатор процеÑу.</translation> </message> <message> + <source>Run ended with error.</source> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑŒ з помилкою.</translation> + </message> + <message> + <source>Run ended.</source> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑŒ.</translation> + </message> + <message> <source>Run failed unexpectedly.</source> - <translation>ÐеÑподіваний збій запуÑку.</translation> + <translation type="vanished">ÐеÑподіваний збій запуÑку.</translation> </message> </context> <context> @@ -40647,6 +41821,10 @@ The files in the Android package source directory are copied to the build direct <source>The Info.plist might be incorrect.</source> <translation>Файл Info.plist може бути неправильним.</translation> </message> + <message> + <source>The provisioning profile "%1" (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Ios::Internal::IosDeployStepFactory</name> @@ -40659,7 +41837,7 @@ The files in the Android package source directory are copied to the build direct <name>Ios::Internal::IosDeployStepWidget</name> <message> <source><b>Deploy to %1</b></source> - <translation><b>Ð Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð° %1</b></translation> + <translation type="vanished"><b>Ð Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð° %1</b></translation> </message> </context> <context> @@ -40737,7 +41915,11 @@ The files in the Android package source directory are copied to the build direct </message> <message> <source>The .pro file '%1' is currently being parsed.</source> - <translation>ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro '%1'.</translation> + <translation type="vanished">ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro '%1'.</translation> + </message> + <message> + <source>The .pro file "%1" is currently being parsed.</source> + <translation>ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro "%1".</translation> </message> <message> <source>Kit has incorrect device type for running on iOS devices.</source> @@ -40786,8 +41968,16 @@ The files in the Android package source directory are copied to the build direct <translation>ЗапуÑк віддаленого процеÑу.</translation> </message> <message> + <source>Run ended with error.</source> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑŒ з помилкою.</translation> + </message> + <message> + <source>Run ended.</source> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑŒ.</translation> + </message> + <message> <source>Run ended unexpectedly.</source> - <translation>ЗапуÑк неÑподівано завершивÑÑ.</translation> + <translation type="vanished">ЗапуÑк неÑподівано завершивÑÑ.</translation> </message> </context> <context> @@ -41016,6 +42206,10 @@ Please close all running instances of your application before starting a build.< <translation>Вибір комплекту</translation> </message> <message> + <source>Kits</source> + <translation>Комплекти</translation> + </message> + <message> <source>Qt Creator can use the following kits for project <b>%1</b>:</source> <comment>%1: Project name</comment> <translation>Qt Creator може викориÑтовувати наÑтупні комплекти Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ <b>%1</b>:</translation> @@ -41090,6 +42284,10 @@ Please close all running instances of your application before starting a build.< <source>The source file name will be derived from the class name</source> <translation>Ðазва файлу з кодом буде походити від назви клаÑу</translation> </message> + <message> + <source>Details</source> + <translation>Деталі</translation> + </message> </context> <context> <name>PythonEditor::Internal::ClassWizardDialog</name> @@ -41099,14 +42297,18 @@ Please close all running instances of your application before starting a build.< </message> <message> <source>Details</source> - <translation>Деталі</translation> + <translation type="vanished">Деталі</translation> </message> </context> <context> <name>QmakeProjectManager::Internal::DesktopQmakeRunConfiguration</name> <message> <source>The .pro file '%1' is currently being parsed.</source> - <translation>ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro '%1'.</translation> + <translation type="vanished">ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro '%1'.</translation> + </message> + <message> + <source>The .pro file "%1" is currently being parsed.</source> + <translation>ЗдійÑнюєтьÑÑ Ñ€Ð¾Ð·Ð±Ñ–Ñ€ файлу .pro "%1".</translation> </message> <message> <source>Qt Run Configuration</source> @@ -41181,6 +42383,10 @@ Please close all running instances of your application before starting a build.< <source>Qt Quick component set:</source> <translation>Ðабір компонентів Qt Quick:</translation> </message> + <message> + <source>Component Set</source> + <translation>Ðабір компонентів</translation> + </message> </context> <context> <name>TabViewToolAction</name> @@ -41188,16 +42394,16 @@ Please close all running instances of your application before starting a build.< <source>Add Tab...</source> <translation>Додати вкладку...</translation> </message> -</context> -<context> - <name>QmlDesigner::TabViewDesignerAction</name> <message> - <source>Naming Error</source> + <source>Step into Tab</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>QmlDesigner::TabViewDesignerAction</name> <message> <source>Component already exists.</source> - <translation>Компонент вже Ñ–Ñнує.</translation> + <translation type="vanished">Компонент вже Ñ–Ñнує.</translation> </message> </context> <context> @@ -41280,34 +42486,42 @@ Please close all running instances of your application before starting a build.< <name>QmlProfiler::Internal::QmlProfilerEventsModelProxy</name> <message> <source><program></source> - <translation><програма></translation> + <translation type="vanished"><програма></translation> </message> <message> <source>Main Program</source> - <translation>ОÑновна програма</translation> + <translation type="vanished">ОÑновна програма</translation> </message> </context> <context> <name>QmlProfiler::Internal::QmlProfilerEventParentsModelProxy</name> <message> <source><program></source> - <translation><програма></translation> + <translation type="vanished"><програма></translation> </message> <message> <source>Main Program</source> - <translation>ОÑновна програма</translation> + <translation type="vanished">ОÑновна програма</translation> </message> </context> <context> <name>QmlProfiler::Internal::QmlProfilerEventChildrenModelProxy</name> <message> <source><program></source> - <translation><програма></translation> + <translation type="vanished"><програма></translation> </message> </context> <context> <name>QmlProfiler::Internal::QmlProfilerEventRelativesView</name> <message> + <source><bytecode></source> + <translation><байт-код></translation> + </message> + <message> + <source>Source code not available</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Part of binding loop.</source> <translation type="unfinished"></translation> </message> @@ -41337,12 +42551,8 @@ Please close all running instances of your application before starting a build.< <context> <name>QmlProfiler::Internal::PaintEventsModelProxy</name> <message> - <source>Painting</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Animations</source> - <translation type="unfinished"></translation> + <translation>Ðнімації</translation> </message> <message> <source>GUI Thread</source> @@ -41478,6 +42688,10 @@ Please close all running instances of your application before starting a build.< <source>Qt Quick component set:</source> <translation>Ðабір компонентів Qt Quick:</translation> </message> + <message> + <source>Component Set</source> + <translation>Ðабір компонентів</translation> + </message> </context> <context> <name>Qnx::Internal::BlackBerryConfigurationManager</name> @@ -41617,8 +42831,12 @@ Please close all running instances of your application before starting a build.< <translation type="unfinished"></translation> </message> <message> + <source>Error parsing XML file "%1": %2</source> + <translation>Помилка розбору файлу XML "%1": %2</translation> + </message> + <message> <source>Error parsing XML file '%1': %2</source> - <translation>Помилка розбору файлу XML '%1': %2</translation> + <translation type="vanished">Помилка розбору файлу XML '%1': %2</translation> </message> </context> <context> @@ -41636,10 +42854,6 @@ Please close all running instances of your application before starting a build.< <translation>Ðазва та Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ</translation> </message> <message> - <source>Momentics</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Qt Creator</source> <translation>Qt Creator</translation> </message> @@ -41655,7 +42869,7 @@ Please close all running instances of your application before starting a build.< <translation type="unfinished"></translation> </message> <message> - <source>Error generating file '%1': %2</source> + <source>Error generating file "%1": %2</source> <translation type="unfinished"></translation> </message> </context> @@ -41677,7 +42891,11 @@ Please close all running instances of your application before starting a build.< <name>ProjectFileConverter</name> <message> <source>File '%1' not listed in '%2' file, should it be?</source> - <translation>Файл '%1' не вказано в файлі '%2', а має?</translation> + <translation type="vanished">Файл '%1' не вказано в файлі '%2', а має?</translation> + </message> + <message> + <source>File "%1" not listed in "%2" file, should it be?</source> + <translation>Файл "%1" не вказано в файлі "%2", а має?</translation> </message> </context> <context> @@ -41752,22 +42970,6 @@ Please close all running instances of your application before starting a build.< <context> <name>Valgrind::Memcheck::MemcheckRunner</name> <message> - <source>No network interface found for remote analysis.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Select Network Interface</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>More than one network interface was found on your machine. Please select the one you want to use for remote analysis.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No network interface was chosen for remote analysis.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>XmlServer on %1:</source> <translation type="unfinished"></translation> </message> @@ -41891,11 +43093,11 @@ Please close all running instances of your application before starting a build.< <translation type="unfinished"></translation> </message> <message> - <source>Valgrind Memory Analyzer (Remote)</source> + <source>Valgrind Memory Analyzer (External Remote Application)</source> <translation type="unfinished"></translation> </message> <message> - <source>Valgrind Function Profiler (Remote)</source> + <source>Valgrind Function Profiler (External Remote Application)</source> <translation type="unfinished"></translation> </message> <message> @@ -42043,7 +43245,7 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou </message> <message> <source>Dry Run</source> - <translation type="unfinished"></translation> + <translation>Лише теÑÑ‚</translation> </message> <message> <source>Test the outcome of removing the last committed revision, without actually removing anything.</source> @@ -42079,12 +43281,16 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou </message> <message> <source>Use self-defined style:</source> - <translation>ВикориÑтовувати влаÑний Ñтиль:</translation> + <translation type="vanished">ВикориÑтовувати влаÑний Ñтиль:</translation> </message> <message> <source>Artistic Style</source> <translation>Artistic Style</translation> </message> + <message> + <source>Use customized style:</source> + <translation>ВикориÑтовувати влаÑний Ñтиль:</translation> + </message> </context> <context> <name>Beautifier::Internal::ClangFormat::ClangFormatOptionsPage</name> @@ -42106,11 +43312,11 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou </message> <message> <source>Use Predefined Style:</source> - <translation>ВикориÑтовувати Ñ–Ñнуючий Ñтиль:</translation> + <translation type="vanished">ВикориÑтовувати Ñ–Ñнуючий Ñтиль:</translation> </message> <message> <source>Use Customized Style:</source> - <translation>ВикориÑтовувати влаÑний Ñтиль:</translation> + <translation type="vanished">ВикориÑтовувати влаÑний Ñтиль:</translation> </message> <message> <source>Format entire file if no text was selected. (For action Format Selected Text)</source> @@ -42120,6 +43326,14 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou <source>Clang Format</source> <translation>Clang Format</translation> </message> + <message> + <source>Use predefined style:</source> + <translation>ВикориÑтовувати Ñ–Ñнуючий Ñтиль:</translation> + </message> + <message> + <source>Use customized style:</source> + <translation>ВикориÑтовувати влаÑний Ñтиль:</translation> + </message> </context> <context> <name>Beautifier::Internal::ConfigurationDialog</name> @@ -42137,7 +43351,11 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou </message> <message> <source>Documentation for '%1'</source> - <translation>Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Ð´Ð»Ñ '%1'</translation> + <translation type="vanished">Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Ð´Ð»Ñ '%1'</translation> + </message> + <message> + <source>Documentation for "%1"</source> + <translation>Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Ð´Ð»Ñ "%1"</translation> </message> </context> <context> @@ -42196,12 +43414,16 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou </message> <message> <source>Use self-defined style:</source> - <translation>ВикориÑтовувати влаÑний Ñтиль:</translation> + <translation type="vanished">ВикориÑтовувати влаÑний Ñтиль:</translation> </message> <message> <source>Uncrustify</source> <translation>Uncrustify</translation> </message> + <message> + <source>Use customized style:</source> + <translation>ВикориÑтовувати влаÑний Ñтиль:</translation> + </message> </context> <context> <name>ClangCodeModel::Internal::ClangProjectSettingsPropertiesPage</name> @@ -42478,58 +43700,16 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <context> <name>Qnx::Internal::BlackBerryDeployQtLibrariesDialog</name> <message> - <source>Deploy Qt to BlackBerry Device</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Qt library to deploy:</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Deploy</source> - <translation>Розгорнути</translation> - </message> - <message> - <source>Remote directory:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>/accounts/devuser/</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>qt</source> - <translation type="unfinished"></translation> + <translation type="vanished">Розгорнути</translation> </message> <message> <source>Close</source> - <translation>Закрити</translation> - </message> - <message> - <source>Closing the dialog will stop the deployment. Are you sure you want to do this?</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Please input a remote directory to deploy to.</source> - <translation type="unfinished"></translation> + <translation type="vanished">Закрити</translation> </message> <message> <source>Connection failed: %1</source> - <translation>Збій з'єднаннÑ: %1</translation> - </message> - <message> - <source>The remote directory '%1' already exists. Deploying to that directory will remove any files already present. - -Are you sure you want to continue?</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Checking existence of '%1'</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Removing '%1'</source> - <translation type="unfinished"></translation> + <translation type="vanished">Збій з'єднаннÑ: %1</translation> </message> </context> <context> @@ -42569,10 +43749,18 @@ Are you sure you want to continue?</source> <name>QmlJS::ModelManagerInterface</name> <message> <source>Indexing</source> - <translation>ІндекÑуваннÑ</translation> + <translation type="vanished">ІндекÑуваннÑ</translation> </message> <message> <source>QML import scan</source> + <translation type="vanished">Ð¡ÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñ–Ð² QML</translation> + </message> + <message> + <source>Parsing QML Files</source> + <translation>Розбір файлів QML</translation> + </message> + <message> + <source>Scanning QML Imports</source> <translation>Ð¡ÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñ–Ð² QML</translation> </message> </context> @@ -42618,7 +43806,7 @@ Check 'General Messages' output pane for details.</source> </message> <message> <source>"%1" timed out.</source> - <translation type="unfinished"></translation> + <translation>Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ "%1" вичерпано.</translation> </message> <message> <source>I/O error running "%1".</source> @@ -42633,9 +43821,15 @@ Check 'General Messages' output pane for details.</source> <translation>Ðргументи: %1</translation> </message> <message> + <source>Failed to parse "%1". +Error: %2</source> + <translation>Збій розбору "%1". +Помилка: %2</translation> + </message> + <message> <source>Failed to parse '%1'. Error: %2</source> - <translation>Збій розбору '%1'. + <translation type="vanished">Збій розбору '%1'. Помилка: %2</translation> </message> <message> @@ -42679,9 +43873,13 @@ Please build the qmldump application on the Qt version options page.</source> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Please install an SDK of at least API version %1.</source> - <translation>Ðеможливо Ñтворити новий AVD. ВідÑутній доÑтатньо Ñвіжий Android SDK. + <translation type="vanished">Ðеможливо Ñтворити новий AVD. ВідÑутній доÑтатньо Ñвіжий Android SDK. Будь лаÑка, вÑтановіть SDK з верÑією API не нижче %1.</translation> </message> + <message> + <source>Could not start process "%1 %2"</source> + <translation>Ðе вдалоÑÑŒ запуÑтити Ð¿Ñ€Ð¾Ñ†ÐµÑ "%1 %2"</translation> + </message> </context> <context> <name>Android::Internal::AndroidPotentialKit</name> @@ -42761,6 +43959,18 @@ Please install an SDK of at least API version %1.</source> <translation>Ðеможливо прочитати файл "%1": %2.</translation> </message> <message> + <source>File was modified.</source> + <translation>Файл було змінено.</translation> + </message> + <message> + <source>Time out reached while formatting file %1.</source> + <translation>Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾ під Ñ‡Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ %1.</translation> + </message> + <message> + <source>File %1 was closed.</source> + <translation>Файл %1 було закрито.</translation> + </message> + <message> <source>Error in Beautifier: %1</source> <translation>Помилка Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð´Ñƒ: %1</translation> </message> @@ -42879,8 +44089,12 @@ Please install an SDK of at least API version %1.</source> <translation>Збій генерації файлу PCH "%1".</translation> </message> <message> + <source>Precompiling</source> + <translation>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ ÐºÐ¾Ð¼Ð¿Ñ–Ð»ÑціÑ</translation> + </message> + <message> <source>Precompiling...</source> - <translation>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ ÐºÐ¾Ð¼Ð¿Ñ–Ð»ÑціÑ...</translation> + <translation type="vanished">ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ ÐºÐ¾Ð¼Ð¿Ñ–Ð»ÑціÑ...</translation> </message> </context> <context> @@ -42988,6 +44202,14 @@ Please install an SDK of at least API version %1.</source> <source>Preserve Case when Replacing</source> <translation>Зберігати регіÑÑ‚Ñ€ при заміні</translation> </message> + <message> + <source>Search for...</source> + <translation>Шукати...</translation> + </message> + <message> + <source>Replace with...</source> + <translation>Замінити на...</translation> + </message> </context> <context> <name>Core::IFindFilter</name> @@ -43086,6 +44308,10 @@ Please install an SDK of at least API version %1.</source> <context> <name>Core::SearchResultWindow</name> <message> + <source>History:</source> + <translation>ІÑторіÑ:</translation> + </message> + <message> <source>New Search</source> <translation>Ðовий пошук</translation> </message> @@ -43144,9 +44370,31 @@ Please install an SDK of at least API version %1.</source> <translation>Виконати кориÑтувацьку команду</translation> </message> <message> + <source>Previous command is still running ("%1"). +Do you want to kill it?</source> + <translation>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° доÑÑ– виконуєтьÑÑ ("%1"). +Бажаєте вбити Ñ—Ñ—?</translation> + </message> + <message> + <source>Command "%1" finished.</source> + <translation>Команда "%1" завершилаÑÑŒ.</translation> + </message> + <message> + <source>Command "%1" failed.</source> + <translation>Збій команди "%1".</translation> + </message> + <message> + <source>Could not find executable for "%1".</source> + <translation>Ðе вдалоÑÑŒ знайти виконуваний модуль Ð´Ð»Ñ "%1".</translation> + </message> + <message> + <source>Starting command "%1".</source> + <translation>ЗапуÑк команди %1".</translation> + </message> + <message> <source>Previous command is still running ('%1'). Do you want to kill it?</source> - <translation>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° доÑÑ– виконуєтьÑÑ ('%1'). + <translation type="vanished">ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° доÑÑ– виконуєтьÑÑ ('%1'). Бажаєте вбити Ñ—Ñ—?</translation> </message> <message> @@ -43155,19 +44403,19 @@ Do you want to kill it?</source> </message> <message> <source>Command '%1' finished.</source> - <translation>Команда '%1' завершилаÑÑŒ.</translation> + <translation type="vanished">Команда '%1' завершилаÑÑŒ.</translation> </message> <message> <source>Command '%1' failed.</source> - <translation>Збій команди '%1'.</translation> + <translation type="vanished">Збій команди '%1'.</translation> </message> <message> <source>Could not find executable for '%1'.</source> - <translation>Ðе вдалоÑÑŒ знайти виконуваний модуль Ð´Ð»Ñ '%1'.</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти виконуваний модуль Ð´Ð»Ñ '%1'.</translation> </message> <message> <source>Starting command '%1'.</source> - <translation>ЗапуÑк команди '%1'.</translation> + <translation type="vanished">ЗапуÑк команди '%1'.</translation> </message> <message> <source>Could not start process: %1.</source> @@ -43180,6 +44428,10 @@ Do you want to kill it?</source> <source>Files in File System</source> <translation>Файли в файловій ÑиÑтемі</translation> </message> + <message> + <source>Create and Open "%1"</source> + <translation>Створити та відкрити %1"</translation> + </message> </context> <context> <name>Core::ILocatorFilter</name> @@ -43211,8 +44463,12 @@ Do you want to kill it?</source> <translation>Ðаберіть, щоб знайти (%1)</translation> </message> <message> + <source>Updating Locator Caches</source> + <translation>ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐµÑˆÑ–Ð² локатора</translation> + </message> + <message> <source>Indexing</source> - <translation>ІндекÑуваннÑ</translation> + <translation type="vanished">ІндекÑуваннÑ</translation> </message> </context> <context> @@ -43316,6 +44572,15 @@ Do you want to kill it?</source> <source>No difference</source> <translation>Ðемає відмінноÑтей</translation> </message> + <message numerus="yes"> + <source>and %n more</source> + <extracomment>Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'"</extracomment> + <translation> + <numerusform>та ще %n</numerusform> + <numerusform>та ще %n</numerusform> + <numerusform>та ще %n</numerusform> + </translation> + </message> </context> <context> <name>DiffEditor::DiffEditorManager</name> @@ -43328,7 +44593,7 @@ Do you want to kill it?</source> <name>DiffEditor::SideDiffEditorWidget</name> <message numerus="yes"> <source>Skipped %n lines...</source> - <translation> + <translation type="vanished"> <numerusform>Пропущено %n Ñ€Ñдок...</numerusform> <numerusform>Пропущено %n Ñ€Ñдки...</numerusform> <numerusform>Пропущено %n Ñ€Ñдків...</numerusform> @@ -43341,6 +44606,22 @@ Do you want to kill it?</source> </context> <context> <name>DiffEditor::SideBySideDiffEditorWidget</name> + <message numerus="yes"> + <source>Skipped %n lines...</source> + <translation> + <numerusform>Пропущено %n Ñ€Ñдок...</numerusform> + <numerusform>Пропущено %n Ñ€Ñдки...</numerusform> + <numerusform>Пропущено %n Ñ€Ñдків...</numerusform> + </translation> + </message> + <message> + <source>Binary files differ</source> + <translation>Двійкові файли відрізнÑÑŽÑ‚ÑŒÑÑ</translation> + </message> + <message> + <source>Skipped unknown number of lines...</source> + <translation>Пропущено невідому кількіÑÑ‚ÑŒ Ñ€Ñдків...</translation> + </message> <message> <source>No controller</source> <translation>Ð’Ñ–Ñутній контролер</translation> @@ -43349,10 +44630,50 @@ Do you want to kill it?</source> <source>No difference</source> <translation>Ðемає відмінноÑтей</translation> </message> + <message> + <source>Send Chunk to CodePaster...</source> + <translation>ÐадіÑлати шматочок до Codepaster...</translation> + </message> + <message> + <source>Apply Chunk...</source> + <translation>ÐаклаÑти чаÑтину латки...</translation> + </message> + <message> + <source>Revert Chunk...</source> + <translation>ЗнÑти чаÑтину латки...</translation> + </message> + <message> + <source>Unable to Paste</source> + <translation>Ðеможливо вÑтавити</translation> + </message> + <message> + <source>Code pasting services are not available.</source> + <translation>Служби вÑтавки коду не доÑтупні.</translation> + </message> + <message> + <source>Revert Chunk</source> + <translation>ЗнÑÑ‚Ñ‚Ñ Ñ‡Ð°Ñтини латки</translation> + </message> + <message> + <source>Apply Chunk</source> + <translation>ÐÐ°ÐºÐ»Ð°Ð´Ð°Ð½Ð½Ñ Ñ‡Ð°Ñтини латки</translation> + </message> + <message> + <source>Would you like to revert the chunk?</source> + <translation>Бажаєте знÑти чаÑтину латки?</translation> + </message> + <message> + <source>Would you like to apply the chunk?</source> + <translation>Бажаєте наклаÑти чаÑтину латки?</translation> + </message> </context> <context> <name>Ios::Internal::IosAnalyzeSupport</name> <message> + <source>Run ended with error.</source> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑŒ з помилкою.</translation> + </message> + <message> <source>Run ended.</source> <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¾ÑÑŒ.</translation> </message> @@ -43458,17 +44779,17 @@ These files are preserved.</source> <translation><байт-код></translation> </message> <message> + <source>GUI Thread</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Source code not available.</source> - <translation>Код не доÑтупний.</translation> + <translation type="vanished">Код не доÑтупний.</translation> </message> <message> <source>anonymous function</source> <translation>анонімна функціÑ</translation> </message> - <message> - <source>Animations</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>QmlProfiler::QV8ProfilerDataModel</name> @@ -43488,31 +44809,28 @@ These files are preserved.</source> <translation>Qt %1 Ð´Ð»Ñ %2</translation> </message> <message> - <source>QCC for %1</source> - <translation>QCC Ð´Ð»Ñ %1</translation> - </message> - <message> - <source>Debugger for %1</source> - <translation>Зневаджувач Ð´Ð»Ñ %1</translation> + <source>- No auto detection source found.</source> + <translation type="unfinished"></translation> </message> <message> - <source>The following errors occurred while activating target: %1</source> + <source>- No sysroot found.</source> <translation type="unfinished"></translation> </message> <message> - <source>- No Qt version found.</source> + <source>The following errors occurred while activating target: %1 +</source> <translation type="unfinished"></translation> </message> <message> - <source>- No GCC compiler found.</source> - <translation type="unfinished"></translation> + <source>QCC for %1</source> + <translation>QCC Ð´Ð»Ñ %1</translation> </message> <message> - <source>- No GDB debugger found for BB10 Device.</source> - <translation type="unfinished"></translation> + <source>Debugger for %1</source> + <translation>Зневаджувач Ð´Ð»Ñ %1</translation> </message> <message> - <source>- No GDB debugger found for BB10 Simulator.</source> + <source>- No Qt version found.</source> <translation type="unfinished"></translation> </message> <message> @@ -43588,7 +44906,7 @@ These files are preserved.</source> <translation type="unfinished"></translation> </message> <message> - <source>The device runtime version(%1) does not match the API level version(%2). + <source>The device runtime version (%1) does not match the API level version (%2). Do you want to continue anyway?</source> <translation type="unfinished"></translation> </message> @@ -43913,13 +45231,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>VcsBase::Internal::CommonSettingsWidget</name> - <message> - <source>Command used for reverting diff chunks.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VcsBase::Internal::VcsPlugin</name> <message> <source>Name of the version control system in use by the current project.</source> @@ -43929,6 +45240,10 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <source>The current version control topic (branch or tag) identification of the current project.</source> <translation type="unfinished"></translation> </message> + <message> + <source>The top level path to the repository the current project is in.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>WinRt::Internal::WinRtDeployConfiguration</name> @@ -44043,28 +45358,28 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <name>WinRt::Internal::WinRtRunControl</name> <message> <source>The current kit has no Qt version.</source> - <translation>Поточний комплект не має верÑÑ–Ñ— Qt.</translation> + <translation type="vanished">Поточний комплект не має верÑÑ–Ñ— Qt.</translation> </message> <message> <source>Cannot find winrtrunner.exe in "%1".</source> - <translation>Ðе вдалоÑÑŒ знайти winrtrunner.exe в "%1".</translation> + <translation type="vanished">Ðе вдалоÑÑŒ знайти winrtrunner.exe в "%1".</translation> </message> <message> <source>winrtrunner crashed.</source> - <translation>winrtrunner завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> + <translation type="vanished">winrtrunner завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> </message> <message> <source>winrtrunner returned with exit code %1.</source> - <translation>winrtrunner повернув код %1.</translation> + <translation type="vanished">winrtrunner повернув код %1.</translation> </message> <message> <source>winrtrunner finished successfully.</source> - <translation>winrtrunner завершивÑÑ ÑƒÑпішно.</translation> + <translation type="vanished">winrtrunner завершивÑÑ ÑƒÑпішно.</translation> </message> <message> <source>Error while executing winrtrunner: %1 </source> - <translation>Помилка під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ winrtrunner: %1 + <translation type="vanished">Помилка під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ winrtrunner: %1 </translation> </message> </context> @@ -44111,4 +45426,1767 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <translation type="vanished">Ðеможливо відкрити '%1'.</translation> </message> </context> +<context> + <name>Utils::ProxyCredentialsDialog</name> + <message> + <source>Proxy Credentials</source> + <translation>ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ Ð½Ð° прокÑÑ–-Ñервері</translation> + </message> + <message> + <source>The proxy %1 requires a username and password.</source> + <translation>ПрокÑÑ–-Ñервер %1 вимагає ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтивача та пароль.</translation> + </message> + <message> + <source>Username:</source> + <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача:</translation> + </message> + <message> + <source>Username</source> + <translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача</translation> + </message> + <message> + <source>Password:</source> + <translation>Пароль:</translation> + </message> + <message> + <source>Password</source> + <translation>Пароль</translation> + </message> +</context> +<context> + <name>ProjectExplorer::DeploymentDataView</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Files to deploy:</source> + <translation>Файли до розгортаннÑ:</translation> + </message> +</context> +<context> + <name>TabViewSpecifics</name> + <message> + <source>TabView</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Current index</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Frame visible</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Determines the visibility of the tab frame around contents.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Tabs visible</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Determines the visibility of the the tab bar.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Tab position</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Determines the position of the tabs.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PuppetBuildProgressDialog</name> + <message> + <source>Build Progress</source> + <translation>ÐŸÑ€Ð¾Ð³Ñ€ÐµÑ Ð·Ð±Ñ–Ñ€ÐºÐ¸</translation> + </message> + <message> + <source>Build Adapter for the current Qt. Happens only once for every Qt installation.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Use Fallback QML Emulation Layer</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ButtonsBar</name> + <message> + <source>Jump to previous event.</source> + <translation>Перейти до попередньої події.</translation> + </message> + <message> + <source>Jump to next event.</source> + <translation>Перейти до наÑтупної події.</translation> + </message> + <message> + <source>Show zoom slider.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Select range.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>View event information on mouseover.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>CategoryLabel</name> + <message> + <source><bytecode></source> + <translation><байт-код></translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name> + <message> + <source>Deploy Qt to BlackBerry Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Qt library to deploy:</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Deploy</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Remote directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Close</source> + <translation>Закрити</translation> + </message> + <message> + <source>Closing the dialog will stop the deployment. Are you sure you want to do this?</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Please input a remote directory to deploy to.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Connection failed: %1</source> + <translation>Збій з'єднаннÑ: %1</translation> + </message> + <message> + <source>The remote directory "%1" already exists. Deploying to that directory will remove any files already present. + +Are you sure you want to continue?</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Checking existence of "%1"</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Removing "%1"</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxSettingsWidget</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Generate kits</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Configuration Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Name:</source> + <translation>Ðазва:</translation> + </message> + <message> + <source>Version:</source> + <translation>ВерÑÑ–Ñ:</translation> + </message> + <message> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Target:</source> + <translation>Ціль:</translation> + </message> + <message> + <source>Add</source> + <translation>Додати</translation> + </message> + <message> + <source>Remove</source> + <translation>Видалити</translation> + </message> + <message> + <source>Select QNX Environment File</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Warning</source> + <translation>ПопередженнÑ</translation> + </message> + <message> + <source>Configuration already exists or is invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Remove QNX Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Are you sure you want to remove: + %1?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>RemoteLinux::Internal::RemoteLinuxCustomRunConfigurationWidget</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Local executable:</source> + <translation>Локальний виконуваний модуль:</translation> + </message> + <message> + <source>Remote executable:</source> + <translation>Віддалений виконуваний модуль:</translation> + </message> + <message> + <source>Arguments:</source> + <translation>Ðргументи:</translation> + </message> + <message> + <source>Working directory:</source> + <translation>Робоча тека:</translation> + </message> +</context> +<context> + <name>ColorEditor</name> + <message> + <source>Solid Color</source> + <translation>Суцільний колір</translation> + </message> + <message> + <source>Gradient</source> + <translation>Градієнт</translation> + </message> + <message> + <source>Transparent</source> + <translation>Прозорий</translation> + </message> +</context> +<context> + <name>StatesList</name> + <message> + <source>Collapse</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Expand</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QmlDebug::QmlDebugConnectionPrivate</name> + <message> + <source>Error: (%1) %2</source> + <extracomment>%1=error code, %2=error message</extracomment> + <translation>Помилка: (%1) %2</translation> + </message> + <message> + <source><device is gone></source> + <translation><приÑтрій зник></translation> + </message> + <message> + <source>Network connection dropped</source> + <translation>Мережеве з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·Ñ–Ñ€Ð²Ð°Ð½Ðµ</translation> + </message> + <message> + <source>Resolving host</source> + <translation>Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ–Ð¼ÐµÐ½Ñ– вузла</translation> + </message> + <message> + <source>Establishing network connection ...</source> + <translation>Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¼ÐµÑ€ÐµÐ¶ÐµÐ²Ð¾Ð³Ð¾ з'єднаннÑ...</translation> + </message> + <message> + <source>Network connection established</source> + <translation>Мережеве з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ñтановлене</translation> + </message> + <message> + <source>Network connection closing</source> + <translation>Мережеве з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ€Ð¸Ð²Ð°Ñ”Ñ‚ÑŒÑÑ</translation> + </message> + <message> + <source>Socket state changed to BoundState. This should not happen!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Socket state changed to ListeningState. This should not happen!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QmlDebug::QmlDebugConnection</name> + <message> + <source>Connecting to debug server at %1:%2 ...</source> + <translation>ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ Ñервера Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ð° %1: %2 ...</translation> + </message> +</context> +<context> + <name>QDockWidget</name> + <message> + <source>Float</source> + <translation>Плаваючий</translation> + </message> + <message> + <source>Undocks and re-attaches the dock widget</source> + <translation>ВідкріплÑÑ” та прикріплÑÑ” плаваючий віджет</translation> + </message> + <message> + <source>Close</source> + <translation>Закрити</translation> + </message> + <message> + <source>Closes the dock widget</source> + <translation>Закриває плаваючий віджет</translation> + </message> +</context> +<context> + <name>Utils::FileWizardPage</name> + <message> + <source>Location</source> + <translation>РозташуваннÑ</translation> + </message> +</context> +<context> + <name>Android::Internal::AvdDialog</name> + <message> + <source>Cannot create a new AVD. No sufficiently recent Android SDK available. +Install an SDK of at least API version %1.</source> + <translation>Ðеможливо Ñтворити новий AVD. ВідÑутній доÑтатньо Ñвіжий Android SDK. +Ð’Ñтановіть SDK з верÑією API не нижче %1.</translation> + </message> + <message> + <source>Cannot create a AVD for ABI %1. Install an image for it.</source> + <translation>Ðеможливо Ñтворити AVD Ð´Ð»Ñ ABI %1. Ð’Ñтановіть відповідний образ Ð´Ð»Ñ Ð½ÑŒÐ¾Ð³Ð¾.</translation> + </message> +</context> +<context> + <name>BareMetal</name> + <message> + <source>Example:</source> + <translation>Приклад:</translation> + </message> + <message> + <source>Enter your hostname like "localhost" or "192.0.2.1" or a command which must support GDB pipelining starting with a pipe symbol.</source> + <translation>Введіть назву вашого вузла (напр., "localhost" або "192.0.2.1") або команду, Ñка повинна підтримувати Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ GDB, починаючи із Ñимволу труби.</translation> + </message> + <message> + <source>Enter the hardware reset command here.<br>The CPU should be halted after this command.</source> + <translation>Введіть тут команду Ð´Ð»Ñ Ð°Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ð¾Ð³Ð¾ ÑкиданнÑ.<br>ПроцеÑор має бути зупинено піÑÐ»Ñ Ñ†Ñ–Ñ”Ñ— команди.</translation> + </message> + <message> + <source>Enter commands to reset the board, and write the nonvolatile memory.</source> + <translation>Введіть команди Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð»Ð°Ñ‚Ð¸ та запиÑу до поÑтійної пам'ÑÑ‚Ñ–.</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalDeviceConfigurationFactory</name> + <message> + <source>Bare Metal Device</source> + <translation>Голий приÑтрій</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalDeviceConfigurationWidget</name> + <message> + <source>GDB host:</source> + <translation>Вузол GDB:</translation> + </message> + <message> + <source>GDB port:</source> + <translation>Порт GDB:</translation> + </message> + <message> + <source>Init commands:</source> + <translation>Команди ініціалізації:</translation> + </message> + <message> + <source>Reset commands:</source> + <translation>Команди ÑкиданнÑ:</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalDeviceConfigurationWizard</name> + <message> + <source>New Bare Metal Device Configuration Setup</source> + <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ— конфігурації голого приÑтрою</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalGdbCommandsDeployStep</name> + <message> + <source>GDB commands</source> + <translation>Команди GDB</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalRunConfiguration</name> + <message> + <source>%1 (via GDB server or hardware debugger)</source> + <translation>%1 (через Ñервер GDB або апаратний зневаджувач)</translation> + </message> + <message> + <source>Run on GDB server or hardware debugger</source> + <extracomment>Bare Metal run configuration default run name</extracomment> + <translation>Виконати на Ñервері GDB або апаратному зневаджувачі</translation> + </message> +</context> +<context> + <name>BareMetal::Internal::BareMetalRunConfigurationWidget</name> + <message> + <source>Executable:</source> + <translation>Виконуваний модуль:</translation> + </message> + <message> + <source>Arguments:</source> + <translation>Ðргументи:</translation> + </message> + <message> + <source><default></source> + <translation><типово></translation> + </message> + <message> + <source>Working directory:</source> + <translation>Робоча тека:</translation> + </message> + <message> + <source>Unknown</source> + <translation>Ðевідомо</translation> + </message> +</context> +<context> + <name>Bazaar::Internal::CloneWizardFactory</name> + <message> + <source>Clones a Bazaar branch and tries to load the contained project.</source> + <translation>Клонує гілку Bazaar та намагаєть завантажити з нього проект.</translation> + </message> + <message> + <source>Bazaar Clone (Or Branch)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Core::BaseFileWizardFactory</name> + <message> + <source>File Generation Failure</source> + <translation>Збій генерації файлу</translation> + </message> + <message> + <source>Existing files</source> + <translation>ІÑнуючі файли</translation> + </message> + <message> + <source>Failed to open an editor for "%1".</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€Ð° Ð´Ð»Ñ "%1".</translation> + </message> + <message> + <source>[read only]</source> + <translation>[лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ]</translation> + </message> + <message> + <source>[folder]</source> + <translation>[тека]</translation> + </message> + <message> + <source>[symbolic link]</source> + <translation>[Ñимволічне поÑиланнÑ]</translation> + </message> + <message> + <source>The project directory %1 contains files which cannot be overwritten: +%2.</source> + <translation>Тека проекту %1 міÑтить файли, Ñкі не можуть бути перезапиÑані: +%2.</translation> + </message> +</context> +<context> + <name>Core::StandardFileWizardFactory</name> + <message> + <source>New %1</source> + <translation>Ðовий %1</translation> + </message> +</context> +<context> + <name>Core::DocumentModelPrivate</name> + <message> + <source><no document></source> + <translation><немає документа></translation> + </message> + <message> + <source>No document is selected.</source> + <translation>Документ не обрано.</translation> + </message> +</context> +<context> + <name>Core::PatchTool</name> + <message> + <source>There is no patch-command configured in the general "Environment" settings.</source> + <translation>ВідÑÑƒÑ‚Ð½Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð° команда patch в Опції -Середовище.</translation> + </message> + <message> + <source>Executing in %1: %2 %3</source> + <translation>Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð² %1: %2 %3</translation> + </message> + <message> + <source>Unable to launch "%1": %2</source> + <translation>Ðеможливо запуÑтити "%1": %2</translation> + </message> + <message> + <source>A timeout occurred running "%1"</source> + <translation>Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾ Ð´Ð»Ñ "%1"</translation> + </message> + <message> + <source>"%1" crashed.</source> + <translation>"%1" завершивÑÑ Ð°Ð²Ð°Ñ€Ñ–Ð¹Ð½Ð¾.</translation> + </message> + <message> + <source>"%1" failed (exit code %2).</source> + <translation>Збій "%1" (код Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ %2).</translation> + </message> +</context> +<context> + <name>Core::Internal::VariableChooserPrivate</name> + <message> + <source>Select a variable to insert.</source> + <translation>Оберіть змінну Ð´Ð»Ñ Ð²Ñтавки.</translation> + </message> + <message> + <source>Insert variable</source> + <translation>Ð’Ñтавити змінну</translation> + </message> + <message> + <source>Current Value: %1</source> + <translation>Поточне значеннÑ: %1</translation> + </message> +</context> +<context> + <name>Core::Internal::WindowSupport</name> + <message> + <source>Exit Full Screen</source> + <translation>Вийти з повноекранного режиму</translation> + </message> + <message> + <source>Enter Full Screen</source> + <translation>Перейти в повноекранний режим</translation> + </message> +</context> +<context> + <name>CppEditor::Internal::CppEditorOutline</name> + <message> + <source>Sort Alphabetically</source> + <translation>Сортувати за абеткою</translation> + </message> +</context> +<context> + <name>CppSourceProcessor</name> + <message> + <source>%1: No such file or directory</source> + <translation>%1: Файл чи тека не Ñ–Ñнують</translation> + </message> + <message> + <source>%1: Could not get file contents</source> + <translation>%1: Ðе вдалоÑÑŒ отримати зміÑÑ‚ файлу</translation> + </message> +</context> +<context> + <name>Cvs::Internal::CheckoutWizardFactory</name> + <message> + <source>Checks out a CVS repository and tries to load the contained project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>CVS Checkout</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Debugger::Internal::LocalsAndExpressionsOptionsPage</name> + <message> + <source>Use Debugging Helper</source> + <translation>ВикориÑтовувати помічник зневадженнÑ</translation> + </message> + <message> + <source>The debugging helpers are used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. </source> + <translation>Помічники Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтовуютьÑÑ Ð´Ð»Ñ Ð·Ñ€ÑƒÑ‡Ð½Ð¾Ð³Ð¾ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±'єктів певних типів, Ñк QString та std::map у виді &quot;Локальних змінних та виразів&quot;.</translation> + </message> + <message> + <source>Use code model</source> + <translation>ВикориÑтовувати модель коду</translation> + </message> + <message> + <source>Makes use of Qt Creator's code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source> + <translation>Вмикає викориÑÑ‚Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ– коду Qt Creator Ð´Ð»Ñ Ð·'ÑÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾Ð³Ð¾, чи змінній вже було приÑвоєно Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² момент зупинки зневаджувача.</translation> + </message> + <message> + <source>Displays names of QThread based threads.</source> + <translation>Показувати назви ниток, що базуютьÑÑ Ð½Ð° QThread.</translation> + </message> + <message> + <source>Display thread names</source> + <translation>Показувати імена ниток</translation> + </message> + <message> + <source>Shows "std::" prefix for types from the standard library.</source> + <translation>Показувати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ "std::" Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð² зі Ñтандартної бібліотеки.</translation> + </message> + <message> + <source>Show "std::" namespace for types</source> + <translation>Показувати проÑÑ‚Ñ–Ñ€ імен "std::" Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð²</translation> + </message> + <message> + <source>Shows Qt namespace prefix for Qt types. This is only relevant if Qt was configured with '-qtnamespace'.</source> + <translation>Показувати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð¿Ñ€Ð¾Ñтору імен Qt Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð² Qt. Це має ÑенÑ, Ñкщо Qt було Ñконфігуровано з '-qtnamespace'.</translation> + </message> + <message> + <source>Qt's namespace for types</source> + <translation>ПроÑÑ‚Ñ–Ñ€ імен Qt Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ñ–Ð²</translation> + </message> + <message> + <source><unlimited></source> + <translation><необмежено></translation> + </message> + <message> + <source>Maximum string length:</source> + <translation>МакÑимальна довжина Ñ€Ñдка:</translation> + </message> + <message> + <source>Display string length:</source> + <translation>Довжина Ñ€Ñдка, що показуєтьÑÑ:</translation> + </message> + <message> + <source>Displayh string length:</source> + <translation type="vanished">Довжина Ñ€Ñдка, що показуєтьÑÑ:</translation> + </message> +</context> +<context> + <name>Debugger::Internal::DebuggerToolTipManager</name> + <message> + <source>Restored</source> + <translation>Відновлено</translation> + </message> +</context> +<context> + <name>DiffEditor::UnifiedDiffEditorWidget</name> + <message> + <source>No controller</source> + <translation>Ð’Ñ–Ñутній контролер</translation> + </message> + <message> + <source>Send Chunk to CodePaster...</source> + <translation>ÐадіÑлати шматочок до Codepaster...</translation> + </message> + <message> + <source>Apply Chunk...</source> + <translation>ÐаклаÑти чаÑтину латки...</translation> + </message> + <message> + <source>Revert Chunk...</source> + <translation>ЗнÑти чаÑтину латки...</translation> + </message> + <message> + <source>Unable to Paste</source> + <translation>Ðеможливо вÑтавити</translation> + </message> + <message> + <source>Code pasting services are not available.</source> + <translation>Служби вÑтавки коду не доÑтупні.</translation> + </message> + <message> + <source>Revert Chunk</source> + <translation>ЗнÑÑ‚Ñ‚Ñ Ñ‡Ð°Ñтини латки</translation> + </message> + <message> + <source>Apply Chunk</source> + <translation>ÐÐ°ÐºÐ»Ð°Ð´Ð°Ð½Ð½Ñ Ñ‡Ð°Ñтини латки</translation> + </message> + <message> + <source>Would you like to revert the chunk?</source> + <translation>Бажаєте знÑти чаÑтину латки?</translation> + </message> + <message> + <source>Would you like to apply the chunk?</source> + <translation>Бажаєте наклаÑти чаÑтину латки?</translation> + </message> + <message> + <source>No difference</source> + <translation>Ðемає відмінноÑтей</translation> + </message> +</context> +<context> + <name>EmacsKeys::Internal::EmacsKeysPlugin</name> + <message> + <source>Delete Character</source> + <translation>Видалити Ñимвол</translation> + </message> + <message> + <source>Kill Word</source> + <translation>Видалити Ñлово</translation> + </message> + <message> + <source>Kill Line</source> + <translation>Видалити Ñ€Ñдок</translation> + </message> + <message> + <source>Insert New Line and Indent</source> + <translation>Ð’Ñтавити новий Ñ€Ñдок та зробити відÑтуп</translation> + </message> + <message> + <source>Go to File Start</source> + <translation>Перейти на початок файоу</translation> + </message> + <message> + <source>Go to File End</source> + <translation>Перейти на кінець файлу</translation> + </message> + <message> + <source>Go to Line Start</source> + <translation>Перейти на початок Ñ€Ñдка</translation> + </message> + <message> + <source>Go to Line End</source> + <translation>Перейти на кінець Ñ€Ñдка</translation> + </message> + <message> + <source>Go to Next Line</source> + <translation>Перейти на наÑтупний Ñ€Ñдок</translation> + </message> + <message> + <source>Go to Previous Line</source> + <translation>Перейти на попередній Ñ€Ñдок</translation> + </message> + <message> + <source>Go to Next Character</source> + <translation>Перейти до наÑтупного Ñимволу</translation> + </message> + <message> + <source>Go to Previous Character</source> + <translation>Перейти до попереднього Ñимволу</translation> + </message> + <message> + <source>Go to Next Word</source> + <translation>Перейти до наÑтупного Ñлова</translation> + </message> + <message> + <source>Go to Previous Word</source> + <translation>Перейти до попереднього Ñлова</translation> + </message> + <message> + <source>Mark</source> + <translation>Позначити</translation> + </message> + <message> + <source>Exchange Cursor and Mark</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Copy</source> + <translation>Копіювати</translation> + </message> + <message> + <source>Cut</source> + <translation>Вирізати</translation> + </message> + <message> + <source>Yank</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Scroll Half Screen Down</source> + <translation>Прокрутити на півекрану вниз</translation> + </message> + <message> + <source>Scroll Half Screen Up</source> + <translation>Прокрутити на півекрану вверх</translation> + </message> +</context> +<context> + <name>Git::Internal::CloneWizardFactory</name> + <message> + <source>Clones a Git repository and tries to load the contained project.</source> + <translation>Клонує Ñховище Git та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> + </message> + <message> + <source>Git Repository Clone</source> + <translation>ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñховища Git</translation> + </message> +</context> +<context> + <name>Gitorious::Internal::GitoriousCloneWizardFactory</name> + <message> + <source>Clones a Gitorious repository and tries to load the contained project.</source> + <translation>Клонує Ñховище Gitorious та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> + </message> + <message> + <source>Gitorious Repository Clone</source> + <translation>ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñховища Gitorious</translation> + </message> +</context> +<context> + <name>Git::Internal::GitSubmitEditor</name> + <message> + <source>Refreshing Commit Data</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Git::Internal::RemoteModel</name> + <message> + <source>Name</source> + <translation>Ðазва</translation> + </message> + <message> + <source>URL</source> + <translation>URL</translation> + </message> +</context> +<context> + <name>Help::Internal::HelpWidget</name> + <message> + <source>Go to Help Mode</source> + <translation>Перейти в режим довідки</translation> + </message> + <message> + <source>Back</source> + <translation>Ðазад</translation> + </message> + <message> + <source>Forward</source> + <translation>Вперед</translation> + </message> + <message> + <source>Increase Font Size</source> + <translation>Збільшити розмір шрифту</translation> + </message> + <message> + <source>Decrease Font Size</source> + <translation>Зменшити розмір шрифту</translation> + </message> + <message> + <source>Reset Font Size</source> + <translation>Відновити розмір шрифту</translation> + </message> + <message> + <source>Help</source> + <translation>Довідка</translation> + </message> + <message> + <source>Help - %1</source> + <translation>Довідка - %1</translation> + </message> +</context> +<context> + <name>Help::Internal::QtWebKitHelpWidget</name> + <message> + <source>Open Link as New Page</source> + <translation>Відкрити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² новій Ñторінці</translation> + </message> +</context> +<context> + <name>Help::Internal::SearchTaskHandler</name> + <message> + <source>Get Help Online</source> + <translation>Отримати допомогу в мережі</translation> + </message> +</context> +<context> + <name>Help::Internal::SearchSideBarItem</name> + <message> + <source>Regenerate Index</source> + <translation>Перегенерувати індекÑ</translation> + </message> +</context> +<context> + <name>Help::Internal::TextBrowserHelpWidget</name> + <message> + <source>Open Link</source> + <translation>Відкрити поÑиланнÑ</translation> + </message> + <message> + <source>Open Link as New Page</source> + <translation>Відкрити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² новій Ñторінці</translation> + </message> + <message> + <source>Copy Link</source> + <translation>Копіювати поÑиланнÑ</translation> + </message> + <message> + <source>Copy</source> + <translation>Копіювати</translation> + </message> + <message> + <source>Reload</source> + <translation>Перезавантажити</translation> + </message> +</context> +<context> + <name>Mercurial::Internal::CloneWizardFactory</name> + <message> + <source>Clones a Mercurial repository and tries to load the contained project.</source> + <translation>Клонує Ñховище Mercurial та намагаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ з нього проект.</translation> + </message> + <message> + <source>Mercurial Clone</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ProjectExplorer::DeploymentDataModel</name> + <message> + <source>Local File Path</source> + <translation>Локальний шлÑÑ… до файлу</translation> + </message> + <message> + <source>Remote Directory</source> + <translation>Віддалена тека</translation> + </message> +</context> +<context> + <name>ProjectWizard</name> + <message> + <source>The files are implicitly added to the projects:</source> + <translation>ÐеÑвно додані до проектів файли:</translation> + </message> + <message> + <source><Implicitly Add></source> + <translation><ÐеÑвно додати></translation> + </message> + <message> + <source><None></source> + <translation><Ðемає></translation> + </message> +</context> +<context> + <name>Utils::SettingsAccessor</name> + <message> + <source>No Valid Settings Found</source> + <translation>Ðе знайдено правильний налаштувань</translation> + </message> + <message> + <source><p>No valid settings file could be found.</p><p>All settings files found in directory "%1" were either too new or too old to be read.</p></source> + <translation><p>Ðе вдалоÑÑŒ знайти правильний файл налаштувань.</p><p>УÑÑ– файли налаштувань в теці "%1" або занові, або заÑтарі, щоб бути прочитаними.</p></translation> + </message> + <message> + <source>Using Old Settings</source> + <translation>Ð’Ð¶Ð¸Ð²Ð°Ð½Ð½Ñ Ñтарих налаштувань</translation> + </message> + <message> + <source><p>The versioned backup "%1" of the settings file is used, because the non-versioned file was created by an incompatible version of Qt Creator.</p><p>Settings changes made since the last time this version of Qt Creator was used are ignored, and changes made now will <b>not</b> be propagated to the newer version.</p></source> + <translation><p>Буде викориÑтана верÑійна резервна ÐºÐ¾Ð¿Ñ–Ñ "%1" файлу налаштувань . оÑкільки не-верÑійний файл було Ñтворено неÑуміÑною верÑією Qt Creator.</p><p>Зміни до налаштувань проекту здійÑнені з чаÑу оÑтаннього викориÑÑ‚Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— верÑÑ–Ñ— Qt Creator з цим проектом будуть проігноровані, а зміни здійÑнені зараз <b>не</b> будуть перенеÑені до новішої верÑÑ–Ñ—.</p></translation> + </message> +</context> +<context> + <name>ProjectExplorer::EnvironmentIdAccessor</name> + <message> + <source><p>No .user settings file created by this instance of Qt Creator was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%1"?</p></source> + <translation><p>Ðе знайдено файлу налаштувань .user, Ñтвореного цим екземплÑром Qt Creator.</p><p>Ви працювали раніше з цим проектом на іншому комп'ютері абр викориÑтовуючи інший шлÑÑ… до налаштувань?</p><p>Ви ще бажаєте завантажити файл налаштувань "%1"?</p></translation> + </message> + <message> + <source>Settings File for "%1" from a different Environment?</source> + <translation>Файл налаштувань Ð´Ð»Ñ "%1" з іншого Ñередовища?</translation> + </message> +</context> +<context> + <name>ProjectExplorer::Task</name> + <message> + <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> + <translation>Qt Creator потребує компілÑтора Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Сконфігуруйте компілÑтор в налаштуваннÑÑ… комплекту.</translation> + </message> + <message> + <source>Qt Creator needs a build configuration set up to build. Configure a build configuration in the project settings.</source> + <translation>Qt Creator потребує конфігурації Ð´Ð»Ñ Ð·Ð±Ñ–Ñ€ÐºÐ¸. Ðалаштуйте конфігурацію збірки в параметрах комплекту.</translation> + </message> +</context> +<context> + <name>ProjectExplorer::XcodebuildParser</name> + <message> + <source>Xcodebuild failed.</source> + <translation>Збій Xcodebuild.</translation> + </message> +</context> +<context> + <name>QmlDesigner::CrumbleBar</name> + <message> + <source>Save the changes to preview them correctly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Always save when leaving subcomponent</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>NavigatorTreeModel</name> + <message> + <source>Warning</source> + <translation>ПопередженнÑ</translation> + </message> + <message> + <source>Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QmlDesigner::AddTabDesignerAction</name> + <message> + <source>Naming Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Component already exists.</source> + <translation>Компонент вже Ñ–Ñнує.</translation> + </message> +</context> +<context> + <name>NodeInstanceServerProxy</name> + <message> + <source>Cannot Connect to QML Emulation Layer (QML Puppet)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The executable of the QML emulation layer (QML Puppet) may not be responding. Switching to another kit might help.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QmlDesigner::NodeInstanceServerProxy</name> + <message> + <source>Cannot Start QML Emulation Layer (QML Puppet)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The executable of the QML emulation layer (QML Puppet) process cannot be started or does not respond.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>QML Emulation Layer (QML Puppet) Crashed</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You are recording a puppet stream and the emulations layer crashed. It is recommended to reopen the Qt Quick Designer and start again.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PuppetCreator</name> + <message> + <source>QML Emulation Layer (QML Puppet) Building was Unsuccessful</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The QML emulation layer (QML Puppet) cannot be built. The fallback emulation layer, which does not support all features, will be used.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Qt Version is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The QML emulation layer (QML Puppet) cannot be built because the Qt version is too old or it cannot run natively on your computer. The fallback emulation layer, which does not support all features, will be used.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Kit is invalid</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. For example the compiler can be misconfigured. Fix the kit configuration and restart Qt Creator. Otherwise, the fallback emulation layer, which does not support all features, will be used.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Qnx::Internal::BarDescriptorFileNodeManager</name> + <message> + <source>Cannot save bar descriptor file: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot reload bar descriptor file: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Setup Application Descriptor File</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You need to set up a bar descriptor file to enable packaging. +Do you want Qt Creator to generate it for your project (%1)?</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Don't ask again for this project</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot set up application descriptor file: Reading the bar descriptor template failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot set up application descriptor file: Writing the bar descriptor file failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Error</source> + <translation>Помилка</translation> + </message> + <message> + <source>Cannot open BAR application descriptor file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxBaseConfiguration</name> + <message> + <source>- No GCC compiler found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>- No GDB debugger found for armvle7.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>- No GDB debugger found for x86.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxConfiguration</name> + <message> + <source>The following errors occurred while activating the QNX configuration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot Set Up QNX Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>QCC for %1 (armv7)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>QCC for %1 (x86)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Debugger for %1 (armv7)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Debugger for %1 (x86)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Kit for %1 (armv7)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Kit for %1 (x86)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QNX</name> + <message> + <source>QNX</source> + <translation>QNX</translation> + </message> +</context> +<context> + <name>Qnx::Internal::QnxSettingsPage</name> + <message> + <source>QNX</source> + <translation>QNX</translation> + </message> +</context> +<context> + <name>RemoteLinux::Internal::RemoteLinuxCustomRunConfiguration</name> + <message> + <source>The remote executable must be set in order to run a custom remote run configuration.</source> + <translation>Має бути заданий віддалений виконуваний модуль, щоб виконати кориÑтувацьку віддалену конфігурацію запуÑку.</translation> + </message> + <message> + <source>Run "%1" on Linux Device</source> + <translation>ЗапуÑтити "%1" на приÑтрої Linux</translation> + </message> + <message> + <source>Custom Executable (on Remote Generic Linux Host)</source> + <translation>Виконуваний модуль (на віддаленому звичайному вузлі Linux)</translation> + </message> +</context> +<context> + <name>Subversion::Internal::CheckoutWizardFactory</name> + <message> + <source>Checks out a Subversion repository and tries to load the contained project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Subversion Checkout</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TaskList::Internal::TaskListPlugin</name> + <message> + <source>Cannot open task file %1: %2</source> + <translation>Ðеможливо відкрити файл завдань %1: %2</translation> + </message> + <message> + <source>File Error</source> + <translation>Помилка файлу</translation> + </message> + <message> + <source>My Tasks</source> + <translation>Мої завданнÑ</translation> + </message> + <message> + <source>Task file reader</source> + <translation>ОглÑдач файлу завдань</translation> + </message> +</context> +<context> + <name>TextEditor::Internal::MultiDefinitionDownloader</name> + <message> + <source>Downloading Highlighting Definitions</source> + <translation>Ð—Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ підÑвітки</translation> + </message> + <message> + <source>Error downloading selected definition(s).</source> + <translation>Помилка Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… визначень.</translation> + </message> + <message> + <source>Error downloading one or more definitions.</source> + <translation>Помилка Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ чи більше визначень.</translation> + </message> + <message> + <source>Please check the directory's access rights.</source> + <translation>Будь лаÑка, перевірте права доÑтупу до теки.</translation> + </message> + <message> + <source>Download Error</source> + <translation>Помилка звантаженнÑ</translation> + </message> +</context> +<context> + <name>TextEditor::Internal::TextEditorActionHandlerPrivate</name> + <message> + <source>&Undo</source> + <translation>&Повернути</translation> + </message> + <message> + <source>&Redo</source> + <translation>П&овторити</translation> + </message> + <message> + <source>Delete &Line</source> + <translation>Вида&лити Ñ€Ñдок</translation> + </message> + <message> + <source>Delete Word from Cursor On</source> + <translation>Видалити Ñлово під курÑором</translation> + </message> + <message> + <source>Delete Word Camel Case from Cursor On</source> + <translation>Видалити Ñлово в Camel Case під курÑором</translation> + </message> + <message> + <source>Delete Word up to Cursor</source> + <translation>Видалити Ñлово перед курÑором</translation> + </message> + <message> + <source>Delete Word Camel Case up to Cursor</source> + <translation>Видалити Ñлово в Camel Case перед курÑором</translation> + </message> + <message> + <source>Go to Block Start with Selection</source> + <translation>Перейти на початок блока у виділеному</translation> + </message> + <message> + <source>Ctrl+{</source> + <translation>Ctrl+{</translation> + </message> + <message> + <source>Go to Block End with Selection</source> + <translation>Перейти на початок блока у виділеному</translation> + </message> + <message> + <source>Ctrl+}</source> + <translation>Ctrl+}</translation> + </message> + <message> + <source>Move Line Up</source> + <translation>ПереÑунути Ñ€Ñдок вгору</translation> + </message> + <message> + <source>Ctrl+Shift+Up</source> + <translation>Ctrl+Shift+Up</translation> + </message> + <message> + <source>Move Line Down</source> + <translation>ПереÑунути Ñ€Ñдок вниз</translation> + </message> + <message> + <source>Ctrl+Shift+Down</source> + <translation>Ctrl+Shift+Down</translation> + </message> + <message> + <source>Copy Line Up</source> + <translation>Скопіювати Ñ€Ñдок вгору</translation> + </message> + <message> + <source>Ctrl+Alt+Up</source> + <translation>Ctrl+Alt+Up</translation> + </message> + <message> + <source>Copy Line Down</source> + <translation>Скопіювати Ñ€Ñдок вниз</translation> + </message> + <message> + <source>Ctrl+Alt+Down</source> + <translation>Ctrl+Alt+Down</translation> + </message> + <message> + <source>Join Lines</source> + <translation>Об'єднати Ñ€Ñдки</translation> + </message> + <message> + <source>Ctrl+J</source> + <translation>Ctrl+J</translation> + </message> + <message> + <source>Insert Line Above Current Line</source> + <translation>Ð’Ñтавити Ñ€Ñдок перед поточним</translation> + </message> + <message> + <source>Ctrl+Shift+Return</source> + <translation>Ctrl+Shift+Return</translation> + </message> + <message> + <source>Insert Line Below Current Line</source> + <translation>Ð’Ñтавити Ñ€Ñдок піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾</translation> + </message> + <message> + <source>Ctrl+Return</source> + <translation>Ctrl+Return</translation> + </message> + <message> + <source>Indent</source> + <translation>Зробити відÑтуп</translation> + </message> + <message> + <source>Unindent</source> + <translation>СкаÑувати відÑтуп</translation> + </message> + <message> + <source>Follow Symbol Under Cursor</source> + <translation>Йти за Ñимволом під курÑором</translation> + </message> + <message> + <source>Follow Symbol Under Cursor in Next Split</source> + <translation>Йти за Ñимволом під курÑором в наÑтупній розбивці</translation> + </message> + <message> + <source>Meta+E, F2</source> + <translation>Meta+E, F2</translation> + </message> + <message> + <source>Ctrl+E, F2</source> + <translation>Ctrl+E, F2</translation> + </message> + <message> + <source>Jump To File Under Cursor</source> + <translation>Перейти до файлу під курÑором</translation> + </message> + <message> + <source>Move the View a Page Up and Keep the Cursor Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Ctrl+PgUp</source> + <translation>Ctrl+PgUp</translation> + </message> + <message> + <source>Move the View a Page Down and Keep the Cursor Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Ctrl+PgDown</source> + <translation>Ctrl+PgDown</translation> + </message> + <message> + <source>Move the View a Line Up and Keep the Cursor Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Ctrl+Up</source> + <translation>Ctrl+Up</translation> + </message> + <message> + <source>Move the View a Line Down and Keep the Cursor Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Ctrl+Down</source> + <translation>Ctrl+Down</translation> + </message> + <message> + <source>Select Encoding...</source> + <translation>Обрати кодуваннÑ...</translation> + </message> + <message> + <source>Paste from Clipboard History</source> + <translation>Ð’Ñтавити з Ñ–Ñторії буферу обміну</translation> + </message> + <message> + <source>Ctrl+Shift+V</source> + <translation>Ctrl+Shift+V</translation> + </message> + <message> + <source>Auto-&indent Selection</source> + <translation>Ðвтовід&Ñтупи у виділеному</translation> + </message> + <message> + <source>Ctrl+I</source> + <translation>Ctrl+I</translation> + </message> + <message> + <source>&Rewrap Paragraph</source> + <translation>Пере&робити переноÑи в абзаці</translation> + </message> + <message> + <source>Meta+E, R</source> + <translation>Meta+E, R</translation> + </message> + <message> + <source>Ctrl+E, R</source> + <translation>Ctrl+E, R</translation> + </message> + <message> + <source>&Visualize Whitespace</source> + <translation>&Візуалізовувати пропуÑки</translation> + </message> + <message> + <source>Meta+E, Meta+V</source> + <translation>Meta+E, Meta+V</translation> + </message> + <message> + <source>Ctrl+E, Ctrl+V</source> + <translation>Ctrl+E, Ctrl+V</translation> + </message> + <message> + <source>Clean Whitespace</source> + <translation>ОчиÑтити пропуÑки</translation> + </message> + <message> + <source>Enable Text &Wrapping</source> + <translation>Увімкнути &перенеÑÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту</translation> + </message> + <message> + <source>Meta+E, Meta+W</source> + <translation>Meta+E, Meta+W</translation> + </message> + <message> + <source>Ctrl+E, Ctrl+W</source> + <translation>Ctrl+E, Ctrl+W</translation> + </message> + <message> + <source>Toggle Comment &Selection</source> + <translation>Роз&коментувати/закоментувати виділене</translation> + </message> + <message> + <source>Ctrl+/</source> + <translation>Ctrl+/</translation> + </message> + <message> + <source>Cut &Line</source> + <translation>Вирі&зати Ñ€Ñдок</translation> + </message> + <message> + <source>Shift+Del</source> + <translation>Shift+Del</translation> + </message> + <message> + <source>Copy &Line</source> + <translation>&Копіювати Ñ€Ñдок</translation> + </message> + <message> + <source>Ctrl+Ins</source> + <translation>Ctrl+Ins</translation> + </message> + <message> + <source>Uppercase Selection</source> + <translation>До верхнього регіÑтру</translation> + </message> + <message> + <source>Meta+Shift+U</source> + <translation>Meta+Shift+U</translation> + </message> + <message> + <source>Alt+Shift+U</source> + <translation>Alt+Shift+U</translation> + </message> + <message> + <source>Lowercase Selection</source> + <translation>До нижнього регіÑтру</translation> + </message> + <message> + <source>Meta+U</source> + <translation>Meta+U</translation> + </message> + <message> + <source>Alt+U</source> + <translation>Alt+U</translation> + </message> + <message> + <source>Fold</source> + <translation>Згорнути</translation> + </message> + <message> + <source>Ctrl+<</source> + <translation>Ctrl+<</translation> + </message> + <message> + <source>Unfold</source> + <translation>Розгорнути</translation> + </message> + <message> + <source>Ctrl+></source> + <translation>Ctrl+></translation> + </message> + <message> + <source>Toggle &Fold All</source> + <translation>Роз&горнути/згорнути вÑе</translation> + </message> + <message> + <source>Increase Font Size</source> + <translation>Збільшити розмір шрифту</translation> + </message> + <message> + <source>Ctrl++</source> + <translation>Ctrl++</translation> + </message> + <message> + <source>Decrease Font Size</source> + <translation>Зменшити розмір шрифту</translation> + </message> + <message> + <source>Ctrl+-</source> + <translation>Ctrl+-</translation> + </message> + <message> + <source>Reset Font Size</source> + <translation>Відновити розмір шрифту</translation> + </message> + <message> + <source>Meta+0</source> + <translation>Meta+0</translation> + </message> + <message> + <source>Ctrl+0</source> + <translation>Ctrl+0</translation> + </message> + <message> + <source>Go to Block Start</source> + <translation>Перейти на початок блока</translation> + </message> + <message> + <source>Ctrl+[</source> + <translation>Ctrl+[</translation> + </message> + <message> + <source>Go to Block End</source> + <translation>Перейти на кінець блока</translation> + </message> + <message> + <source>Ctrl+]</source> + <translation>Ctrl+]</translation> + </message> + <message> + <source>Select Block Up</source> + <translation>Виділити блок вгору</translation> + </message> + <message> + <source>Ctrl+U</source> + <translation>Ctrl+U</translation> + </message> + <message> + <source>Select Block Down</source> + <translation>Виділити блок вниз</translation> + </message> + <message> + <source>Go to Line Start</source> + <translation>Перейти на початок Ñ€Ñдка</translation> + </message> + <message> + <source>Go to Line End</source> + <translation>Перейти на кінець Ñ€Ñдка</translation> + </message> + <message> + <source>Go to Next Line</source> + <translation>Перейти на наÑтупний Ñ€Ñдок</translation> + </message> + <message> + <source>Go to Previous Line</source> + <translation>Перейти на попередній Ñ€Ñдок</translation> + </message> + <message> + <source>Go to Previous Character</source> + <translation>Перейти до попереднього Ñимволу</translation> + </message> + <message> + <source>Go to Next Character</source> + <translation>Перейти до наÑтупного Ñимволу</translation> + </message> + <message> + <source>Go to Previous Word</source> + <translation>Перейти до попереднього Ñлова</translation> + </message> + <message> + <source>Go to Next Word</source> + <translation>Перейти до наÑтупного Ñлова</translation> + </message> + <message> + <source>Go to Previous Word Camel Case</source> + <translation>Перейти до попереднього Ñлова у Camel Case</translation> + </message> + <message> + <source>Go to Next Word Camel Case</source> + <translation>Перейти до наÑтупного Ñлова у Camel Case</translation> + </message> + <message> + <source>Go to Line Start with Selection</source> + <translation>Перейти на початок Ñ€Ñдка у виділеному</translation> + </message> + <message> + <source>Go to Line End with Selection</source> + <translation>Перейти на кінець Ñ€Ñдка у виділеному</translation> + </message> + <message> + <source>Go to Next Line with Selection</source> + <translation>Перейти на наÑтупний Ñ€Ñдок у виділеному</translation> + </message> + <message> + <source>Go to Previous Line with Selection</source> + <translation>Перейти на попередній Ñ€Ñдок у виділеному</translation> + </message> + <message> + <source>Go to Previous Character with Selection</source> + <translation>Перейти до попереднього Ñимволу у виділеному</translation> + </message> + <message> + <source>Go to Next Character with Selection</source> + <translation>Перейти до наÑтупного Ñимволу у виділеному</translation> + </message> + <message> + <source>Go to Previous Word with Selection</source> + <translation>Перейти до попереднього Ñлова у виділеному</translation> + </message> + <message> + <source>Go to Next Word with Selection</source> + <translation>Перейти до наÑтупного Ñлова у виділеному</translation> + </message> + <message> + <source>Go to Previous Word Camel Case with Selection</source> + <translation>Перейти до попереднього Ñлова у Camel Case у виділеному</translation> + </message> + <message> + <source>Go to Next Word Camel Case with Selection</source> + <translation>Перейти до наÑтупного Ñлова у Camel Case у виділеному</translation> + </message> + <message> + <source><line>:<column></source> + <translation><Ñ€Ñдок>:<Ñтовпець></translation> + </message> +</context> +<context> + <name>VcsBase::BaseCheckoutWizardFactory</name> + <message> + <source>Cannot Open Project</source> + <translation>Ðеможливо відкрити проект</translation> + </message> + <message> + <source>Failed to open project in "%1".</source> + <translation>Збій Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ в "%1".</translation> + </message> + <message> + <source>Could not find any project files matching (%1) in the directory "%2".</source> + <translation>Ðе вдалоÑÑŒ знайти жодних файлів проекту, що відповідають (%1), в теці "%2".</translation> + </message> + <message> + <source>"%1" does not exist.</source> + <translation>"%1" не Ñ–Ñнує.</translation> + </message> +</context> +<context> + <name>WinRt::Internal::WinRtDebugSupport</name> + <message> + <source>The WinRT debugging helper is missing from your Qt Creator installation. It was assumed to be located at</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot start the WinRT Runner Tool.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot establish connection to the WinRT debugging helper.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot extract the PID from the WinRT debugging helper. (output: %1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot create an appropriate run control for the current run configuration.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>WinRt::Internal::WinRtRunnerHelper</name> + <message> + <source>The current kit has no Qt version.</source> + <translation>Поточний комплект не має верÑÑ–Ñ— Qt.</translation> + </message> + <message> + <source>Cannot find winrtrunner.exe in "%1".</source> + <translation>Ðе вдалоÑÑŒ знайти winrtrunner.exe в "%1".</translation> + </message> + <message> + <source>Error while executing the WinRT Runner Tool: %1 +</source> + <translation>Помилка під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ WinRT Runner Tool: %1 +</translation> + </message> +</context> +<context> + <name>QbsProjectManager::Internal::QbsRootProjectNode</name> + <message> + <source>Qbs files</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 0d903c226f..3f240c93ee 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -25,6 +25,7 @@ QtcLibrary { files: [ "QtConcurrentTools", + "algorithm.h", "annotateditemdelegate.cpp", "annotateditemdelegate.h", "ansiescapecodehandler.cpp", diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 51c9af54a3..e484e0e094 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -37,8 +37,10 @@ #include <debugger/debuggerrunconfigurationaspect.h> #include <projectexplorer/target.h> +#include <qtsupport/qtkitinformation.h> #include <utils/qtcassert.h> +#include <QDir> #include <QTime> #include <QtConcurrentRun> #include <QTemporaryFile> @@ -93,6 +95,10 @@ AndroidRunner::AndroidRunner(QObject *parent, m_pongFile = _("/data/local/tmp/qt/debug-pong-") + m_packageName; m_gdbserverSocket = packageDir + _("/debug-socket"); m_gdbserverPath = packageDir + _("/lib/gdbserver"); + const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); + if (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0)) + m_gdbserverPath += _(".so"); + m_gdbserverCommand = m_gdbserverPath + _(" --multi +") + m_gdbserverSocket; // Detect busybox, as we need to pass -w to ps to get wide output. QProcess psProc; @@ -292,7 +298,7 @@ void AndroidRunner::asyncStart() // Handling ping. for (int i = 0; ; ++i) { - QTemporaryFile tmp(_("pingpong")); + QTemporaryFile tmp(QDir::tempPath() + _("/pingpong")); tmp.open(); tmp.close(); @@ -324,7 +330,7 @@ void AndroidRunner::asyncStart() void AndroidRunner::handleRemoteDebuggerRunning() { if (m_useCppDebugger) { - QTemporaryFile tmp(_("pingpong")); + QTemporaryFile tmp(QDir::tempPath() + _("/pingpong")); tmp.open(); QProcess process; diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 7243f99de5..d50f91006d 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -592,8 +592,8 @@ void AndroidSettingsWidget::showGdbWarningDialog() tr("Unsupported GDB"), tr("The GDB inside this NDK seems to not support Python. " "The Qt Project offers fixed GDB builds at: " - "<a href=\"http://download.qt-project.org/official_releases/gdb/osx/\">" - "http://download.qt-project.org/official_releases/gdb/osx/</a>")); + "<a href=\"http://download.qt-project.org/official_releases/gdb/\">" + "http://download.qt-project.org/official_releases/gdb/</a>")); } void AndroidSettingsWidget::manageAVD() diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 9e5d7715ef..f42d8bf837 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1629,6 +1629,8 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document) const QString filter = MimeDatabase::allFiltersString(); QString selectedFilter = MimeDatabase::findByFile(QFileInfo(document->filePath())).filterString(); + if (selectedFilter.isEmpty()) + selectedFilter = MimeDatabase::findByType(document->mimeType()).filterString(); const QString &absoluteFilePath = DocumentManager::getSaveAsFileName(document, filter, &selectedFilter); diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 3f34e60beb..ddd064a663 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -611,6 +611,7 @@ void DiffEditor::showDiffEditor(QWidget *newEditor) writeCurrentDiffEditorSetting(m_currentEditor); updateDiffEditorSwitcher(); + widget()->setFocusProxy(m_currentEditor); } QWidget *DiffEditor::readLegacyCurrentDiffEditorSetting() diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp index 7ff6a98348..c07adfc787 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorcontroller.cpp @@ -272,4 +272,14 @@ void DiffEditorController::requestChunkActions(QMenu *menu, emit chunkActionsRequested(menu, diffFileIndex, chunkIndex); } +void DiffEditorController::requestSaveState() +{ + emit saveStateRequested(); +} + +void DiffEditorController::requestRestoreState() +{ + emit restoreStateRequested(); +} + } // namespace DiffEditor diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h index 8314e1bda2..4505d5f5b9 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.h +++ b/src/plugins/diffeditor/diffeditorcontroller.h @@ -73,6 +73,8 @@ public slots: void requestChunkActions(QMenu *menu, int diffFileIndex, int chunkIndex); + void requestSaveState(); + void requestRestoreState(); void branchesForCommitReceived(const QString &output); void expandBranchesRequested(); @@ -87,6 +89,8 @@ signals: void chunkActionsRequested(QMenu *menu, int diffFileIndex, int chunkIndex); + void saveStateRequested(); + void restoreStateRequested(); void expandBranchesRequested(const QString &revision); void reloaderChanged(DiffEditorReloader *reloader); diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 817f0d946c..b65be0c10f 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -46,6 +46,7 @@ DiffEditorDocument::DiffEditorDocument() : m_controller(new DiffEditorController(this)) { setId(Constants::DIFF_EDITOR_ID); + setMimeType(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE)); setTemporary(true); } diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 6c6346998a..63a29d985e 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -132,7 +132,9 @@ void SimpleDiffEditorReloader::reload() QList<FileData> fileDataList; fileDataList << fileData; + controller()->requestSaveState(); controller()->setDiffFiles(fileDataList); + controller()->requestRestoreState(); reloadFinished(); } @@ -299,6 +301,25 @@ void DiffEditor::Internal::DiffEditorPlugin::testMakePatch_data() rows.clear(); rows << RowData(_("ABCD")); + rows << RowData(_(""), TextLineData::Separator); + rows << RowData(_(""), TextLineData::Separator); + chunk.rows = rows; + patchText = header + _("@@ -1,2 +1,1 @@\n" + "-ABCD\n" + "-\n" + "+ABCD\n" + "\\ No newline at end of file\n"); + + QTest::newRow("Two last EOLs removed") << chunk + << fileName + << fileName + << true + << patchText; + + /////////// + + rows.clear(); + rows << RowData(_("ABCD")); rows << RowData(TextLineData::Separator, _("")); chunk.rows = rows; patchText = header + _("@@ -1,1 +1,1 @@\n" @@ -418,6 +439,26 @@ void DiffEditor::Internal::DiffEditorPlugin::testMakePatch_data() << fileName << false << patchText; + + /////////// + + rows.clear(); + rows << RowData(_("ABCD")); + rows << RowData(TextLineData::Separator, _("")); + rows << RowData(_(""), _("EFGH")); + chunk.rows = rows; + patchText = header + _("@@ -1,1 +1,3 @@\n" + " ABCD\n" + "+\n" + "+EFGH\n" + "\\ No newline at end of file\n"); + + QTest::newRow("Blank line followed by No newline") + << chunk + << fileName + << fileName + << true + << patchText; } void DiffEditor::Internal::DiffEditorPlugin::testMakePatch() @@ -748,6 +789,37 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data() QTest::newRow("2 chunks - first ends with blank line") << patch << fileDataList4; + + ////////////// + + patch = _("diff --git a/file foo.txt b/file foo.txt\n" + "index 1234567..9876543 100644\n" + "--- a/file foo.txt\n" + "+++ b/file foo.txt\n" + "@@ -1,1 +1,3 @@ void DiffEditor::ctor()\n" + " ABCD\n" + "+\n" + "+EFGH\n" + "\\ No newline at end of file\n"); + + fileData1.leftFileInfo = DiffFileInfo(_("file foo.txt"), _("1234567")); + fileData1.rightFileInfo = DiffFileInfo(_("file foo.txt"), _("9876543")); + fileData1.fileOperation = FileData::ChangeFile; + chunkData1.leftStartingLineNumber = 0; + chunkData1.rightStartingLineNumber = 0; + rows1.clear(); + rows1 << RowData(_("ABCD")); + rows1 << RowData(TextLineData::Separator, _("")); + rows1 << RowData(_(""), _("EFGH")); + chunkData1.rows = rows1; + fileData1.chunks.clear(); + fileData1.chunks << chunkData1; + + QList<FileData> fileDataList5; + fileDataList5 << fileData1; + + QTest::newRow("Blank line followed by No newline") << patch + << fileDataList5; } void DiffEditor::Internal::DiffEditorPlugin::testReadPatch() diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index c483eb3b89..a51e4182b8 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -362,15 +362,33 @@ QString DiffUtils::makePatch(const ChunkData &chunkData, int rightLineCount = 0; QList<TextLineData> leftBuffer, rightBuffer; - int lastEqualRow = -1; + int rowToBeSplit = -1; + if (lastChunk) { - for (int i = chunkData.rows.count(); i > 0; i--) { - if (chunkData.rows.at(i - 1).equal) { - if (i != chunkData.rows.count()) - lastEqualRow = i - 1; + // Detect the case when the last equal line is followed by + // only separators on left or on right. In that case + // the last equal line needs to be split. + const int rowCount = chunkData.rows.count(); + int i = 0; + for (i = rowCount; i > 0; i--) { + const RowData &rowData = chunkData.rows.at(i - 1); + if (rowData.leftLine.textLineType != TextLineData::Separator + || rowData.rightLine.textLineType != TextLineData::TextLine) break; - } } + const int leftSeparator = i; + for (i = rowCount; i > 0; i--) { + const RowData &rowData = chunkData.rows.at(i - 1); + if (rowData.rightLine.textLineType != TextLineData::Separator + || rowData.leftLine.textLineType != TextLineData::TextLine) + break; + } + const int rightSeparator = i; + const int commonSeparator = qMin(leftSeparator, rightSeparator); + if (commonSeparator > 0 + && commonSeparator < rowCount + && chunkData.rows.at(commonSeparator - 1).equal) + rowToBeSplit = commonSeparator - 1; } for (int i = 0; i <= chunkData.rows.count(); i++) { @@ -379,7 +397,7 @@ QString DiffUtils::makePatch(const ChunkData &chunkData, : RowData(TextLineData(TextLineData::Separator)); // dummy, // ensure we process buffers to the end. // rowData will be equal - if (rowData.equal && i != lastEqualRow) { + if (rowData.equal && i != rowToBeSplit) { if (leftBuffer.count()) { for (int j = 0; j < leftBuffer.count(); j++) { const QString line = makePatchLine(QLatin1Char('-'), @@ -439,7 +457,9 @@ QString DiffUtils::makePatch(const ChunkData &chunkData, + QString::number(chunkData.rightStartingLineNumber + 1) + QLatin1Char(',') + QString::number(rightLineCount) - + QLatin1String(" @@\n"); + + QLatin1String(" @@") + + chunkData.contextInfo + + QLatin1Char('\n'); diffText.prepend(chunkLine); @@ -530,8 +550,6 @@ static QList<RowData> readLines(const QString &patch, Diff &last = diffList.last(); if (last.text.isEmpty()) break; - if (last.text.at(0) == newLine) // there is a new line - break; if (last.command == Diff::Equal) { if (noNewLineInEqual >= 0) @@ -690,7 +708,7 @@ static QList<ChunkData> readChunks(const QString &patch, // @@ -leftPos[,leftCount] +rightPos[,rightCount] @@ "@@ -(\\d+)(?:,\\d+)? \\+(\\d+)(?:,\\d+)? @@" // optional hint (e.g. function name) - "(?:\\ +[^\\n]*)?" + "(\\ +[^\\n]*)?" // end of line (need to be followed by text line) "(?:\\n))")); @@ -706,6 +724,7 @@ static QList<ChunkData> readChunks(const QString &patch, const QString captured = capturedTexts.at(1); const int leftStartingPos = capturedTexts.at(2).toInt(); const int rightStartingPos = capturedTexts.at(3).toInt(); + const QString contextInfo = capturedTexts.at(4); if (endOfLastChunk > 0) { const QString lines = patch.mid(endOfLastChunk, pos - endOfLastChunk); @@ -722,6 +741,7 @@ static QList<ChunkData> readChunks(const QString &patch, ChunkData chunkData; chunkData.leftStartingLineNumber = leftStartingPos - 1; chunkData.rightStartingLineNumber = rightStartingPos - 1; + chunkData.contextInfo = contextInfo; chunkDataList.append(chunkData); } while ((pos = chunkRegExp.indexIn(patch, pos)) != -1); diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h index b649538026..407e6e1551 100644 --- a/src/plugins/diffeditor/diffutils.h +++ b/src/plugins/diffeditor/diffutils.h @@ -95,6 +95,7 @@ public: bool contextChunk; int leftStartingLineNumber; int rightStartingLineNumber; + QString contextInfo; }; class DIFFEDITOR_EXPORT FileData { diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 9e530f15c2..7a895e9ac8 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -154,6 +154,8 @@ public: public slots: void setDisplaySettings(const DisplaySettings &ds); + void saveStateRequested(); + void restoreStateRequested(); signals: void jumpToOriginalFileRequested(int diffFileIndex, @@ -205,6 +207,7 @@ private: QColor m_fileLineForeground; QColor m_chunkLineForeground; QColor m_textForeground; + QByteArray m_state; // MultiHighlighter *m_highlighter; }; @@ -338,6 +341,23 @@ SideDiffEditorWidget::SideDiffEditorWidget(QWidget *parent) // baseTextDocument()->setSyntaxHighlighter(m_highlighter); } +void SideDiffEditorWidget::saveStateRequested() +{ + if (!m_state.isNull()) + return; + + m_state = saveState(); +} + +void SideDiffEditorWidget::restoreStateRequested() +{ + if (m_state.isNull()) + return; + + restoreState(m_state); + m_state.clear(); +} + void SideDiffEditorWidget::setDisplaySettings(const DisplaySettings &ds) { DisplaySettings settings = displaySettings(); @@ -836,6 +856,7 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent) QVBoxLayout *l = new QVBoxLayout(this); l->setMargin(0); l->addWidget(m_splitter); + setFocusProxy(m_rightEditor); clear(tr("No controller")); } @@ -856,6 +877,14 @@ void SideBySideDiffEditorWidget::setDiffEditorGuiController( this, SLOT(clearAll(QString))); disconnect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), this, SLOT(setDiff(QList<FileData>,QString))); + disconnect(m_controller, SIGNAL(saveStateRequested()), + m_leftEditor, SLOT(saveStateRequested())); + disconnect(m_controller, SIGNAL(saveStateRequested()), + m_rightEditor, SLOT(saveStateRequested())); + disconnect(m_controller, SIGNAL(restoreStateRequested()), + m_leftEditor, SLOT(restoreStateRequested())); + disconnect(m_controller, SIGNAL(restoreStateRequested()), + m_rightEditor, SLOT(restoreStateRequested())); disconnect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), this, SLOT(setCurrentDiffFileIndex(int))); @@ -871,6 +900,14 @@ void SideBySideDiffEditorWidget::setDiffEditorGuiController( this, SLOT(clearAll(QString))); connect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), this, SLOT(setDiff(QList<FileData>,QString))); + connect(m_controller, SIGNAL(saveStateRequested()), + m_leftEditor, SLOT(saveStateRequested())); + connect(m_controller, SIGNAL(saveStateRequested()), + m_rightEditor, SLOT(saveStateRequested())); + connect(m_controller, SIGNAL(restoreStateRequested()), + m_leftEditor, SLOT(restoreStateRequested())); + connect(m_controller, SIGNAL(restoreStateRequested()), + m_rightEditor, SLOT(restoreStateRequested())); connect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), this, SLOT(setCurrentDiffFileIndex(int))); @@ -936,11 +973,6 @@ void SideBySideDiffEditorWidget::setCurrentDiffFileIndex(int diffFileIndex) void SideBySideDiffEditorWidget::showDiff() { - // TODO: remember the line number of the line in the middle - const int verticalValue = m_leftEditor->verticalScrollBar()->value(); - const int leftHorizontalValue = m_leftEditor->horizontalScrollBar()->value(); - const int rightHorizontalValue = m_rightEditor->horizontalScrollBar()->value(); - clear(tr("No difference")); QMap<int, QList<DiffSelection> > leftFormats; @@ -1151,11 +1183,6 @@ void SideBySideDiffEditorWidget::showDiff() } m_foldingBlocker = false; */ - m_leftEditor->verticalScrollBar()->setValue(verticalValue); - m_rightEditor->verticalScrollBar()->setValue(verticalValue); - m_leftEditor->horizontalScrollBar()->setValue(leftHorizontalValue); - m_rightEditor->horizontalScrollBar()->setValue(rightHorizontalValue); - // m_leftEditor->updateFoldingHighlight(QPoint(-1, -1)); // m_rightEditor->updateFoldingHighlight(QPoint(-1, -1)); } diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 063160c854..be7a4f7782 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -134,6 +134,10 @@ void UnifiedDiffEditorWidget::setDiffEditorGuiController( this, SLOT(clearAll(QString))); disconnect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), this, SLOT(setDiff(QList<FileData>,QString))); + disconnect(m_controller, SIGNAL(saveStateRequested()), + this, SLOT(saveStateRequested())); + disconnect(m_controller, SIGNAL(restoreStateRequested()), + this, SLOT(restoreStateRequested())); disconnect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), this, SLOT(setCurrentDiffFileIndex(int))); @@ -149,6 +153,10 @@ void UnifiedDiffEditorWidget::setDiffEditorGuiController( this, SLOT(clearAll(QString))); connect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), this, SLOT(setDiff(QList<FileData>,QString))); + connect(m_controller, SIGNAL(saveStateRequested()), + this, SLOT(saveStateRequested())); + connect(m_controller, SIGNAL(restoreStateRequested()), + this, SLOT(restoreStateRequested())); connect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), this, SLOT(setCurrentDiffFileIndex(int))); @@ -158,6 +166,23 @@ void UnifiedDiffEditorWidget::setDiffEditorGuiController( } } +void UnifiedDiffEditorWidget::saveStateRequested() +{ + if (!m_state.isNull()) + return; + + m_state = saveState(); +} + +void UnifiedDiffEditorWidget::restoreStateRequested() +{ + if (m_state.isNull()) + return; + + restoreState(m_state); + m_state.clear(); +} + DiffEditorGuiController *UnifiedDiffEditorWidget::diffEditorGuiController() const { return m_guiController; @@ -613,7 +638,9 @@ QString UnifiedDiffEditorWidget::showChunk(const ChunkData &chunkData, + QString::number(chunkData.rightStartingLineNumber+ 1) + QLatin1Char(',') + QString::number(rightLineCount) - + QLatin1String(" @@\n"); + + QLatin1String(" @@") + + chunkData.contextInfo + + QLatin1Char('\n'); diffText.prepend(chunkLine); diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h index dc94d22660..69ffb65823 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.h +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h @@ -87,6 +87,8 @@ private slots: void slotSendChunkToCodePaster(); void slotApplyChunk(); void slotRevertChunk(); + void saveStateRequested(); + void restoreStateRequested(); private: void setLeftLineNumber(int blockNumber, int lineNumber); @@ -139,6 +141,7 @@ private: QTextCharFormat m_rightLineFormat; QTextCharFormat m_leftCharFormat; QTextCharFormat m_rightCharFormat; + QByteArray m_state; }; } // namespace DiffEditor diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 13a5eb9a4d..a09938d876 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -160,9 +160,10 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev updateCommits(m_ui->localBranchComboBox->currentIndex()); setRemoteBranches(); + QRegExpValidator *noSpaceValidator = new QRegExpValidator(QRegExp(QLatin1String("^\\S+$")), this); m_ui->reviewersLineEdit->setText(reviewerList); - - m_ui->topicLineEdit->setValidator(new QRegExpValidator(QRegExp(QLatin1String("^\\S+$")), this)); + m_ui->reviewersLineEdit->setValidator(noSpaceValidator); + m_ui->topicLineEdit->setValidator(noSpaceValidator); m_valid = true; } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index e5576ed57e..714c792927 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -124,13 +124,19 @@ public: private slots: void slotShowDescriptionReceived(const QString &data); - void slotDiffOutputReceived(const QString &contents); + void slotTextualDiffOutputReceived(const QString &contents); private: void postCollectShowDescription(const QString &id); - void postCollectDiffOutput(const QStringList &arguments); - void postCollectDiffOutput(const QList<QStringList> &argumentsList); - void addJob(VcsBase::Command *command, const QStringList &arguments); + void postCollectTextualDiffOutputUsingDiffCommand(const QStringList &arguments); + void postCollectTextualDiffOutputUsingDiffCommand(const QList<QStringList> &argumentsList); + void postCollectTextualDiffOutputUsingShowCommand(const QStringList &arguments); + void postCollectTextualDiffOutput(const QString &gitCommand, + const QList<QStringList> &argumentsList); + void addJob(VcsBase::Command *command, + const QString &gitCommand, + const QStringList &arguments); + QStringList addHeadWhenCommandInProgress() const; int timeout() const; QProcessEnvironment processEnvironment() const; Utils::FileName gitPath() const; @@ -154,7 +160,9 @@ GitDiffHandler::GitDiffHandler(DiffEditor::DiffEditorController *controller, void GitDiffHandler::diffFile(const QString &fileName) { - postCollectDiffOutput(QStringList() << QLatin1String("--") << fileName); + postCollectTextualDiffOutputUsingDiffCommand(addHeadWhenCommandInProgress() + << QLatin1String("--") + << fileName); } void GitDiffHandler::diffFiles(const QStringList &stagedFileNames, @@ -169,28 +177,31 @@ void GitDiffHandler::diffFiles(const QStringList &stagedFileNames, arguments << stagedArguments; if (!unstagedFileNames.isEmpty()) { - QStringList unstagedArguments; + QStringList unstagedArguments = addHeadWhenCommandInProgress(); unstagedArguments << QLatin1String("--"); unstagedArguments << unstagedFileNames; arguments << unstagedArguments; } - postCollectDiffOutput(arguments); + postCollectTextualDiffOutputUsingDiffCommand(arguments); } void GitDiffHandler::diffProjects(const QStringList &projectPaths) { - postCollectDiffOutput(QStringList() << QLatin1String("--") << projectPaths); + postCollectTextualDiffOutputUsingDiffCommand(addHeadWhenCommandInProgress() + << QLatin1String("--") + << projectPaths); } void GitDiffHandler::diffRepository() { - postCollectDiffOutput(QStringList()); + postCollectTextualDiffOutputUsingDiffCommand(addHeadWhenCommandInProgress()); } void GitDiffHandler::diffBranch(const QString &branchName) { - postCollectDiffOutput(QStringList() << branchName); + postCollectTextualDiffOutputUsingDiffCommand(addHeadWhenCommandInProgress() + << branchName); } void GitDiffHandler::show(const QString &id) @@ -206,6 +217,7 @@ void GitDiffHandler::postCollectShowDescription(const QString &id) return; } + m_controller->requestSaveState(); m_controller->clear(m_waitMessage); VcsBase::Command *command = new VcsBase::Command(gitPath(), m_workingDirectory, @@ -231,7 +243,11 @@ void GitDiffHandler::slotShowDescriptionReceived(const QString &description) return; } - postCollectDiffOutput(QStringList() << m_id + QLatin1Char('^') << m_id); + postCollectTextualDiffOutputUsingShowCommand(QStringList() + << QLatin1String("--format=format:") // omit header, already generated + << QLatin1String(noColorOption) + << QLatin1String(decorateOption) + << m_id); // need to be called after postCollectDiffOutput(), since it clears the description m_controller->setDescription( @@ -239,10 +255,14 @@ void GitDiffHandler::slotShowDescriptionReceived(const QString &description) description)); } -void GitDiffHandler::addJob(VcsBase::Command *command, const QStringList &arguments) +void GitDiffHandler::addJob(VcsBase::Command *command, + const QString &gitCommand, + const QStringList &arguments) { QStringList args; - args << QLatin1String("diff"); + args << gitCommand; + args << QLatin1String("-m"); // show diff agains parents instead of merge commits + args << QLatin1String("--first-parent"); // show only first parent if (m_controller->isIgnoreWhitespace()) args << QLatin1String("--ignore-space-change"); args << QLatin1String("--unified=") + QString::number( @@ -251,34 +271,57 @@ void GitDiffHandler::addJob(VcsBase::Command *command, const QStringList &argume command->addJob(args, timeout()); } -void GitDiffHandler::postCollectDiffOutput(const QStringList &arguments) +QStringList GitDiffHandler::addHeadWhenCommandInProgress() const { - postCollectDiffOutput(QList<QStringList>() << arguments); + QStringList args; + // This is workaround for lack of support for merge commits and resolving conflicts, + // we compare the current state of working tree to the HEAD of current branch + // instead of showing unsupported combined diff format. + GitClient::CommandInProgress commandInProgress = m_gitClient->checkCommandInProgress(m_workingDirectory); + if (commandInProgress != GitClient::NoCommand) + args << QLatin1String(HEAD); + return args; } -void GitDiffHandler::postCollectDiffOutput(const QList<QStringList> &argumentsList) +void GitDiffHandler::postCollectTextualDiffOutputUsingDiffCommand(const QStringList &arguments) +{ + postCollectTextualDiffOutputUsingDiffCommand(QList<QStringList>() << arguments); +} + +void GitDiffHandler::postCollectTextualDiffOutputUsingDiffCommand(const QList<QStringList> &argumentsList) +{ + postCollectTextualDiffOutput(QLatin1String("diff"), argumentsList); +} + +void GitDiffHandler::postCollectTextualDiffOutputUsingShowCommand(const QStringList &arguments) +{ + postCollectTextualDiffOutput(QLatin1String("show"), QList<QStringList>() << arguments); +} + +void GitDiffHandler::postCollectTextualDiffOutput(const QString &gitCommand, const QList<QStringList> &argumentsList) { if (m_controller.isNull()) { deleteLater(); return; } + m_controller->requestSaveState(); m_controller->clear(m_waitMessage); VcsBase::Command *command = new VcsBase::Command(gitPath(), m_workingDirectory, processEnvironment()); command->setCodec(EditorManager::defaultTextCodec()); connect(command, SIGNAL(output(QString)), - this, SLOT(slotDiffOutputReceived(QString))); + this, SLOT(slotTextualDiffOutputReceived(QString))); command->addFlags(diffExecutionFlags()); for (int i = 0; i < argumentsList.count(); i++) - addJob(command, argumentsList.at(i)); + addJob(command, gitCommand, argumentsList.at(i)); command->execute(); } -void GitDiffHandler::slotDiffOutputReceived(const QString &contents) +void GitDiffHandler::slotTextualDiffOutputReceived(const QString &contents) { if (m_controller.isNull()) { deleteLater(); @@ -290,6 +333,7 @@ void GitDiffHandler::slotDiffOutputReceived(const QString &contents) = DiffEditor::DiffUtils::readPatch( contents, m_controller->isIgnoreWhitespace(), &ok); m_controller->setDiffFiles(fileDataList, m_workingDirectory); + m_controller->requestRestoreState(); deleteLater(); } @@ -713,7 +757,7 @@ GitClient::~GitClient() { } -QString GitClient::findRepositoryForDirectory(const QString &dir) +QString GitClient::findRepositoryForDirectory(const QString &dir) const { if (dir.isEmpty() || dir.endsWith(QLatin1String("/.git")) || dir.contains(QLatin1String("/.git/"))) { @@ -937,7 +981,7 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor( void GitClient::diff(const QString &workingDirectory, const QStringList &unstagedFileNames, - const QStringList &stagedFileNames) + const QStringList &stagedFileNames) const { GitDiffEditorReloader::DiffType diffType = GitDiffEditorReloader::DiffProjectList; @@ -968,19 +1012,24 @@ void GitClient::diff(const QString &workingDirectory, controller->setReloader(reloader); reloader->setWorkingDirectory(workingDirectory); - reloader->setDiffType(diffType); - if (diffType == GitDiffEditorReloader::DiffFileList) - reloader->setFileList(stagedFileNames, unstagedFileNames); - else if (diffType == GitDiffEditorReloader::DiffProjectList) - reloader->setProjectList(unstagedFileNames); } + DiffEditor::DiffEditorController *controller = diffEditorDocument->controller(); + GitDiffEditorReloader *reloader = static_cast<GitDiffEditorReloader *>(controller->reloader()); + reloader->setDiffType(diffType); + // we force setFileList, since the lists can be different + // e.g. when double click for the second time on different file inside commit editor + if (diffType == GitDiffEditorReloader::DiffFileList) + reloader->setFileList(stagedFileNames, unstagedFileNames); + else if (diffType == GitDiffEditorReloader::DiffProjectList) // the same when unstaged file was clicked + reloader->setProjectList(unstagedFileNames); + diffEditorDocument->controller()->requestReload(); EditorManager::activateEditorForDocument(diffEditorDocument); } -void GitClient::diff(const QString &workingDirectory, const QString &fileName) +void GitClient::diff(const QString &workingDirectory, const QString &fileName) const { const QString title = tr("Git Diff \"%1\"").arg(fileName); const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource( @@ -1006,7 +1055,7 @@ void GitClient::diff(const QString &workingDirectory, const QString &fileName) } void GitClient::diffBranch(const QString &workingDirectory, - const QString &branchName) + const QString &branchName) const { const QString title = tr("Git Diff Branch \"%1\"").arg(branchName); const QString documentId = QLatin1String("Branch:") + branchName; @@ -1521,7 +1570,7 @@ static inline bool splitCommitParents(const QString &line, } bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage) const { QByteArray outputTextData; QByteArray errorText; @@ -1545,7 +1594,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory, const QStringList &files /* = QStringList() */, const QString &revision, QStringList *parents, - QString *errorMessage) + QString *errorMessage) const { QString outputText; QString errorText; @@ -1578,7 +1627,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory, static const char defaultShortLogFormatC[] = "%h (%an \"%s"; static const int maxShortLogLength = 120; -QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision) +QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision) const { // Short SHA 1, author, subject QString output = synchronousShortDescription(workingDirectory, revision, @@ -1593,7 +1642,7 @@ QString GitClient::synchronousShortDescription(const QString &workingDirectory, return output; } -QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory) +QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory) const { QByteArray outputTextData; QStringList arguments; @@ -1611,7 +1660,7 @@ QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory } bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList *output, - QString *errorMessage) + QString *errorMessage) const { QStringList args; args << QLatin1String("show-ref") << QLatin1String("--head") @@ -1643,7 +1692,7 @@ bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList } // Retrieve topic (branch, tag or HEAD hash) -QString GitClient::synchronousTopic(const QString &workingDirectory) +QString GitClient::synchronousTopic(const QString &workingDirectory) const { // First try to find branch QString branch = synchronousCurrentLocalBranch(workingDirectory); @@ -1711,7 +1760,7 @@ QString GitClient::synchronousTopRevision(const QString &workingDirectory, QStri } void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const QString &revision, - QString &precedes, QString &follows) + QString &precedes, QString &follows) const { QByteArray pr; QStringList arguments; @@ -1789,7 +1838,7 @@ bool GitClient::isFastForwardMerge(const QString &workingDirectory, const QStrin // Format an entry in a one-liner for selection list using git log. QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision, - const QString &format) + const QString &format) const { QString description; QByteArray outputTextData; @@ -1831,7 +1880,7 @@ static inline QString creatorStashMessage(const QString &keyword = QString()) * StashIgnoreUnchanged: Be quiet about unchanged repositories (used for IVersionControl's snapshots). */ QString GitClient::synchronousStash(const QString &workingDirectory, const QString &messageKeyword, - unsigned flags, bool *unchanged) + unsigned flags, bool *unchanged) const { if (unchanged) *unchanged = false; @@ -1874,7 +1923,7 @@ QString GitClient::synchronousStash(const QString &workingDirectory, const QStri bool GitClient::executeSynchronousStash(const QString &workingDirectory, const QString &message, - QString *errorMessage) + QString *errorMessage) const { QByteArray outputText; QByteArray errorText; @@ -1893,7 +1942,7 @@ bool GitClient::executeSynchronousStash(const QString &workingDirectory, // Resolve a stash name from message bool GitClient::stashNameFromMessage(const QString &workingDirectory, const QString &message, QString *name, - QString *errorMessage) + QString *errorMessage) const { // All happy if (message.startsWith(QLatin1String(stashNamePrefix))) { @@ -1917,7 +1966,7 @@ bool GitClient::stashNameFromMessage(const QString &workingDirectory, } bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage) const { branchArgs.push_front(QLatin1String("branch")); QByteArray outputText; @@ -1931,7 +1980,7 @@ bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringLis } bool GitClient::synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage) const { tagArgs.push_front(QLatin1String("tag")); QByteArray outputText; @@ -1945,7 +1994,7 @@ bool GitClient::synchronousTagCmd(const QString &workingDirectory, QStringList t } bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStringList args, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage) const { args.push_front(QLatin1String("for-each-ref")); QByteArray outputText; @@ -1960,7 +2009,7 @@ bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStrin } bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, - QString *output, QString *errorMessage, bool silent) + QString *output, QString *errorMessage, bool silent) const { remoteArgs.push_front(QLatin1String("remote")); QByteArray outputText; @@ -1975,7 +2024,7 @@ bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringLis } QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDirectory, - QString *errorMessage) + QString *errorMessage) const { QMap<QString,QString> result; QString output; @@ -2001,7 +2050,7 @@ QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDi } QStringList GitClient::synchronousSubmoduleStatus(const QString &workingDirectory, - QString *errorMessage) + QString *errorMessage) const { QByteArray outputTextData; QByteArray errorText; @@ -2018,7 +2067,7 @@ QStringList GitClient::synchronousSubmoduleStatus(const QString &workingDirector return commandOutputLinesFromLocal8Bit(outputTextData); } -SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) +SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) const { SubmoduleDataMap result; QString gitmodulesFileName = workingDirectory + QLatin1String("/.gitmodules"); @@ -2076,7 +2125,7 @@ SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) } bool GitClient::synchronousShow(const QString &workingDirectory, const QString &id, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage) const { if (!canShow(id)) { *errorMessage = msgCannotShow(id); @@ -2253,7 +2302,7 @@ bool GitClient::isValidRevision(const QString &revision) const Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &workingDirectory, const QStringList &gitArguments, unsigned flags, - QTextCodec *outputCodec) + QTextCodec *outputCodec) const { return VcsBasePlugin::runVcs(workingDirectory, gitExecutable(), gitArguments, settings()->intValue(GitSettings::timeoutKey) * 1000, @@ -2339,7 +2388,7 @@ void GitClient::fetchFinished(const QVariant &cookie) } GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, StatusMode mode, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage) const { // Run 'status'. Note that git returns exitcode 1 if there are no added files. QByteArray outputText; @@ -2378,7 +2427,7 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, St return StatusUnchanged; } -QString GitClient::commandInProgressDescription(const QString &workingDirectory) +QString GitClient::commandInProgressDescription(const QString &workingDirectory) const { switch (checkCommandInProgress(workingDirectory)) { case NoCommand: @@ -2396,7 +2445,7 @@ QString GitClient::commandInProgressDescription(const QString &workingDirectory) return QString(); } -GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &workingDirectory) +GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &workingDirectory) const { const QString gitDir = findGitDirForRepository(workingDirectory); if (QFile::exists(gitDir + QLatin1String("/MERGE_HEAD"))) @@ -2490,7 +2539,7 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory, } } -QString GitClient::extendedShowDescription(const QString &workingDirectory, const QString &text) +QString GitClient::extendedShowDescription(const QString &workingDirectory, const QString &text) const { if (!text.startsWith(QLatin1String("commit "))) return text; @@ -2509,7 +2558,7 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons // Quietly retrieve branch list of remote repository URL // // The branch HEAD is pointing to is always returned first. -QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryURL) +QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryURL) const { QStringList arguments(QLatin1String("ls-remote")); arguments << repositoryURL << QLatin1String(HEAD) << QLatin1String("refs/heads/*"); @@ -3071,7 +3120,7 @@ void GitClient::fetch(const QString &workingDirectory, const QString &remote) bool GitClient::executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments, - const QString &abortCommand) + const QString &abortCommand) const { // Disable UNIX terminals to suppress SSH prompting. const unsigned flags = VcsBasePlugin::SshPasswordPrompt @@ -3374,7 +3423,7 @@ void GitClient::stashPop(const QString &workingDirectory) bool GitClient::synchronousStashRestore(const QString &workingDirectory, const QString &stash, bool pop, - const QString &branch /* = QString()*/) + const QString &branch /* = QString()*/) const { QStringList arguments(QLatin1String("stash")); if (branch.isEmpty()) @@ -3386,7 +3435,7 @@ bool GitClient::synchronousStashRestore(const QString &workingDirectory, bool GitClient::synchronousStashRemove(const QString &workingDirectory, const QString &stash /* = QString() */, - QString *errorMessage /* = 0 */) + QString *errorMessage /* = 0 */) const { QStringList arguments(QLatin1String("stash")); if (stash.isEmpty()) @@ -3408,7 +3457,7 @@ bool GitClient::synchronousStashRemove(const QString &workingDirectory, bool GitClient::synchronousStashList(const QString &workingDirectory, QList<Stash> *stashes, - QString *errorMessage /* = 0 */) + QString *errorMessage /* = 0 */) const { stashes->clear(); QStringList arguments(QLatin1String("stash")); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 2c2cfb141e..07af9a0a48 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -139,16 +139,16 @@ public: Utils::FileName gitExecutable(bool *ok = 0, QString *errorMessage = 0) const; unsigned gitVersion(QString *errorMessage = 0) const; - QString findRepositoryForDirectory(const QString &dir); + QString findRepositoryForDirectory(const QString &dir) const; QString findGitDirForRepository(const QString &repositoryDir) const; bool managesFile(const QString &workingDirectory, const QString &fileName) const; - void diff(const QString &workingDirectory, const QString &fileName); + void diff(const QString &workingDirectory, const QString &fileName) const; void diff(const QString &workingDirectory, const QStringList &unstagedFileNames, - const QStringList &stagedFileNames = QStringList()); + const QStringList &stagedFileNames = QStringList()) const; void diffBranch(const QString &workingDirectory, - const QString &branchName); + const QString &branchName) const; void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList()); void status(const QString &workingDirectory); @@ -193,57 +193,57 @@ public: enum { StashPromptDescription = 0x1, StashImmediateRestore = 0x2, StashIgnoreUnchanged = 0x4 }; QString synchronousStash(const QString &workingDirectory, const QString &messageKeyword = QString(), - unsigned flags = 0, bool *unchanged = 0); + unsigned flags = 0, bool *unchanged = 0) const; bool executeSynchronousStash(const QString &workingDirectory, const QString &message = QString(), - QString *errorMessage = 0); + QString *errorMessage = 0) const; bool synchronousStashRestore(const QString &workingDirectory, const QString &stash, bool pop = false, - const QString &branch = QString()); + const QString &branch = QString()) const; bool synchronousStashRemove(const QString &workingDirectory, const QString &stash = QString(), - QString *errorMessage = 0); + QString *errorMessage = 0) const; bool synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs, - QString *output, QString *errorMessage); + QString *output, QString *errorMessage) const; bool synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs, - QString *output, QString *errorMessage); + QString *output, QString *errorMessage) const; bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args, - QString *output, QString *errorMessage = 0); + QString *output, QString *errorMessage = 0) const; bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, - QString *output, QString *errorMessage, bool silent = false); + QString *output, QString *errorMessage, bool silent = false) const; QMap<QString,QString> synchronousRemotesList(const QString &workingDirectory, - QString *errorMessage = 0); + QString *errorMessage = 0) const; QStringList synchronousSubmoduleStatus(const QString &workingDirectory, - QString *errorMessage = 0); - SubmoduleDataMap submoduleList(const QString &workingDirectory); + QString *errorMessage = 0) const; + SubmoduleDataMap submoduleList(const QString &workingDirectory) const; bool synchronousShow(const QString &workingDirectory, const QString &id, - QString *output, QString *errorMessage); + QString *output, QString *errorMessage) const; bool synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments, - QString *output, QString *errorMessage = 0); + QString *output, QString *errorMessage = 0) const; bool synchronousParentRevisions(const QString &workingDirectory, const QStringList &files /* = QStringList() */, const QString &revision, QStringList *parents, - QString *errorMessage); - QString synchronousShortDescription(const QString &workingDirectory, const QString &revision); + QString *errorMessage) const; + QString synchronousShortDescription(const QString &workingDirectory, const QString &revision) const; QString synchronousShortDescription(const QString &workingDirectory, const QString &revision, - const QString &format); + const QString &format) const; - QString synchronousCurrentLocalBranch(const QString &workingDirectory); + QString synchronousCurrentLocalBranch(const QString &workingDirectory) const; bool synchronousHeadRefs(const QString &workingDirectory, QStringList *output, - QString *errorMessage = 0); - QString synchronousTopic(const QString &workingDirectory); + QString *errorMessage = 0) const; + QString synchronousTopic(const QString &workingDirectory) const; bool synchronousRevParseCmd(const QString &workingDirectory, const QString &ref, QString *output, QString *errorMessage = 0) const; QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0); void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision, - QString &precedes, QString &follows); + QString &precedes, QString &follows) const; bool isRemoteCommit(const QString &workingDirectory, const QString &commit); bool isFastForwardMerge(const QString &workingDirectory, const QString &branch); @@ -279,11 +279,11 @@ public: void revert(const QStringList &files, bool revertStaging); bool synchronousStashList(const QString &workingDirectory, QList<Stash> *stashes, - QString *errorMessage = 0); + QString *errorMessage = 0) const; // Resolve a stash name from message (for IVersionControl's names). bool stashNameFromMessage(const QString &workingDirectory, const QString &messge, QString *name, - QString *errorMessage = 0); + QString *errorMessage = 0) const; QString readConfigValue(const QString &workingDirectory, const QString &configVar) const; @@ -305,14 +305,14 @@ public: StatusResult gitStatus(const QString &workingDirectory, StatusMode mode, QString *output = 0, - QString *errorMessage = 0); + QString *errorMessage = 0) const; - CommandInProgress checkCommandInProgress(const QString &workingDirectory); - QString commandInProgressDescription(const QString &workingDirectory); + CommandInProgress checkCommandInProgress(const QString &workingDirectory) const; + QString commandInProgressDescription(const QString &workingDirectory) const; void continueCommandIfNeeded(const QString &workingDirectory, bool allowContinue = true); - QString extendedShowDescription(const QString &workingDirectory, const QString &text); + QString extendedShowDescription(const QString &workingDirectory, const QString &text) const; void launchGitK(const QString &workingDirectory, const QString &fileName); void launchGitK(const QString &workingDirectory) { launchGitK(workingDirectory, QString()); } @@ -321,7 +321,7 @@ public: void launchRepositoryBrowser(const QString &workingDirectory); - QStringList synchronousRepositoryBranches(const QString &repositoryURL); + QStringList synchronousRepositoryBranches(const QString &repositoryURL) const; GitSettings *settings() const; @@ -397,7 +397,7 @@ private: // log windows updating (using VcsBasePlugin::runVcs with flags). inline Utils::SynchronousProcessResponse synchronousGit(const QString &workingDirectory, const QStringList &arguments, - unsigned flags = 0, QTextCodec *outputCodec = 0); + unsigned flags = 0, QTextCodec *outputCodec = 0) const; // determine version as '(major << 16) + (minor << 8) + patch' or 0. unsigned synchronousGitVersion(QString *errorMessage = 0) const; @@ -409,7 +409,7 @@ private: bool revertStaging); void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd); bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments, - const QString &abortCommand = QString()); + const QString &abortCommand = QString()) const; bool tryLauchingGitK(const QProcessEnvironment &env, const QString &workingDirectory, const QString &fileName, diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 54c01975cd..8cea854e15 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -63,7 +63,7 @@ static int compareVersions(const QString &v1, const QString &v2) QStringList v1L = v1.split(QLatin1Char('.')); QStringList v2L = v2.split(QLatin1Char('.')); int i = 0; - while (v1.length() > i && v1.length() > i) { + while (v1L.length() > i && v2L.length() > i) { bool n1Ok, n2Ok; int n1 = v1L.value(i).toInt(&n1Ok); int n2 = v2L.value(i).toInt(&n2Ok); @@ -77,9 +77,9 @@ static int compareVersions(const QString &v1, const QString &v2) return 1; ++i; } - if (v1.length() > v2.length()) + if (v1L.length() > v2L.length()) return -1; - if (v1.length() < v2.length()) + if (v1L.length() < v2L.length()) return 1; return 0; } diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 2358920a2c..6f7ef0abe1 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -32,8 +32,11 @@ #include "projectexplorer.h" #include "project.h" +#include <utils/algorithm.h> + #include <coreplugin/id.h> #include <coreplugin/icore.h> +#include <coreplugin/editormanager/editormanager.h> #include <texteditor/basetexteditor.h> #include <texteditor/texteditorsettings.h> #include <texteditor/simplecodestylepreferences.h> @@ -82,6 +85,7 @@ struct EditorConfigurationPrivate QTextCodec *m_textCodec; QMap<Core::Id, ICodeStylePreferences *> m_languageCodeStylePreferences; + QList<BaseTextEditor *> m_editors; }; EditorConfiguration::EditorConfiguration() : d(new EditorConfigurationPrivate) @@ -116,6 +120,8 @@ EditorConfiguration::EditorConfiguration() : d(new EditorConfigurationPrivate) connect(SessionManager::instance(), SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)), this, SLOT(slotAboutToRemoveProject(ProjectExplorer::Project*))); + connect(Core::EditorManager::instance(), SIGNAL(editorsClosed(QList<Core::IEditor*>)), + this, SLOT(editorsClosed(QList<Core::IEditor*>))); } EditorConfiguration::~EditorConfiguration() @@ -256,6 +262,7 @@ void EditorConfiguration::configureEditor(BaseTextEditor *textEditor) const if (widget) switchSettings(widget); } + d->m_editors.append(textEditor); } void EditorConfiguration::deconfigureEditor(BaseTextEditor *textEditor) const @@ -264,6 +271,8 @@ void EditorConfiguration::deconfigureEditor(BaseTextEditor *textEditor) const if (widget) widget->setCodeStyle(TextEditorSettings::codeStyle(widget->languageSettingsId())); + d->m_editors.removeOne(textEditor); + // TODO: what about text codec and switching settings? } @@ -384,16 +393,15 @@ void EditorConfiguration::slotAboutToRemoveProject(ProjectExplorer::Project *pro if (project->editorConfiguration() != this) return; - foreach (Core::IEditor *editor, Core::DocumentModel::editorsForOpenedDocuments()) { - if (TextEditor::BaseTextEditor *textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) { - Core::IDocument *document = editor->document(); - if (document) { - Project *editorProject = SessionManager::projectForFile(document->filePath()); - if (project == editorProject) - deconfigureEditor(textEditor); - } - } - } + foreach (TextEditor::BaseTextEditor *editor, d->m_editors) + deconfigureEditor(editor); +} + +void EditorConfiguration::editorsClosed(const QList<Core::IEditor*> &closedEditors) +{ + Utils::erase(d->m_editors, [&closedEditors](Core::IEditor *editor) { + return closedEditors.contains(editor); + }); } TabSettings actualTabSettings(const QString &fileName, diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index 71e825df16..6631a84953 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -35,7 +35,10 @@ #include <QObject> #include <QVariantMap> -namespace Core { class Id; } +namespace Core { +class IEditor; +class Id; +} namespace TextEditor { class BaseTextEditor; @@ -107,6 +110,7 @@ private slots: void setTextCodec(QTextCodec *textCodec); void slotAboutToRemoveProject(ProjectExplorer::Project *project); + void editorsClosed(const QList<Core::IEditor*> &closedEditors); private: void switchSettings(TextEditor::BaseTextEditorWidget *baseTextEditor) const; diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index 3a37bdd500..c7b93a44e2 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -115,8 +115,10 @@ void BestNodeSelector::inspect(AddNewTree *tree) const int projectDirectorySize = projectDirectory.size(); if (!m_commonDirectory.startsWith(projectDirectory)) return; - bool betterMatch = projectDirectorySize > m_bestMatchLength - || (projectDirectorySize == m_bestMatchLength && tree->priority() > m_bestMatchPriority); + bool betterMatch = tree->priority() > 0 + && (projectDirectorySize > m_bestMatchLength + || (projectDirectorySize == m_bestMatchLength && tree->priority() > m_bestMatchPriority)); + if (betterMatch) { m_bestMatchPriority = tree->priority(); m_bestMatchLength = projectDirectorySize; diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index e5b0ac5a4d..605100e06c 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -163,6 +163,10 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c if (!toolchainPrefix.isEmpty()) data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix); data.insert(QLatin1String(CPP_COMPILERNAME), compilerName); + if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS + || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { + data.insert(QLatin1String(CPP_LINKERNAME), compilerName); + } data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath()); if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) { const QLatin1String flags("/FS"); diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index c0af1997b0..4575e8cbd4 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -42,6 +42,7 @@ const char QBS_TOOLCHAIN[] = "qbs.toolchain"; const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath"; const char CPP_TOOLCHAINPREFIX[] = "cpp.toolchainPrefix"; const char CPP_COMPILERNAME[] = "cpp.compilerName"; +const char CPP_LINKERNAME[] = "cpp.linkerName"; const char CPP_PLATFORMCFLAGS[] = "cpp.platformCFlags"; const char CPP_PLATFORMCXXFLAGS[] = "cpp.platformCxxFlags"; const char CPP_XCODESDKNAME[] = "cpp.xcodeSdkName"; diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 8e73b24a40..5a63f82cf1 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -749,6 +749,13 @@ void QbsProject::updateApplicationTargets(const qbs::ProjectData &projectData) { ProjectExplorer::BuildTargetInfoList applications; foreach (const qbs::ProductData &productData, projectData.allProducts()) { + if (!productData.isEnabled() || !productData.isRunnable()) + continue; + if (productData.targetArtifacts().isEmpty()) { // No build yet. + applications.list << ProjectExplorer::BuildTargetInfo(Utils::FileName(), + Utils::FileName::fromString(productData.location().fileName())); + continue; + } foreach (const qbs::TargetArtifact &ta, productData.targetArtifacts()) { QTC_ASSERT(ta.isValid(), continue); if (!ta.isExecutable()) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs index bfee79593f..d026f069f3 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs @@ -76,6 +76,7 @@ QtcPlugin { "qbscleanstep.cpp", "qbscleanstep.h", "qbscleanstepconfigwidget.ui", + "qbsconstants.h", "qbsdeployconfigurationfactory.cpp", "qbsdeployconfigurationfactory.h", "qbsinstallstep.cpp", diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp index 8e2f16239a..5c0aead33a 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp @@ -228,8 +228,11 @@ QString CreateAndroidManifestWizard::sourceFileName() const return srcFolder; Utils::FileName srcPath = Utils::FileName::fromString(srcFolder) - .appendPath(QLatin1String("src/android/java")); - srcPath.appendPath(QLatin1String("AndroidManifest.xml")); + .appendPath(QLatin1String("src/android")); + if (QFile::exists(srcPath.toString() + QLatin1String("/templates/AndroidManifest.xml"))) + srcPath.appendPath(QLatin1String("/templates/AndroidManifest.xml")); + else + srcPath.appendPath(QLatin1String("/java/AndroidManifest.xml")); return srcPath.toString(); } diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp index afe18ef262..6b1a20bb05 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp @@ -597,7 +597,7 @@ static QString generatePreTargetDepsSnippet(AddLibraryWizard::Platforms platform generatedPlatforms |= windowsPlatforms; } else { if (windowsPlatforms & AddLibraryWizard::WindowsMSVCPlatform) { - str << "win32:!win32-g++ " << preTargetDepsSnippet << libName << ".lib\n"; + str << "win32:!win32-g++: " << preTargetDepsSnippet << libName << ".lib\n"; generatedPlatforms |= AddLibraryWizard::WindowsMSVCPlatform; // mingw will be handled with common scopes } // mingw not generated yet, will be joined with unix like diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index cb8052a5dd..76ac873a60 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1289,10 +1289,13 @@ QStringList QmakePriFileNode::varNames(ProjectExplorer::FileType type, QtSupport break; case ProjectExplorer::QMLType: vars << QLatin1String("OTHER_FILES"); + vars << QLatin1String("DISTFILES"); break; default: vars << QLatin1String("OTHER_FILES"); + vars << QLatin1String("DISTFILES"); vars << QLatin1String("ICON"); + vars << QLatin1String("QMAKE_INFO_PLIST"); break; } return vars; @@ -1353,6 +1356,7 @@ QStringList QmakePriFileNode::varNamesForRemoving() vars << QLatin1String("SUBDIRS"); vars << QLatin1String("OTHER_FILES"); vars << QLatin1String("ICON"); + vars << QLatin1String("QMAKE_INFO_PLIST"); return vars; } diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp b/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp index f64789053f..931c214ab3 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp @@ -31,6 +31,8 @@ #include <utils/qtcassert.h> #include <utils/fileutils.h> +#include <extensionsystem/pluginmanager.h> +#include <extensionsystem/pluginspec.h> #include <QDebug> #include <QDir> @@ -173,6 +175,12 @@ class TemplateInfoList public: TemplateInfoList() { + QSet<QString> availablePlugins; + foreach (ExtensionSystem::PluginSpec *s, ExtensionSystem::PluginManager::plugins()) { + if (s->state() == ExtensionSystem::PluginSpec::Running && !s->hasError()) + availablePlugins += s->name(); + } + QMultiMap<QString, TemplateInfo> multiMap; foreach (const QString &templateName, templateNames()) { const QString templatePath = templateRootDirectory() + templateName; @@ -185,7 +193,17 @@ public: info.templateName = templateName; info.templatePath = templatePath; QXmlStreamReader reader(&xmlFile); - if (parseTemplateXml(reader, &info)) + if (!parseTemplateXml(reader, &info)) + continue; + + bool ok = true; + foreach (const QString &neededPlugin, info.requiredPlugins) { + if (!availablePlugins.contains(neededPlugin)) { + ok = false; + break; + } + } + if (ok) multiMap.insert(info.priority, info); } m_templateInfoList = multiMap.values(); diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp index ba56fbddb2..59b06b88e8 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizard.cpp @@ -71,6 +71,8 @@ QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent, addPage(m_componentSetPage); addKitsPage(); + + setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK)); } void QtQuickAppWizardDialog::initializePage(int id) diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp index 78451eaf54..1dd36a63ef 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp @@ -30,8 +30,6 @@ #include "qtquickappwizardpages.h" #include <utils/wizard.h> -#include <extensionsystem/pluginmanager.h> -#include <extensionsystem/pluginspec.h> #include <QComboBox> #include <QLabel> @@ -58,23 +56,8 @@ QtQuickComponentSetPage::QtQuickComponentSetPage(QWidget *parent) QLabel *label = new QLabel(tr("Qt Quick component set:"), this); d->m_versionComboBox = new QComboBox(this); - QSet<QString> availablePlugins; - foreach (ExtensionSystem::PluginSpec *s, ExtensionSystem::PluginManager::plugins()) { - if (s->state() == ExtensionSystem::PluginSpec::Running && !s->hasError()) - availablePlugins += s->name(); - } - - foreach (const TemplateInfo &templateInfo, QtQuickApp::templateInfos()) { - bool ok = true; - foreach (const QString &neededPlugin, templateInfo.requiredPlugins) { - if (!availablePlugins.contains(neededPlugin)) { - ok = false; - break; - } - } - if (ok) - d->m_versionComboBox->addItem(templateInfo.displayName); - } + foreach (const TemplateInfo &templateInfo, QtQuickApp::templateInfos()) + d->m_versionComboBox->addItem(templateInfo.displayName); l->addWidget(label); l->addWidget(d->m_versionComboBox); diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index aeeebfdf68..4e582907b6 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -212,9 +212,19 @@ void DebugView::rootNodeTypeChanged(const QString &type, int majorVersion, int m } } -void DebugView::selectedNodesChanged(const QList<ModelNode> & /*selectedNodeList*/, +void DebugView::selectedNodesChanged(const QList<ModelNode> &selectedNodes /*selectedNodeList*/, const QList<ModelNode> & /*lastSelectedNodeList*/) { + foreach (const ModelNode &selectedNode, selectedNodes) { + QTextStream message; + QString string; + message.setString(&string); + message << selectedNode; + foreach (const VariantProperty &property, selectedNode.variantProperties()) { + message << property; + } + log(tr("Node selected:"), string); + } } void DebugView::scriptFunctionsChanged(const ModelNode & /*node*/, const QStringList & /*scriptFunctionList*/) diff --git a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp index 5cba0e3565..9ef118aee0 100644 --- a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp @@ -31,6 +31,7 @@ #include "nodemetainfo.h" #include <QSet> +#include <QPen> namespace QmlDesigner { @@ -95,13 +96,14 @@ void ContentNotEditableIndicator::addAddiationEntries(const QList<FormEditorItem if (!m_entryList.contains(EntryPair(formEditorItem, 0))) { QGraphicsRectItem *indicatorShape = new QGraphicsRectItem(m_layerItem); + QPen linePen; + linePen.setColor("#a0a0a0"); + indicatorShape->setPen(linePen); QRectF boundingRectangleInSceneSpace = formEditorItem->qmlItemNode().instanceSceneTransform().mapRect(formEditorItem->qmlItemNode().instanceBoundingRect()); indicatorShape->setRect(boundingRectangleInSceneSpace); - static QBrush brush(QColor(0, 0, 0, 130), Qt::BDiagPattern); + static QBrush brush(QColor(0, 0, 0, 10), Qt::BDiagPattern); indicatorShape->setBrush(brush); - formEditorItem->blurContent(true); - m_entryList.append(EntryPair(formEditorItem, indicatorShape)); } diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index b7a5ff220c..a4c19fa4b1 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -81,7 +81,7 @@ void DragTool::keyPressEvent(QKeyEvent *event) if (event->key() == Qt::Key_Escape) { abort(); event->accept(); - m_rewriterTransaction.commit(); + commitTransaction(); view()->changeToSelectionTool(); } } @@ -232,7 +232,7 @@ void DragTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSce event->accept(); end(generateUseSnapping(event->modifiers())); - m_rewriterTransaction.commit(); + commitTransaction(); if (m_dragNode.isValid()) view()->setSelectedModelNode(m_dragNode); @@ -282,7 +282,7 @@ void DragTool::dragLeaveEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphi if (m_dragNode.isValid()) m_dragNode.destroy(); - m_rewriterTransaction.commit(); + commitTransaction(); view()->changeToSelectionTool(); } @@ -361,4 +361,13 @@ void DragTool::move(const QPointF &scenePosition, const QList<QGraphicsItem*> & } } +void DragTool::commitTransaction() +{ + try { + m_rewriterTransaction.commit(); + } catch (RewritingException &e) { + e.showException(); + } +} + } diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h index 844c980dc8..eacef05229 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -91,6 +91,7 @@ protected: void end(Snapper::Snapping useSnapping); void move(const QPointF &scenePos, const QList<QGraphicsItem *> &itemList); void createDragNode(const QMimeData *mimeData, const QPointF &scenePosition, const QList<QGraphicsItem *> &itemList); + void commitTransaction(); private: MoveManipulator m_moveManipulator; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 5b7cdca461..ad34739ac0 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -646,7 +646,7 @@ void FormEditorView::delayedReset() m_resizeTool->clear(); m_dragTool->clear(); m_scene->clearFormEditorItems(); - if (QmlItemNode::isValidQmlItemNode(rootModelNode())) + if (isAttached() && QmlItemNode::isValidQmlItemNode(rootModelNode())) setupFormEditorItemTree(rootModelNode()); } diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp index e58ff77120..9768b4a997 100644 --- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp @@ -92,6 +92,9 @@ void ImportsWidget::removeUsedImports() static bool importLess(const Import &firstImport, const Import &secondImport) { + if (firstImport.url() == secondImport.url()) + return firstImport.toString() < secondImport.toString(); + if (firstImport.url() == "QtQuick") return true; diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index beee3b46d5..23cf2e791e 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -422,6 +422,8 @@ void DesignDocument::cutSelected() static void scatterItem(const ModelNode &pastedNode, const ModelNode &targetNode, int offset = -2000) { + if (targetNode.metaInfo().isValid() && targetNode.metaInfo().isLayoutable()) + return; bool scatter = false; foreach (const ModelNode &childNode, targetNode.directSubModelNodes()) { diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index a32f2504fa..91b2c657cd 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -50,8 +50,11 @@ #include <QtDebug> +#define DISABLE_VISIBLE_PROPERTIES + namespace QmlDesigner { +#ifndef DISABLE_VISIBLE_PROPERTIES static PropertyNameList visibleProperties(const ModelNode &node) { PropertyNameList propertyList; @@ -75,6 +78,7 @@ static PropertyNameList visibleProperties(const ModelNode &node) return propertyList; } +#endif static QList<ModelNode> acceptedModelNodeChildren(const ModelNode &parentNode) { @@ -84,7 +88,9 @@ static QList<ModelNode> acceptedModelNodeChildren(const ModelNode &parentNode) if (parentNode.metaInfo().hasDefaultProperty()) properties.append(parentNode.metaInfo().defaultPropertyName()); +#ifndef DISABLE_VISIBLE_PROPERTIES properties.append(visibleProperties(parentNode)); +#endif foreach (const PropertyName &propertyName, properties) { AbstractProperty property(parentNode.property(propertyName)); @@ -201,7 +207,9 @@ static bool computeTarget(const QModelIndex &rowModelIndex, ModelNode targetNode = navigatorTreeModel->nodeForIndex(targetItemIndex); if (!targetNode.metaInfo().hasDefaultProperty()) return false; +#ifndef DISABLE_VISIBLE_PROPERTIES *targetRowNumber -= visibleProperties(targetNode).count(); +#endif targetPropertyName = targetNode.metaInfo().defaultPropertyName(); } else { targetItemIndex = rowModelIndex.parent(); @@ -280,6 +288,7 @@ ItemRow NavigatorTreeModel::createItemRow(const ModelNode &node) visibilityItem->setCheckable(false); QMap<QString, QStandardItem *> propertyItems; +#ifndef DISABLE_VISIBLE_PROPERTIES foreach (const QString &propertyName, visibleProperties(node)) { QStandardItem *propertyItem = new QStandardItem; propertyItem->setSelectable(false); @@ -290,6 +299,7 @@ ItemRow NavigatorTreeModel::createItemRow(const ModelNode &node) propertyItems.insert(propertyName, propertyItem); idItem->appendRow(propertyItem); } +#endif # ifdef _LOCK_ITEMS_ ItemRow newRow = ItemRow(idItem, lockItem, visibilityItem, propertyItems); @@ -334,13 +344,16 @@ static void findTargetItem(const NodeListProperty &listProperty, int *newRowNumber, QStandardItem **targetItem) { + Q_UNUSED(newRowNumber); if (navigatorTreeModel->isInTree(listProperty.parentModelNode())) { ItemRow parentRow = navigatorTreeModel->itemRowForNode(listProperty.parentModelNode()); if (parentRow.propertyItems.contains(listProperty.name())) { *targetItem = parentRow.propertyItems.value(listProperty.name()); } else { // default property *targetItem = parentRow.idItem; +#ifndef DISABLE_VISIBLE_PROPERTIES newRowNumber += visibleProperties(listProperty.parentModelNode()).count(); +#endif } } else { *targetItem = currentItemRow.idItem->parent(); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 6f39ae2e9f..24809188b5 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -47,9 +47,15 @@ static inline void setScenePos(const QmlDesigner::ModelNode &modelNode,const QPo { if (modelNode.hasParentProperty() && QmlDesigner::QmlItemNode::isValidQmlItemNode(modelNode.parentProperty().parentModelNode())) { QmlDesigner::QmlItemNode parentNode = modelNode.parentProperty().parentQmlObjectNode().toQmlItemNode(); - QPointF localPos = parentNode.instanceSceneTransform().inverted().map(pos); - modelNode.variantProperty("x").setValue(localPos.toPoint().x()); - modelNode.variantProperty("y").setValue(localPos.toPoint().y()); + + if (!parentNode.modelNode().metaInfo().isLayoutable()) { + QPointF localPos = parentNode.instanceSceneTransform().inverted().map(pos); + modelNode.variantProperty("x").setValue(localPos.toPoint().x()); + modelNode.variantProperty("y").setValue(localPos.toPoint().y()); + } else { //Items in Layouts do not have a position + modelNode.removeProperty("x"); + modelNode.removeProperty("y"); + } } } diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index 45e69b5458..eeaa338068 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -114,7 +114,13 @@ void QmlAnchorBindingProxy::invalidate(const QmlItemNode &fxItemNode) m_ignoreQml = true; - m_verticalTarget = m_horizontalTarget = m_topTarget = m_bottomTarget = m_leftTarget = m_rightTarget = m_qmlItemNode.modelNode().parentProperty().parentModelNode(); + m_verticalTarget = + m_horizontalTarget = + m_topTarget = + m_bottomTarget = + m_leftTarget = + m_rightTarget = + m_qmlItemNode.modelNode().parentProperty().parentModelNode(); setupAnchorTargets(); @@ -247,6 +253,47 @@ void QmlAnchorBindingProxy::emitAnchorSignals() emit relativeAnchorTargetRightChanged(); } +void QmlAnchorBindingProxy::setDefaultRelativeTopTarget() +{ + if (m_topTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { + m_relativeTopTarget = SameEdge; + } else { + m_relativeTopTarget = OppositeEdge; + } +} + +void QmlAnchorBindingProxy::setDefaultRelativeBottomTarget() +{ + if (m_bottomTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { + m_relativeBottomTarget = SameEdge; + } else { + m_relativeBottomTarget = OppositeEdge; + } +} + +void QmlAnchorBindingProxy::setDefaultRelativeLeftTarget() +{ + if (m_leftTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { + m_relativeLeftTarget = SameEdge; + } else { + m_relativeLeftTarget = OppositeEdge; + } +} + +void QmlAnchorBindingProxy::setDefaultRelativeRightTarget() +{ + if (m_rightTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { + m_relativeRightTarget = SameEdge; + } else { + m_relativeRightTarget = OppositeEdge; + } +} + +RewriterTransaction QmlAnchorBindingProxy::beginRewriterTransaction(const QByteArray &identifier) +{ + return m_qmlItemNode.modelNode().view()->beginRewriterTransaction(identifier); +} + bool QmlAnchorBindingProxy::hasParent() { return m_qmlItemNode.isValid() && m_qmlItemNode.hasNodeParent(); @@ -254,7 +301,12 @@ bool QmlAnchorBindingProxy::hasParent() bool QmlAnchorBindingProxy::isFilled() { - return m_qmlItemNode.isValid() && hasAnchors() && topAnchored() && bottomAnchored() && leftAnchored() && rightAnchored() + return m_qmlItemNode.isValid() + && hasAnchors() + && topAnchored() + && bottomAnchored() + && leftAnchored() + && rightAnchored() && (m_qmlItemNode.instanceValue("anchors.topMargin").toInt() == 0) && (m_qmlItemNode.instanceValue("anchors.bottomMargin").toInt() == 0) && (m_qmlItemNode.instanceValue("anchors.leftMargin").toInt() == 0) @@ -301,9 +353,13 @@ void QmlAnchorBindingProxy::setTopTarget(const QString &target) if (!newTarget.isValid()) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setTopTarget")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setTopTarget")); m_topTarget = newTarget; + + setDefaultRelativeTopTarget(); + anchorTop(); emit topTargetChanged(); @@ -323,9 +379,11 @@ void QmlAnchorBindingProxy::setBottomTarget(const QString &target) if (!newTarget.isValid()) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setBottomTarget")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setBottomTarget")); m_bottomTarget = newTarget; + setDefaultRelativeBottomTarget(); anchorBottom(); emit bottomTargetChanged(); @@ -344,9 +402,11 @@ void QmlAnchorBindingProxy::setLeftTarget(const QString &target) if (!newTarget.isValid()) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setLeftTarget")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setLeftTarget")); m_leftTarget = newTarget; + setDefaultRelativeLeftTarget(); anchorLeft(); emit leftTargetChanged(); @@ -365,9 +425,11 @@ void QmlAnchorBindingProxy::setRightTarget(const QString &target) if (!newTarget.isValid()) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRightTarget")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRightTarget")); m_rightTarget = newTarget; + setDefaultRelativeRightTarget(); anchorRight(); emit rightTargetChanged(); @@ -386,7 +448,8 @@ void QmlAnchorBindingProxy::setVerticalTarget(const QString &target) if (!newTarget.isValid()) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalTarget")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalTarget")); m_verticalTarget = newTarget; anchorVertical(); @@ -407,7 +470,8 @@ void QmlAnchorBindingProxy::setHorizontalTarget(const QString &target) if (!newTarget.isValid()) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalTarget")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalTarget")); m_horizontalTarget = newTarget; anchorHorizontal(); @@ -423,7 +487,8 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetTop(QmlAnchorBindingProxy::Re if (target == m_relativeTopTarget) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetTop")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetTop")); m_relativeTopTarget = target; @@ -440,7 +505,8 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetBottom(QmlAnchorBindingProxy: if (target == m_relativeBottomTarget) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetBottom")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetBottom")); m_relativeBottomTarget = target; @@ -457,7 +523,8 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetLeft(QmlAnchorBindingProxy::R if (target == m_relativeLeftTarget) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetLeft")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetLeft")); m_relativeLeftTarget = target; @@ -474,7 +541,8 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetRight(QmlAnchorBindingProxy:: if (target == m_relativeRightTarget) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetRight")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetRight")); m_relativeRightTarget = target; @@ -492,7 +560,8 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetVertical(QmlAnchorBindingProx if (target == m_relativeVerticalTarget) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetVertical")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetVertical")); m_relativeVerticalTarget = target; @@ -509,7 +578,8 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal(QmlAnchorBindingPr if (target == m_relativeHorizontalTarget) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal")); m_relativeHorizontalTarget = target; @@ -559,7 +629,8 @@ int QmlAnchorBindingProxy::indexOfPossibleTargetItem(const QString &targetName) } void QmlAnchorBindingProxy::resetLayout() { - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::resetLayout")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::resetLayout")); m_qmlItemNode.anchors().removeAnchors(); m_qmlItemNode.anchors().removeMargins(); @@ -584,18 +655,13 @@ void QmlAnchorBindingProxy::setBottomAnchor(bool anchor) if (bottomAnchored() == anchor) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setBottomAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setBottomAnchor")); if (!anchor) { removeBottomAnchor(); } else { - - if (m_bottomTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { - m_relativeBottomTarget = SameEdge; - } else { - m_relativeBottomTarget = OppositeEdge; - } - + setDefaultRelativeBottomTarget(); anchorBottom(); if (topAnchored()) backupPropertyAndRemove(modelNode(), "height"); @@ -616,17 +682,13 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor) if (leftAnchored() == anchor) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setLeftAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setLeftAnchor")); if (!anchor) { removeLeftAnchor(); } else { - - if (m_leftTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { - m_relativeLeftTarget = SameEdge; - } else { - m_relativeLeftTarget = OppositeEdge; - } + setDefaultRelativeLeftTarget(); anchorLeft(); backupPropertyAndRemove(modelNode(), "x"); @@ -648,17 +710,13 @@ void QmlAnchorBindingProxy::setRightAnchor(bool anchor) if (rightAnchored() == anchor) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setRightAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setRightAnchor")); if (!anchor) { removeRightAnchor(); } else { - - if (m_rightTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { - m_relativeRightTarget = SameEdge; - } else { - m_relativeRightTarget = OppositeEdge; - } + setDefaultRelativeRightTarget(); anchorRight(); if (leftAnchored()) @@ -842,17 +900,13 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor) if (topAnchored() == anchor) return; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setTopAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setTopAnchor")); if (!anchor) { removeTopAnchor(); } else { - - if (m_topTarget.modelNode() == m_qmlItemNode.modelNode().parentProperty().parentModelNode()) { - m_relativeTopTarget = SameEdge; - } else { - m_relativeTopTarget = OppositeEdge; - } + setDefaultRelativeTopTarget(); anchorTop(); backupPropertyAndRemove(modelNode(), "y"); @@ -867,7 +921,8 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor) } void QmlAnchorBindingProxy::removeTopAnchor() { - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::removeTopAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::removeTopAnchor")); m_qmlItemNode.anchors().removeAnchor(AnchorLineTop); m_qmlItemNode.anchors().removeMargin(AnchorLineTop); @@ -878,7 +933,8 @@ void QmlAnchorBindingProxy::removeTopAnchor() { } void QmlAnchorBindingProxy::removeBottomAnchor() { - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::removeBottomAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::removeBottomAnchor")); m_qmlItemNode.anchors().removeAnchor(AnchorLineBottom); m_qmlItemNode.anchors().removeMargin(AnchorLineBottom); @@ -888,7 +944,8 @@ void QmlAnchorBindingProxy::removeBottomAnchor() { } void QmlAnchorBindingProxy::removeLeftAnchor() { - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::removeLeftAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::removeLeftAnchor")); m_qmlItemNode.anchors().removeAnchor(AnchorLineLeft); m_qmlItemNode.anchors().removeMargin(AnchorLineLeft); @@ -898,7 +955,8 @@ void QmlAnchorBindingProxy::removeLeftAnchor() { } void QmlAnchorBindingProxy::removeRightAnchor() { - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::removeRightAnchor")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::removeRightAnchor")); m_qmlItemNode.anchors().removeAnchor(AnchorLineRight); m_qmlItemNode.anchors().removeMargin(AnchorLineRight); @@ -916,7 +974,8 @@ void QmlAnchorBindingProxy::setVerticalCentered(bool centered) m_locked = true; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalCentered")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalCentered")); if (!centered) { m_qmlItemNode.anchors().removeAnchor(AnchorLineVerticalCenter); @@ -943,7 +1002,8 @@ void QmlAnchorBindingProxy::setHorizontalCentered(bool centered) m_locked = true; - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalCentered")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalCentered")); if (!centered) { m_qmlItemNode.anchors().removeAnchor(AnchorLineHorizontalCenter); @@ -1033,7 +1093,8 @@ bool QmlAnchorBindingProxy::horizontalCentered() void QmlAnchorBindingProxy::fill() { - RewriterTransaction transaction = m_qmlItemNode.modelNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchorBindingProxy::fill")); + RewriterTransaction transaction = beginRewriterTransaction( + QByteArrayLiteral("QmlAnchorBindingProxy::fill")); backupPropertyAndRemove(modelNode(), "x"); diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h index a30f48e766..936b6a8187 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h @@ -205,6 +205,12 @@ private: void setupAnchorTargets(); void emitAnchorSignals(); + void setDefaultRelativeTopTarget(); + void setDefaultRelativeBottomTarget(); + void setDefaultRelativeLeftTarget(); + void setDefaultRelativeRightTarget(); + + RewriterTransaction beginRewriterTransaction(const QByteArray &identifier); QmlItemNode targetIdToNode(const QString &id) const; QString idForNode(const QmlItemNode &qmlItemNode) const; diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp index 4aa9efbf5a..2b1251bd72 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp @@ -41,11 +41,8 @@ namespace QmlDesigner { void Quick2PropertyEditorView::execute() { m_view.setSource(m_source); - - if (!m_source.isEmpty()) { - m_view.setSource(m_source); + if (!m_source.isEmpty()) connect(&m_view, SIGNAL(statusChanged(QQuickView::Status)), this, SLOT(continueExecute())); - } } Quick2PropertyEditorView::Quick2PropertyEditorView(QWidget *parent) : diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/ButtonSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/ButtonSpecifics.qml index 5f415ff0e4..9a3bbc5d9b 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/ButtonSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/ButtonSpecifics.qml @@ -50,10 +50,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.text - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } @@ -64,6 +61,7 @@ Column { SecondColumnLayout { CheckBox { + enabled: backendValues.checkable.value text: backendValues.checked.valueToString backendValue: backendValues.checked implicitWidth: 180 @@ -82,6 +80,13 @@ Column { CheckBox { text: backendValues.checkable.valueToString backendValue: backendValues.checkable + property bool backEndValueValue: backendValues.checkable.value + onTextChanged: { + if (!backendValues.checkable.value) { + backendValues.checked.resetValue() + } + } + implicitWidth: 180 } ExpandingSpacer { @@ -130,10 +135,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.tooltip - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } @@ -162,10 +164,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.iconSource - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/CheckBoxSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/CheckBoxSpecifics.qml index d578848a03..e9c646d101 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/CheckBoxSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/CheckBoxSpecifics.qml @@ -50,10 +50,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.text - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/RadioButtonSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/RadioButtonSpecifics.qml index 785a035eb8..8318c7ddff 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/RadioButtonSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/RadioButtonSpecifics.qml @@ -50,10 +50,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.text - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml index 190d31b199..7835bd2842 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml @@ -64,11 +64,9 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.text - implicitWidth: 180 + Layout.fillWidth: true } - ExpandingSpacer { - } } Label { diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml index 317b08f3c1..c379e738b0 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml @@ -51,8 +51,7 @@ Column { LineEdit { backendValue: backendValues.text implicitWidth: 180 - } - ExpandingSpacer { + Layout.fillWidth: true } } @@ -65,10 +64,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.placeholderText - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } @@ -96,10 +92,7 @@ Column { SecondColumnLayout { LineEdit { backendValue: backendValues.inputMask - implicitWidth: 180 - } - ExpandingSpacer { - + Layout.fillWidth: true } } diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo index 93410ed01e..052fe68da3 100644 --- a/src/plugins/qmldesigner/componentsplugin/components.metainfo +++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo @@ -214,22 +214,6 @@ MetaInfo { } Type { - name: "QtQuick.Controls.TabView" - icon: ":/componentsplugin/images/window16.png" - - ItemLibraryEntry { - name: "Tab View" - category: "Qt Quick - Controls" - libraryIcon: ":/componentsplugin/images/window.png" - version: "1.0" - requiredImport: "QtQuick.Controls" - - Property { name: "width"; type: "int"; value: 360; } - Property { name: "height"; type: "int"; value: 300; } - } - } - - Type { name: "QtQuick.Controls.GroupBox" icon: ":/componentsplugin/images/window16.png" diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index 3f6792c179..40e8ce4e6d 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -128,7 +128,7 @@ public: NodeListProperty defaultNodeListProperty() const; NodeProperty defaultNodeProperty() const; - void removeProperty(const PropertyName &name); //### also implement in AbstractProperty + void removeProperty(const PropertyName &name) const; //### also implement in AbstractProperty QList<AbstractProperty> properties() const; QList<VariantProperty> variantProperties() const; QList<NodeAbstractProperty> nodeAbstractProperties() const; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index a45fbcd589..cb3e7d80ae 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -379,7 +379,7 @@ void NodeInstanceServerProxy::writeCommand(const QVariant &command) void NodeInstanceServerProxy::processFinished(int exitCode, QProcess::ExitStatus exitStatus) { - qWarning() << "Process finished:" << sender() << exitCode; + qWarning() << "Process" << (exitStatus == QProcess::CrashExit ? "crashed:" : "finished:") << sender() << "exitCode:" << exitCode; if (m_captureFileForTest.isOpen()) { m_captureFileForTest.close(); diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index fa98d5c97b..ff66653875 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -47,12 +47,13 @@ #include <coreplugin/icore.h> #include <qmldesignerwarning.h> +#include <qmldesignerplugin.h> +#include <designersettings.h> #include "puppetbuildprogressdialog.h" namespace QmlDesigner { -bool PuppetCreator::m_useOnlyFallbackPuppet = !qgetenv("USE_ONLY_FALLBACK_PUPPET").isEmpty(); QHash<Core::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml1PuppetForKitPuppetHash; QHash<Core::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml2PuppetForKitPuppetHash; @@ -105,6 +106,13 @@ QDateTime PuppetCreator::puppetSourceLastModified() const return lastModified; } +bool PuppetCreator::useOnlyFallbackPuppet() const +{ + DesignerSettings settings = QmlDesignerPlugin::instance()->settings(); + return settings.useOnlyFallbackPuppet + || !qgetenv("USE_ONLY_FALLBACK_PUPPET").isEmpty(); +} + PuppetCreator::PuppetCreator(ProjectExplorer::Kit *kit, const QString &qtCreatorVersion) : m_qtCreatorVersion(qtCreatorVersion), m_kit(kit), @@ -157,7 +165,7 @@ QProcess *PuppetCreator::puppetProcess(const QString &puppetPath, puppetProcess->setProcessEnvironment(processEnvironment()); QObject::connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), puppetProcess, SLOT(kill())); QObject::connect(puppetProcess, SIGNAL(finished(int,QProcess::ExitStatus)), handlerObject, finishSlot); - bool fowardQmlpuppetOutput = !qgetenv("FORWARD_QMLPUPPET_OUTPUT").isEmpty(); + bool fowardQmlpuppetOutput = !qgetenv("FORWARD_QML_PUPPET_OUTPUT").isEmpty(); if (fowardQmlpuppetOutput) { puppetProcess->setProcessChannelMode(QProcess::MergedChannels); QObject::connect(puppetProcess, SIGNAL(readyRead()), handlerObject, outputSlot); @@ -252,7 +260,7 @@ void PuppetCreator::createQml1PuppetExecutableIfMissing() { m_availablePuppetType = FallbackPuppet; - if (!m_useOnlyFallbackPuppet && m_kit) { + if (!useOnlyFallbackPuppet() && m_kit) { if (m_qml1PuppetForKitPuppetHash.contains(m_kit->id())) { m_availablePuppetType = m_qml1PuppetForKitPuppetHash.value(m_kit->id()); } else if (checkQmlpuppetIsReady()) { @@ -274,7 +282,7 @@ void PuppetCreator::createQml2PuppetExecutableIfMissing() { m_availablePuppetType = FallbackPuppet; - if (!m_useOnlyFallbackPuppet && m_kit) { + if (!useOnlyFallbackPuppet() && m_kit) { if (m_qml2PuppetForKitPuppetHash.contains(m_kit->id())) { m_availablePuppetType = m_qml2PuppetForKitPuppetHash.value(m_kit->id()); } else if (checkQml2PuppetIsReady()) { diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h index 4c9b8c337b..8d6612828d 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h @@ -110,12 +110,13 @@ protected: QDateTime qtLastModified() const; QDateTime puppetSourceLastModified() const; + bool useOnlyFallbackPuppet() const; + private: QString m_qtCreatorVersion; mutable QString m_compileLog; ProjectExplorer::Kit *m_kit; PuppetType m_availablePuppetType; - static bool m_useOnlyFallbackPuppet; static QHash<Core::Id, PuppetType> m_qml1PuppetForKitPuppetHash; static QHash<Core::Id, PuppetType> m_qml2PuppetForKitPuppetHash; }; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 303376aea2..aa5d5e387d 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -31,6 +31,7 @@ #include "model.h" #include "metainfo.h" +#include <enumeration.h> #include <rewriterview.h> #include <propertyparser.h> @@ -1358,7 +1359,8 @@ QVariant NodeMetaInfo::propertyCastedValue(const PropertyName &propertyName, con const QVariant variant = value; QVariant copyVariant = variant; - if (propertyIsEnumType(propertyName)) + if (propertyIsEnumType(propertyName) + || variant.canConvert<Enumeration>()) return variant; const QString typeName = propertyTypeName(propertyName); @@ -1512,7 +1514,9 @@ bool NodeMetaInfo::isLayoutable() const if (isSubclassOf("<cpp>.QDeclarativeBasePositioner", -1, -1)) return true; //QtQuick 1 - return isSubclassOf("QtQuick.Positioner", -1, -1) || isSubclassOf("QtQuick.Layouts.Layout", -1, -1); + return isSubclassOf("QtQuick.Positioner", -1, -1) + || isSubclassOf("QtQuick.Layouts.Layout", -1, -1) + || isSubclassOf("QtQuick.Controls.SplitView", -1, -1); } bool NodeMetaInfo::isView() const diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 88d38d083d..5016bd6ebb 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -583,7 +583,7 @@ Does nothing if the node state does not set this property. \see addProperty property properties hasProperties */ -void ModelNode::removeProperty(const PropertyName &name) +void ModelNode::removeProperty(const PropertyName &name) const { if (!isValid()) throw InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index a028bd61c7..4242214f1f 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -369,6 +369,13 @@ bool itemIsMovable(const ModelNode &modelNode) if (modelNode.metaInfo().isSubclassOf("QtQuick.Controls.Tab", -1, -1)) return false; + if (modelNode.hasParentProperty()) { + ModelNode parentModelNode = modelNode.parentProperty().parentModelNode(); + if (QmlItemNode::isValidQmlItemNode(parentModelNode) + && parentModelNode.metaInfo().isLayoutable()) + return false; + } + return true; } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 64d91e80fe..7927a4f259 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -247,6 +247,11 @@ static inline QVariant convertDynamicPropertyValueToVariant(const QString &astVa } } +static bool isListElementType(const QmlDesigner::TypeName &type) +{ + return type == "ListElement" || type == "QtQuick.ListElement" || type == "Qt.ListElement"; +} + static bool isComponentType(const QmlDesigner::TypeName &type) { return type == "Component" || type == "Qt.Component" || type == "QtQuick.Component" || type == "<cpp>.QQmlComponent"; @@ -1225,7 +1230,8 @@ QmlDesigner::PropertyName TextToModelMerger::syncScriptBinding(ModelNode &modelN if (isLiteralValue(script)) { if (isPropertyChangesType(modelNode.type()) - || isConnectionsType(modelNode.type())) { + || isConnectionsType(modelNode.type()) + || isListElementType(modelNode.type())) { AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8()); QVariant variantValue = parsePropertyScriptBinding(script); if (!variantValue.isValid()) diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index 94d30aca6f..e318ae0bf7 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -43,7 +43,8 @@ DesignerSettings::DesignerSettings() designerWarningsInEditor(false), showDebugView(false), enableDebugView(false), - alwaysSaveInCrumbleBar(false) + alwaysSaveInCrumbleBar(false), + useOnlyFallbackPuppet(false) {} void DesignerSettings::fromSettings(QSettings *settings) @@ -66,6 +67,8 @@ void DesignerSettings::fromSettings(QSettings *settings) QLatin1String(QmlDesigner::Constants::QML_ENABLE_DEBUGVIEW), QVariant(false)).toBool(); alwaysSaveInCrumbleBar = settings->value( QLatin1String(QmlDesigner::Constants::QML_ALWAYS_SAFE_IN_CRUMBLEBAR), QVariant(false)).toBool(); + useOnlyFallbackPuppet = settings->value( + QLatin1String(QmlDesigner::Constants::QML_USE_ONLY_FALLBACK_PUPPET), QVariant(false)).toBool(); settings->endGroup(); settings->endGroup(); @@ -84,6 +87,7 @@ void DesignerSettings::toSettings(QSettings *settings) const settings->setValue(QLatin1String(QmlDesigner::Constants::QML_SHOW_DEBUGVIEW), showDebugView); settings->setValue(QLatin1String(QmlDesigner::Constants::QML_ENABLE_DEBUGVIEW), enableDebugView); settings->setValue(QLatin1String(QmlDesigner::Constants::QML_ALWAYS_SAFE_IN_CRUMBLEBAR), alwaysSaveInCrumbleBar); + settings->setValue(QLatin1String(QmlDesigner::Constants::QML_USE_ONLY_FALLBACK_PUPPET), useOnlyFallbackPuppet); settings->endGroup(); settings->endGroup(); @@ -98,5 +102,6 @@ bool DesignerSettings::equals(const DesignerSettings &other) const && designerWarningsInEditor == other.designerWarningsInEditor && showDebugView == other.showDebugView && enableDebugView == other.enableDebugView - && alwaysSaveInCrumbleBar == other.alwaysSaveInCrumbleBar; + && alwaysSaveInCrumbleBar == other.alwaysSaveInCrumbleBar + && useOnlyFallbackPuppet == other.useOnlyFallbackPuppet; } diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index 829e92dc7c..78e12abc86 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -56,6 +56,7 @@ public: bool showDebugView; bool enableDebugView; bool alwaysSaveInCrumbleBar; + bool useOnlyFallbackPuppet; }; inline bool operator==(const DesignerSettings &s1, const DesignerSettings &s2) diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index 7a6c9c1be3..deb20fd44d 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -65,6 +65,7 @@ const char QML_WARNIN_FOR_DESIGNER_FEATURES_IN_EDITOR_KEY[] = "WarnAboutQtQuickD const char QML_SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView"; const char QML_ENABLE_DEBUGVIEW[] = "EnableQtQuickDesignerDebugView"; const char QML_ALWAYS_SAFE_IN_CRUMBLEBAR[] = "AlwaysSafeInCrumbleBar"; +const char QML_USE_ONLY_FALLBACK_PUPPET[] = "AseOnlyFallbackPuppet"; const char QML_DESIGNER_SUBFOLDER[] = "/designer/"; diff --git a/src/plugins/qmlprofiler/qml/SelectionRange.qml b/src/plugins/qmlprofiler/qml/SelectionRange.qml index c8b55fa892..c1bab1f673 100644 --- a/src/plugins/qmlprofiler/qml/SelectionRange.qml +++ b/src/plugins/qmlprofiler/qml/SelectionRange.qml @@ -48,7 +48,7 @@ RangeMover { target: zoomControl onRangeChanged: { var oldTimePerPixel = selectionRange.viewTimePerPixel; - selectionRange.viewTimePerPixel = Math.abs(zoomControl.endTime() - zoomControl.startTime()) / flick.width; + selectionRange.viewTimePerPixel = Math.abs(zoomControl.endTime() - zoomControl.startTime()) / view.intWidth; if (creationState === 3 && oldTimePerPixel != selectionRange.viewTimePerPixel) { var newWidth = getWidth() * oldTimePerPixel / viewTimePerPixel; setLeft(getLeft() * oldTimePerPixel / viewTimePerPixel); diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp index b5054626e9..ccaaad056e 100644 --- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp @@ -38,6 +38,7 @@ #include <qmakeprojectmanager/qmakeproject.h> #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> #include <qtsupport/qtkitinformation.h> +#include <qtsupport/qtsupportconstants.h> #include "qmlprojectmanager.h" #include "qmlproject.h" @@ -79,6 +80,8 @@ QmlApplicationWizard::QmlApplicationWizard() QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY)); setDisplayName(tr("Qt Quick UI")); setDescription(tr("Creates a Qt Quick UI project.")); + setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT) + | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK)); } Core::BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters ¶meters) const diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp index e134ff83d6..a51a23c128 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp @@ -128,13 +128,11 @@ private: QDialogButtonBox *m_dialogButtonBox; CustomExecutableConfigurationWidget *m_widget; - CustomExecutableRunConfiguration *m_runConfiguration; }; CustomExecutableDialog::CustomExecutableDialog(CustomExecutableRunConfiguration *rc, QWidget *parent) : QDialog(parent) , m_dialogButtonBox(new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel)) - , m_runConfiguration(rc) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); QVBoxLayout *layout = new QVBoxLayout(this); diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 552a628132..aea6099880 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -256,10 +256,11 @@ ProjectExplorer::FolderNode::AddNewInformation ResourceTopLevelNode::addNewInfor .arg(QFileInfo(path()).fileName()) .arg(QLatin1String("/")); - int p = 80; - if (priority(files)) { - if (context == 0 || context == this) - p = 125; + int p = -1; + if (priority(files)) { // images/* and qml/js mimetypes + p = 110; + if (context == this) + p = 120; else if (projectNode() == context) p = 150; // steal from our project node // The ResourceFolderNode '/' defers to us, as otherwise @@ -267,7 +268,7 @@ ProjectExplorer::FolderNode::AddNewInformation ResourceTopLevelNode::addNewInfor // Thus also return a high priority for it if (ResourceFolderNode *rfn = qobject_cast<ResourceFolderNode *>(context)) if (rfn->prefix() == QLatin1String("/") && rfn->parentFolderNode() == this) - p = 150; + p = 120; } return AddNewInformation(name, p); @@ -389,9 +390,10 @@ ProjectExplorer::FolderNode::AddNewInformation ResourceFolderNode::addNewInforma .arg(QFileInfo(m_topLevelNode->path()).fileName()) .arg(displayName()); - int p = 80; - if (priority(files)) { - if (context == 0 || context == this) + int p = -1; // never the default + if (priority(files)) { // image/* and qml/js mimetypes + p = 105; // prefer against .pro and .pri files + if (context == this) p = 120; } diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index acda0f70f6..812cd65463 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -250,22 +250,15 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co points += firstSelection.topRight() + QPointF(margin+1, -margin); points += firstSelection.bottomRight() + QPointF(margin+1, 0); - const int count = selection.count(); - if (count > 2) { - const QRectF *prev = &selection.at(0); - const QRectF *current = &selection.at(1); - const QRectF *next = &selection.at(2); - for (int i = 0; i < count; ++i) { - #define MAX3(a,b,c) qMax(a, qMax(b,c)) - qreal x = MAX3(prev->right(), current->right(), next->right()) + margin; - points += QPointF(x+1, current->top()); - points += QPointF(x+1, current->bottom()); - prev = current; - current = next; - if (i < count-1) - next = &selection.at(i+1); - } + for (int i = 1; i < count-1; ++i) { +#define MAX3(a,b,c) qMax(a, qMax(b,c)) + qreal x = MAX3(selection.at(i-1).right(), + selection.at(i).right(), + selection.at(i+1).right()) + margin; + + points += QPointF(x+1, selection.at(i).top()); + points += QPointF(x+1, selection.at(i).bottom()); } const QRectF &lastSelection = selection.at(count-1); @@ -274,20 +267,14 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co points += lastSelection.bottomLeft() + QPointF(-margin, margin+extra); points += lastSelection.topLeft() + QPointF(-margin, 0); - if (count > 2) { - const QRectF *prev = &selection.at(count-3); - const QRectF *current = &selection.at(count-2); - const QRectF *next = &selection.at(count-1); - for (int i = count-1; i >= 0; --i) { + for (int i = count-2; i > 0; --i) { #define MIN3(a,b,c) qMin(a, qMin(b,c)) - qreal x = MIN3(prev->left(), current->left(), next->left()) - margin; - points += QPointF(x, current->bottom()+extra); - points += QPointF(x, current->top()); - next = current; - current = prev; - if (i > 0) - prev = &selection.at(i); - } + qreal x = MIN3(selection.at(i-1).left(), + selection.at(i).left(), + selection.at(i+1).left()) - margin; + + points += QPointF(x, selection.at(i).bottom()+extra); + points += QPointF(x, selection.at(i).top()); } points += firstSelection.bottomLeft() + QPointF(-margin, extra); diff --git a/src/plugins/winrt/winrtdevicefactory.cpp b/src/plugins/winrt/winrtdevicefactory.cpp index 56578c2168..b3dcce7ecc 100644 --- a/src/plugins/winrt/winrtdevicefactory.cpp +++ b/src/plugins/winrt/winrtdevicefactory.cpp @@ -58,7 +58,7 @@ WinRtDeviceFactory::WinRtDeviceFactory() } else { connect(DeviceManager::instance(), &DeviceManager::devicesLoaded, this, &WinRtDeviceFactory::onPrerequisitesLoaded, Qt::QueuedConnection); - connect(static_cast<QtVersionManager *>(QtVersionManager::instance()), + connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsLoaded, this, &WinRtDeviceFactory::onPrerequisitesLoaded, Qt::QueuedConnection); } @@ -125,12 +125,10 @@ void WinRtDeviceFactory::onPrerequisitesLoaded() m_initialized = true; disconnect(DeviceManager::instance(), &DeviceManager::devicesLoaded, this, &WinRtDeviceFactory::onPrerequisitesLoaded); - QtVersionManager *qtVersionManager - = static_cast<QtVersionManager *>(QtVersionManager::instance()); - disconnect(qtVersionManager, &QtVersionManager::qtVersionsLoaded, + disconnect(QtVersionManager::instance(), &QtVersionManager::qtVersionsLoaded, this, &WinRtDeviceFactory::onPrerequisitesLoaded); autoDetect(); - connect(qtVersionManager, &QtVersionManager::qtVersionsChanged, + connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, this, &WinRtDeviceFactory::autoDetect); } diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index f5aa28c2e5..d342d9a752 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -28,8 +28,10 @@ ****************************************************************************/ #include "winrtpackagedeploymentstep.h" -#include "winrtpackagedeploymentstepwidget.h" + #include "winrtconstants.h" +#include "winrtpackagedeploymentstepwidget.h" +#include "winrtrunconfiguration.h" #include <projectexplorer/project.h> #include <projectexplorer/target.h> @@ -39,6 +41,7 @@ #include <projectexplorer/deploymentdata.h> #include <projectexplorer/projectexplorerconstants.h> #include <qtsupport/qtkitinformation.h> +#include <utils/qtcassert.h> #include <utils/qtcprocess.h> #include <QRegularExpression> @@ -59,19 +62,38 @@ WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl) bool WinRtPackageDeploymentStep::init() { - Utils::FileName proFile = project()->projectFilePath(); - const QString targetPath - = target()->applicationTargets().targetForProject(proFile).toString() - + QLatin1String(".exe"); - QString targetDir = targetPath.left(targetPath.lastIndexOf(QLatin1Char('/')) + 1); - // ### Actually, targetForProject is supposed to return the file path including the file - // extension. Whenever this will eventually work, we have to remove the .exe suffix here. + WinRtRunConfiguration *rc = qobject_cast<WinRtRunConfiguration *>( + target()->activeRunConfiguration()); + QTC_ASSERT(rc, return false); + + const Utils::FileName activeProjectFilePath = Utils::FileName::fromString(rc->proFilePath()); + Utils::FileName appTargetFilePath; + foreach (const BuildTargetInfo &buildTarget, target()->applicationTargets().list) { + if (buildTarget.projectFilePath == activeProjectFilePath) { + appTargetFilePath = buildTarget.targetFilePath; + break; + } + } + + m_targetFilePath = appTargetFilePath.toString(); + if (m_targetFilePath.isEmpty()) { + // ### raise error in 3.3 + // raiseError(tr("No executable to deploy found in %1.").arg(rc->proFilePath())); + return false; + } + + // ### Ideally, the file paths in applicationTargets() should already have the .exe suffix. + // Whenever this will eventually work, we can drop appending the .exe suffix here. + if (!m_targetFilePath.endsWith(QLatin1String(".exe"), Qt::CaseInsensitive)) + m_targetFilePath.append(QLatin1String(".exe")); + + m_targetDirPath = appTargetFilePath.parentDir().toString(); const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); if (!qt) return false; - QString args = QtcProcess::quoteArg(QDir::toNativeSeparators(targetPath)); + QString args = QtcProcess::quoteArg(QDir::toNativeSeparators(m_targetFilePath)); args += QLatin1Char(' ') + m_args; m_manifestFileName = QStringLiteral("AppxManifest"); @@ -84,13 +106,16 @@ bool WinRtPackageDeploymentStep::init() if (m_createMappingFile) { args += QLatin1String(" -list mapping"); - m_mappingFileContent = QLatin1String("[Files]\n\"") + QDir::toNativeSeparators(targetDir) - + m_manifestFileName + QLatin1String(".xml\" \"") + m_manifestFileName + QLatin1String(".xml\"\n"); + m_mappingFileContent = QLatin1String("[Files]\n\"") + + QDir::toNativeSeparators(m_targetDirPath) + + m_manifestFileName + QLatin1String(".xml\" \"") + m_manifestFileName + + QLatin1String(".xml\"\n"); - QDir assetDirectory(targetDir + QLatin1String("assets")); + QDir assetDirectory(m_targetDirPath + QLatin1String("assets")); if (assetDirectory.exists()) { QStringList iconsToDeploy; - const QString fullManifestPath = targetDir + m_manifestFileName + QLatin1String(".xml"); + const QString fullManifestPath = m_targetDirPath + m_manifestFileName + + QLatin1String(".xml"); if (!parseIconsAndExecutableFromManifest(fullManifestPath, &iconsToDeploy, &m_executablePathInManifest)) { raiseError(tr("Cannot parse manifest file %1.").arg(fullManifestPath)); @@ -98,7 +123,7 @@ bool WinRtPackageDeploymentStep::init() } foreach (const QString &icon, iconsToDeploy) { m_mappingFileContent += QLatin1Char('"') - + QDir::toNativeSeparators(targetDir + icon) + QLatin1String("\" \"") + + QDir::toNativeSeparators(m_targetDirPath + icon) + QLatin1String("\" \"") + QDir::toNativeSeparators(icon) + QLatin1String("\"\n"); } } @@ -115,18 +140,14 @@ bool WinRtPackageDeploymentStep::init() bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitStatus status) { if (m_createMappingFile) { - Utils::FileName proFile = project()->projectFilePath(); - QString targetPath - = target()->applicationTargets().targetForProject(proFile).toString(); - QString targetDir = targetPath.left(targetPath.lastIndexOf(QLatin1Char('/')) + 1); QString targetInstallationPath; // The list holds the local file paths and the "remote" file paths QList<QPair<QString, QString> > installableFilesList; foreach (DeployableFile file, target()->deploymentData().allFiles()) { QString remoteFilePath = file.remoteFilePath(); QString localFilePath = file.localFilePath().toString(); - if (localFilePath == targetPath) { - if (!targetPath.endsWith(QLatin1String(".exe"))) { + if (localFilePath == m_targetFilePath) { + if (!m_targetFilePath.endsWith(QLatin1String(".exe"))) { remoteFilePath += QLatin1String(".exe"); localFilePath += QLatin1String(".exe"); } @@ -139,11 +160,12 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt // and the icons referenced in there and the actual build target QString baseDir; if (targetInstallationPath.isEmpty()) { - targetPath += QLatin1String(".exe"); + m_targetFilePath += QLatin1String(".exe"); m_mappingFileContent - += QLatin1Char('"') + QDir::toNativeSeparators(targetPath) + QLatin1String("\" \"") + += QLatin1Char('"') + QDir::toNativeSeparators(m_targetFilePath) + + QLatin1String("\" \"") + QDir::toNativeSeparators(m_executablePathInManifest) + QLatin1String("\"\n"); - baseDir = targetDir; + baseDir = m_targetDirPath; } else { baseDir = targetInstallationPath.left(targetInstallationPath.lastIndexOf(QLatin1Char('/')) + 1); } @@ -161,7 +183,8 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt + QLatin1String("\"\n"); } - const QString mappingFilePath = targetDir + m_manifestFileName + QLatin1String(".map"); + const QString mappingFilePath = m_targetDirPath + m_manifestFileName + + QLatin1String(".map"); QFile mappingFile(mappingFilePath); if (!mappingFile.open(QFile::WriteOnly | QFile::Text)) { raiseError(tr("Cannot open mapping file %1 for writing.").arg(mappingFilePath)); diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.h b/src/plugins/winrt/winrtpackagedeploymentstep.h index 224f8b4676..17d597bfdc 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.h +++ b/src/plugins/winrt/winrtpackagedeploymentstep.h @@ -58,6 +58,8 @@ private: bool parseIconsAndExecutableFromManifest(QString manifestFileName, QStringList *items, QString *executable); QString m_args; + QString m_targetFilePath; + QString m_targetDirPath; QString m_executablePathInManifest; QString m_mappingFileContent; QString m_manifestFileName; diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 657a4ccf4c493ee0a0e5a5f5d15d644d3a1f49b +Subproject 713ee6a92c6785d4e126df06dd0a345dcefbdd5 diff --git a/src/tools/3rdparty/iossim/iossim.qbs b/src/tools/3rdparty/iossim/iossim.qbs index d507753f15..0e3704530a 100644 --- a/src/tools/3rdparty/iossim/iossim.qbs +++ b/src/tools/3rdparty/iossim/iossim.qbs @@ -20,11 +20,11 @@ QtcTool { "dvtiphonesimulatorremoteclient/dvtiphonesimulatorremoteclient.h" ] cpp.includePaths: ["."] - cpp.linkerFlags: base.concat(["-sectcreate", "__TEXT", "__info_plist", path + "/Info.plist", - "-fobjc-link-runtime"]) + cpp.linkerFlags: base.concat(["-fobjc-link-runtime"]) cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit", "AppKit"]) cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks") + cpp.infoPlistFile: "Info.plist" installDir: project.ide_libexec_path + "/ios" } diff --git a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs index 1b96084e17..ce138f7a20 100644 --- a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs +++ b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs @@ -20,11 +20,11 @@ QtcTool { "version.h", "iphonesimulatorremoteclient/iphonesimulatorremoteclient.h" ] - cpp.linkerFlags: base.concat(["-sectcreate", "__TEXT", "__info_plist", path + "/Info.plist", - "-fobjc-link-runtime"]) + cpp.linkerFlags: base.concat(["-fobjc-link-runtime"]) cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit", "AppKit"]) cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks") + cpp.infoPlistFile: "Info.plist" toolInstallDir: project.ide_libexec_path + "/ios" } diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs index 13b834e763..fb272c7512 100644 --- a/src/tools/iostool/iostool.qbs +++ b/src/tools/iostool/iostool.qbs @@ -15,10 +15,10 @@ QtcTool { "iosdevicemanager.cpp", "iosdevicemanager.h" ] - cpp.linkerFlags: base.concat(["-sectcreate", "__TEXT", "__info_plist", path + "/Info.plist"]) cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security", "SystemConfiguration"]) cpp.dynamicLibraries: base.concat(["ssl", "bz2"]) + cpp.infoPlistFile: "Info.plist" installDir: project.ide_libexec_path + "/ios" } diff --git a/tests/system/objects.map b/tests/system/objects.map index 37429e2a03..8637b38df7 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -99,6 +99,7 @@ :Go to slot.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Go to slot_QDialog'} :Go to slot.Select signal_QGroupBox {name='groupBox' title='Select signal' type='QGroupBox' visible='1' window=':Go to slot_QDialog'} :Go to slot_QDialog {name='SelectSignalDialog' type='QDialog' visible='1' windowTitle='Go to slot'} +:Help Widget_Help::Internal::HelpWidget {type='Help::Internal::HelpWidget' unnamed='1' visible='1' windowTitle?='Help -*'} :Hits_QCLuceneResultWidget {aboveWidget=':Hits_QLabel' type='QCLuceneResultWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Hits_QLabel {text~='\\\\d+ - \\\\d+ of \\\\d+ Hits' type='QLabel' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :JavaScript.QmlProfilerEventsTable_QmlProfiler::Internal::QV8ProfilerEventsMainView {container=':*Qt Creator.JavaScript_QDockWidget' name='QmlProfilerEventsTable' type='QmlProfiler::Internal::QV8ProfilerEventsMainView' visible='1'} diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index f94dfa445c..3228711255 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -34,8 +34,6 @@ def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWe cleanUpUserFiles(projectPath) if fromWelcome: mouseClick(waitForObject(":OpenProject_QStyleItem"), 5, 5, 0, Qt.LeftButton) - if not platform.system() == "Darwin": - waitFor("waitForObject(':fileNameEdit_QLineEdit', 1000).focus == True", 3000) else: invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(projectPath) @@ -737,13 +735,3 @@ def addCPlusPlusFileToCurrentProject(name, template, forceOverwrite=False, addTo buttonToClick = 'Cancel' clickButton("{text='%s' type='QPushButton' unnamed='1' visible='1' window=%s}" % (buttonToClick, overwriteDialog)) - -def qt5SDKPath(): - if platform.system() in ('Microsoft', 'Windows'): - return os.path.abspath("C:/Qt/Qt5.0.1/5.0.1/msvc2010") - elif platform.system() == 'Linux': - if __is64BitOS__(): - return os.path.expanduser("~/Qt5.0.1/5.0.1/gcc_64") - return os.path.expanduser("~/Qt5.0.1/5.0.1/gcc") - else: - return os.path.expanduser("~/Qt5.0.1/5.0.1/clang_64") diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index b9e35782ec..913e5b2fbf 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -102,6 +102,7 @@ def selectFromCombo(objectSpec, itemName): return False else: mouseClick(object, 5, 5, 0, Qt.LeftButton) + snooze(1) mouseClick(waitForObjectItem(object, itemName.replace(".", "\\.")), 5, 5, 0, Qt.LeftButton) test.verify(waitFor("str(object.currentText)==itemName", 5000), "Switched combo item to '%s'" % itemName) @@ -252,15 +253,23 @@ def selectFromFileDialog(fileName, waitForFile=False): else: fName = os.path.basename(os.path.abspath(fileName)) pName = os.path.dirname(os.path.abspath(fileName)) + os.sep - waitForObject("{name='QFileDialog' type='QFileDialog' visible='1'}") - pathLine = waitForObject("{name='fileNameEdit' type='QLineEdit' visible='1'}") - snooze(1) - replaceEditorContent(pathLine, pName) - clickButton(waitForObject("{text='Open' type='QPushButton'}")) - waitFor("str(pathLine.text)==''") - snooze(1) - replaceEditorContent(pathLine, fName) - clickButton(waitForObject("{text='Open' type='QPushButton'}")) + try: + waitForObject("{name='QFileDialog' type='QFileDialog' visible='1'}", 5000) + pathLine = waitForObject("{name='fileNameEdit' type='QLineEdit' visible='1'}") + snooze(1) + replaceEditorContent(pathLine, pName) + clickButton(waitForObject("{text='Open' type='QPushButton'}")) + waitFor("str(pathLine.text)==''") + snooze(1) + replaceEditorContent(pathLine, fName) + clickButton(waitForObject("{text='Open' type='QPushButton'}")) + except: + nativeType("<Ctrl+a>") + nativeType("<Delete>") + nativeType(pName + fName) + snooze(1) + nativeType("<Return>") + snooze(3) if waitForFile: fileCombo = waitForObject(":Qt Creator_FilenameQComboBox") if not waitFor("str(fileCombo.currentText) in fileName", 5000): diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py index d9eeae13a5..cfbf2ed4e5 100644 --- a/tests/system/suite_CSUP/tst_CSUP01/test.py +++ b/tests/system/suite_CSUP/tst_CSUP01/test.py @@ -66,7 +66,7 @@ def main(): type(editorWidget, "<Meta+Shift+Right>") else: type(editorWidget, "<Shift+End>") - type(editorWidget, "<Del>") + type(editorWidget, "<Delete>") type(editorWidget, "voi") waitForObjectItem(":popupFrame_Proposal_QListView", "void") type(waitForObject(":popupFrame_Proposal_QListView"), "<Tab>") @@ -83,7 +83,7 @@ def main(): type(editorWidget, "<Meta+Shift+Right>") else: type(editorWidget, "<Shift+End>") - type(editorWidget, "<Del>") + type(editorWidget, "<Delete>") type(editorWidget, "ret") if platform.system() == "Darwin": type(editorWidget, "<Meta+Space>") diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index fb84563eb9..edce6b2b47 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -30,20 +30,32 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") -webPageContentLoadedValue = 0 +class Qt5Path: + DOCS = 0 + EXAMPLES = 1 -# wait until help gets loaded -def webPageContentLoaded(*args): - global webPageContentLoadedValue - objectClass = str(args[0].metaObject().className()) - if objectClass in ("QWebPage", "Help::Internal::HelpViewer"): - webPageContentLoadedValue += 1 - -def isLoaded(): - if platform.system() == "Darwin": - return webPageContentLoadedValue == 1 - else: - return webPageContentLoadedValue == 3 + @staticmethod + def getPaths(pathSpec): + if pathSpec == Qt5Path.DOCS: + path52 = "/doc" + path53 = "/Docs/Qt-5.3" + elif pathSpec == Qt5Path.EXAMPLES: + path52 = "/examples" + path53 = "/Examples/Qt-5.3" + else: + test.fatal("Unknown pathSpec given: %s" % str(pathSpec)) + return [] + if platform.system() in ('Microsoft', 'Windows'): + return ["C:/Qt/Qt5.2.1/5.2.1/msvc2010" + path52, "C:/Qt/Qt5.3.1" + path53] + elif platform.system() == 'Linux': + if __is64BitOS__(): + return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc_64" + path52, + "~/Qt5.3.1" + path53]) + return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc" + path52, + "~/Qt5.3.1" + path53]) + else: + return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/clang_64" + path52, + "~/Qt5.3.1" + path53]) def handlePackagingMessageBoxes(): if platform.system() == "Darwin": @@ -60,62 +72,66 @@ def handlePackagingMessageBoxes(): break def main(): - test.log("Welcome mode is not scriptable at the moment") - return - global sdkPath, webPageContentLoadedValue + if isQt4Build or not canTestEmbeddedQtQuick(): + test.log("Welcome mode is not available or not scriptable with this Squish version") + return + global sdkPath # open Qt Creator startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - installLazySignalHandler(":QWebPage","loadFinished(bool)", "webPageContentLoaded") - installLazySignalHandler(":Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)", - "webPageContentLoaded") - qt5sdkPath = qt5SDKPath() - qchs = [os.path.join(sdkPath, "Documentation", "qt.qch"), - os.path.join(qt5sdkPath, "doc", "qtopengl.qch"), - os.path.join(qt5sdkPath, "doc", "qtwidgets.qch")] + qchs = [os.path.join(sdkPath, "Documentation", "qt.qch")] + for p in Qt5Path.getPaths(Qt5Path.DOCS): + qchs.extend([os.path.join(p, "qtopengl.qch"), os.path.join(p, "qtwidgets.qch")]) addHelpDocumentation(qchs) setAlwaysStartFullHelp() - if not test.verify(checkIfObjectExists(getQmlItem("Text", ":Qt Creator_QDeclarativeView", False, - "text='Getting Started'")), + getStartedNow = getQmlItem("Button", ":WelcomePage.scrollView_ScrollView", False, + "text='Get Started Now' id='gettingStartedButton'") + if not test.verify(checkIfObjectExists(getStartedNow), "Verifying: Qt Creator displays Welcome Page with Getting Started."): - mouseClick(waitForObject(getQmlItem("LinkedText", ":Qt Creator_QDeclarativeView", False, - "text='Getting Started'")), 5, 5, 0, Qt.LeftButton) + test.fatal("Something's wrong - leaving test.") + invokeMenuItem("File", "Exit") + return # select "Examples" topic - mouseClick(waitForObject(getQmlItem("LinkedText", ":Qt Creator_QDeclarativeView", False, + mouseClick(waitForObject(getQmlItem("Button", ":WelcomePage.scrollView_ScrollView", False, "text='Examples'")), 5, 5, 0, Qt.LeftButton) - test.verify(checkIfObjectExists(getQmlItem("Text", ":Qt Creator_QDeclarativeView", False, + test.verify(checkIfObjectExists(getQmlItem("Text", ":WelcomePage.scrollView_ScrollView", False, "text='Examples'")), "Verifying: 'Examples' topic is opened and the examples are shown.") - # select an example and run example - webPageContentLoadedValue = 0 basePath = "opengl/2dpainting/2dpainting.pro" qt4Exmpl = os.path.join(sdkPath, "Examples", "4.7", basePath) - qt5Exmpl = os.path.join(qt5sdkPath, "examples", basePath) - cleanUpUserFiles([qt4Exmpl, qt5Exmpl]) - removePackagingDirectory(os.path.dirname(qt4Exmpl)) - removePackagingDirectory(os.path.dirname(qt5Exmpl)) - mouseClick(waitForObject(getQmlItem("Text", ":Qt Creator_QDeclarativeView", False, - "text='Search in Examples...'")), 5, 5, 0, Qt.LeftButton) - searchTutsAndExmpl = getQmlItem("TextInput", ":Qt Creator_QDeclarativeView", False) - kitCombo = waitForObject("{clip='false' container=':Qt Creator_QDeclarativeView' enabled='true'" - " type='ChoiceList' unnamed='1' visible='true'}") - test.log("Using examples from Kit %s." % (kitCombo.currentText)) - replaceEditorContent(waitForObject(searchTutsAndExmpl), "qwerty") - test.verify(checkIfObjectExists("{clip='true' container=':Qt Creator_QDeclarativeView' " - "enabled='true' id='captionItem' type='Text' unnamed='1' " - "visible='true'}", False), - "Verifying: 'Tutorials' topic is opened and nothing is shown.") - replaceEditorContent(waitForObject(searchTutsAndExmpl), "2d painting") - twoDPainting = getQmlItem("Text", ":Qt Creator_QDeclarativeView", True, "text~='2D Painting.*'") + qt5Exmpls = [] + for p in Qt5Path.getPaths(Qt5Path.EXAMPLES): + qt5Exmpls.append(os.path.join(p, basePath)) + proFiles = [qt4Exmpl] + proFiles.extend(qt5Exmpls) + cleanUpUserFiles(proFiles) + for p in proFiles: + removePackagingDirectory(os.path.dirname(p)) + examplesLineEdit = getQmlItem("TextField", ":WelcomePage.scrollView_ScrollView", False, + "id='lineEdit' placeholderText='Search in Examples...'") + mouseClick(waitForObject(examplesLineEdit), 5, 5, 0, Qt.LeftButton) + test.log("Using examples from Kit %s." + % (waitForObject(getQmlItem("ComboBox", ":WelcomePage.scrollView_ScrollView", False, + "id='comboBox'")).currentText)) + replaceEditorContent(waitForObject(examplesLineEdit), "qwerty") + test.verify(checkIfObjectExists(getQmlItem("Delegate", ":WelcomePage.scrollView_ScrollView", + False, "id='delegate' radius='0' caption~='.*'"), + False), "Verifying: No example is shown.") + replaceEditorContent(waitForObject(examplesLineEdit), "2d painting") + twoDPainting = getQmlItem("Delegate", ":WelcomePage.scrollView_ScrollView", + False, "id='delegate' radius='0' caption~='2D Painting.*'") test.verify(checkIfObjectExists(twoDPainting), - "Verifying: Text and Video tutorials are shown.") + "Verifying: Example (2D Painting) is shown.") mouseClick(waitForObject(twoDPainting), 5, 5, 0, Qt.LeftButton) handlePackagingMessageBoxes() - waitFor("isLoaded()", 5000) - test.verify("2D Painting Example" in str(waitForObject(":Qt Creator_HelpSelector_QComboBox").currentText), - "Verifying: The example application is opened.") - switchViewTo(ViewConstants.EDIT) + helpWidget = waitForObject(":Help Widget_Help::Internal::HelpWidget") + test.verify(waitFor('"2D Painting Example" in str(helpWidget.windowTitle)', 5000), + "Verifying: The example application is opened inside Help.") + sendEvent("QCloseEvent", helpWidget) + # assume the correct kit is selected, hit Configure Project + clickButton(waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'" + "window=':Qt Creator_Core::Internal::MainWindow'}")) test.verify(checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'" " text='2dpainting' type='QModelIndex'}"), "Verifying: The project is shown in 'Edit' mode.") @@ -125,30 +141,35 @@ def main(): test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"), "Verifying: The first example is closed.") # clean up created packaging directories - removePackagingDirectory(os.path.dirname(qt4Exmpl)) - removePackagingDirectory(os.path.dirname(qt5Exmpl)) + for p in proFiles: + removePackagingDirectory(os.path.dirname(p)) - # close example and go to "Welcome" page -> "Examples" again and choose another example - webPageContentLoadedValue = 0 + # go to "Welcome" page and choose another example switchViewTo(ViewConstants.WELCOME) basePath = "itemviews/addressbook/addressbook.pro" qt4Exmpl = os.path.join(sdkPath, "Examples", "4.7", basePath) - qt5Exmpl = os.path.join(qt5sdkPath, "examples", "widgets", basePath) - cleanUpUserFiles([qt4Exmpl, qt5Exmpl]) - removePackagingDirectory(os.path.dirname(qt4Exmpl)) - removePackagingDirectory(os.path.dirname(qt5Exmpl)) - replaceEditorContent(waitForObject(searchTutsAndExmpl), - "address book") - addressBook = getQmlItem("Text", ":Qt Creator_QDeclarativeView", True, "text~='Address Book.*'") - test.verify(checkIfObjectExists(addressBook), - "Verifying: Text and Video tutorials are shown.") + qt5Exmpls = [] + for p in Qt5Path.getPaths(Qt5Path.EXAMPLES): + qt5Exmpls.append(os.path.join(p, "widgets", basePath)) + proFiles = [qt4Exmpl] + proFiles.extend(qt5Exmpls) + cleanUpUserFiles(proFiles) + for p in proFiles: + removePackagingDirectory(os.path.dirname(p)) + replaceEditorContent(waitForObject(examplesLineEdit), "address book") + addressBook = getQmlItem("Delegate", ":WelcomePage.scrollView_ScrollView", + False, "id='delegate' radius='0' caption~='Address Book.*'") + test.verify(checkIfObjectExists(addressBook), "Verifying: Example (address book) is shown.") mouseClick(waitForObject(addressBook), 5, 5, 0, Qt.LeftButton) handlePackagingMessageBoxes() - waitFor("isLoaded()", 5000) - test.verify("Address Book Example" in str(waitForObject(":Qt Creator_HelpSelector_QComboBox").currentText), - "Verifying: First example is closed and another application is opened.") + helpWidget = waitForObject(":Help Widget_Help::Internal::HelpWidget") + test.verify(waitFor('"Address Book Example" in str(helpWidget.windowTitle)', 5000), + "Verifying: The example application is opened inside Help.") + sendEvent("QCloseEvent", helpWidget) + # assume the correct kit is selected, hit Configure Project + clickButton(waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'" + "window=':Qt Creator_Core::Internal::MainWindow'}")) # close second example application - switchViewTo(ViewConstants.EDIT) test.verify(checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'" " text='propertyanimation' type='QModelIndex'}", False) and checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'" @@ -160,7 +181,7 @@ def main(): test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"), "Verifying: The second example is closed.") # clean up created packaging directories - removePackagingDirectory(os.path.dirname(qt4Exmpl)) - removePackagingDirectory(os.path.dirname(qt5Exmpl)) + for p in proFiles: + removePackagingDirectory(os.path.dirname(p)) # exit Qt Creator invokeMenuItem("File", "Exit") diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index 6a00a50e91..8fd72a8c36 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -71,8 +71,8 @@ def main(): aut.readStderr() clickButton(waitForObject(":Send to Codepaster.Paste_QPushButton")) outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") - waitFor("not outputWindow.plainText.isEmpty()", 20000) - output = str(outputWindow.plainText) + waitFor("'http://' in str(outputWindow.plainText)", 20000) + output = str(outputWindow.plainText).splitlines()[-1] stdErrOut = aut.readStderr() match = re.search("^%s protocol error: (.*)$" % protocol, stdErrOut, re.MULTILINE) if match: @@ -91,6 +91,7 @@ def main(): clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) invokeMenuItem('File', 'Revert "main.cpp" to Saved') clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton")) + snooze(1) # "Close All" might be disabled invokeMenuItem("File", "Close All") if not pasteId: test.fatal("Could not get id of paste to %s" % protocol) |
