diff -Nru kdevplatform-5.1.0/CMakeLists.txt kdevplatform-5.1.1/CMakeLists.txt
--- kdevplatform-5.1.0/CMakeLists.txt 2017-03-13 19:05:37.000000000 +0000
+++ kdevplatform-5.1.1/CMakeLists.txt 2017-05-13 10:12:54.000000000 +0000
@@ -3,7 +3,7 @@
# kdevplatform version
set(KDEVPLATFORM_VERSION_MAJOR 5)
set(KDEVPLATFORM_VERSION_MINOR 1)
-set(KDEVPLATFORM_VERSION_PATCH 0)
+set(KDEVPLATFORM_VERSION_PATCH 1)
# plugin versions listed in the .desktop files
set(KDEV_PLUGIN_VERSION 27)
diff -Nru kdevplatform-5.1.0/debian/changelog kdevplatform-5.1.1/debian/changelog
--- kdevplatform-5.1.0/debian/changelog 2017-04-22 21:36:00.000000000 +0000
+++ kdevplatform-5.1.1/debian/changelog 2017-05-27 13:30:49.000000000 +0000
@@ -1,3 +1,9 @@
+kdevplatform (5.1.1-0ubuntu1) artful; urgency=medium
+
+ * New upstream release (5.1.1)
+
+ -- Rik Mills Sat, 27 May 2017 14:30:49 +0100
+
kdevplatform (5.1.0-0ubuntu1) artful; urgency=medium
[ Clive Johnston ]
diff -Nru kdevplatform-5.1.0/debugger/breakpoint/breakpointdetails.h kdevplatform-5.1.1/debugger/breakpoint/breakpointdetails.h
--- kdevplatform-5.1.0/debugger/breakpoint/breakpointdetails.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/debugger/breakpoint/breakpointdetails.h 2017-05-13 10:12:21.000000000 +0000
@@ -23,7 +23,7 @@
#define KDEVPLATFORM_BREAKPOINTDETAILS_H
#include
-#include "debuggerexport.h"
+#include
class QSpinBox;
class QLabel;
diff -Nru kdevplatform-5.1.0/debugger/breakpoint/breakpointwidget.h kdevplatform-5.1.1/debugger/breakpoint/breakpointwidget.h
--- kdevplatform-5.1.0/debugger/breakpoint/breakpointwidget.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/debugger/breakpoint/breakpointwidget.h 2017-05-13 10:12:21.000000000 +0000
@@ -25,7 +25,7 @@
#include
-#include "debuggerexport.h"
+#include
class QAbstractProxyModel;
class QModelIndex;
diff -Nru kdevplatform-5.1.0/interfaces/iproject.h kdevplatform-5.1.1/interfaces/iproject.h
--- kdevplatform-5.1.0/interfaces/iproject.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/interfaces/iproject.h 2017-05-13 10:12:21.000000000 +0000
@@ -60,7 +60,6 @@
class KDEVPLATFORMINTERFACES_EXPORT IProject : public QObject
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.kdevelop.Project")
Q_PROPERTY(QString projectName READ name CONSTANT)
public:
/**
diff -Nru kdevplatform-5.1.0/language/assistant/renameassistant.cpp kdevplatform-5.1.1/language/assistant/renameassistant.cpp
--- kdevplatform-5.1.0/language/assistant/renameassistant.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/assistant/renameassistant.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -115,7 +115,7 @@
QString RenameAssistant::title() const
{
- return tr("Rename");
+ return i18n("Rename");
}
bool RenameAssistant::isUseful() const
diff -Nru kdevplatform-5.1.0/language/assistant/renameassistant.h kdevplatform-5.1.1/language/assistant/renameassistant.h
--- kdevplatform-5.1.0/language/assistant/renameassistant.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/assistant/renameassistant.h 2017-05-13 10:12:21.000000000 +0000
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_RENAMEEASSISTANT_H
-#define KDEVPLATFORM_RENAMEEASSISTANT_H
+#ifndef KDEVPLATFORM_RENAMEASSISTANT_H
+#define KDEVPLATFORM_RENAMEASSISTANT_H
#include
#include
@@ -54,4 +54,4 @@
}
-#endif // KDEVPLATFORM_RENAMEEASSISTANT_H
+#endif // KDEVPLATFORM_RENAMEASSISTANT_H
diff -Nru kdevplatform-5.1.0/language/backgroundparser/backgroundparser.cpp kdevplatform-5.1.1/language/backgroundparser/backgroundparser.cpp
--- kdevplatform-5.1.0/language/backgroundparser/backgroundparser.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/backgroundparser/backgroundparser.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -819,7 +819,7 @@
return nullptr;
}
if ( !isValidURL(url) ) {
- qWarning() << "Tracker requested for invalild URL:" << url.toUrl();
+ qCWarning(LANGUAGE) << "Tracker requested for invalild URL:" << url.toUrl();
}
Q_ASSERT(isValidURL(url));
diff -Nru kdevplatform-5.1.0/language/CMakeLists.txt kdevplatform-5.1.1/language/CMakeLists.txt
--- kdevplatform-5.1.0/language/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -158,6 +158,7 @@
set(grantlee_LIB_SRCS
codegen/templatesmodel.cpp
+ codegen/templatepreviewicon.cpp
codegen/templateclassgenerator.cpp
codegen/sourcefiletemplate.cpp
codegen/templaterenderer.cpp
@@ -352,6 +353,7 @@
codegen/coderepresentation.h
codegen/utilities.h
codegen/templatesmodel.h
+ codegen/templatepreviewicon.h
codegen/templaterenderer.h
codegen/templateengine.h
codegen/sourcefiletemplate.h
diff -Nru kdevplatform-5.1.0/language/codegen/codegenerator.cpp kdevplatform-5.1.1/language/codegen/codegenerator.cpp
--- kdevplatform-5.1.0/language/codegen/codegenerator.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/codegenerator.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -151,7 +151,7 @@
TopDUContext * documentChain = DUChain::self()->chainForDocument(document);
if(!documentChain)
{
- setErrorText(i18n("Could not find the chain for the selected document: %1").arg(document.url()));
+ setErrorText(i18n("Could not find the chain for the selected document: %1", document.url()));
return false;
}
d->context = documentChain->findContextIncluding(d->range);
diff -Nru kdevplatform-5.1.0/language/codegen/progressdialogs/refactoringdialog.h kdevplatform-5.1.1/language/codegen/progressdialogs/refactoringdialog.h
--- kdevplatform-5.1.0/language/codegen/progressdialogs/refactoringdialog.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/progressdialogs/refactoringdialog.h 2017-05-13 10:12:21.000000000 +0000
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef PROGRESSDIALOGS_H
-#define PROGRESSDIALOGS_H
+#ifndef KDEVPLATFORM_REFACTORINGDIALOG_H
+#define KDEVPLATFORM_REFACTORINGDIALOG_H
#include
#include
diff -Nru kdevplatform-5.1.0/language/codegen/templatepreviewicon.cpp kdevplatform-5.1.1/language/codegen/templatepreviewicon.cpp
--- kdevplatform-5.1.0/language/codegen/templatepreviewicon.cpp 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/templatepreviewicon.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,115 @@
+/* This file is part of KDevelop
+ Copyright 2017 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "templatepreviewicon.h"
+
+#include "util/debug.h"
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+using namespace KDevelop;
+
+class KDevelop::TemplatePreviewIconData : public QSharedData
+{
+public:
+ QString iconName;
+ QString archivePath;
+ QString dataDir;
+};
+
+
+TemplatePreviewIcon::TemplatePreviewIcon(const QString& iconName, const QString& archivePath, const QString& dataDir)
+ : d(new TemplatePreviewIconData)
+{
+ d->iconName = iconName;
+ d->archivePath = archivePath;
+ d->dataDir = dataDir;
+}
+
+TemplatePreviewIcon::TemplatePreviewIcon()
+ : d(new TemplatePreviewIconData)
+{
+}
+
+TemplatePreviewIcon::TemplatePreviewIcon(const TemplatePreviewIcon& other)
+ : d(other.d)
+{
+}
+
+TemplatePreviewIcon::~TemplatePreviewIcon() = default;
+
+TemplatePreviewIcon& TemplatePreviewIcon::operator=(const TemplatePreviewIcon& other)
+{
+ if (this != &other) {
+ d = other.d;
+ }
+
+ return *this;
+}
+
+QPixmap TemplatePreviewIcon::pixmap() const
+{
+ if (!d->iconName.isEmpty()) {
+ // read icon from archive
+ QScopedPointer templateArchive;
+ if (QFileInfo(d->archivePath).completeSuffix() == QLatin1String("zip")) {
+ templateArchive.reset(new KZip(d->archivePath));
+ } else {
+ templateArchive.reset(new KTar(d->archivePath));
+ }
+
+ if (templateArchive->open(QIODevice::ReadOnly)) {
+ const KArchiveFile* iconFile = templateArchive->directory()->file(d->iconName);
+ if (iconFile) {
+ const auto data = iconFile->data();
+ QPixmap pixmap;
+ const bool loadSuccess = pixmap.loadFromData(iconFile->data());
+ if (loadSuccess) {
+ return pixmap;
+ }
+ qCWarning(LANGUAGE) << "Could not load preview icon" << d->iconName << "from" << d->archivePath;
+ }
+ }
+
+ // support legacy templates with image files installed separately in the filesystem
+ const QString iconFilePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, d->dataDir + d->iconName);
+ if (!iconFilePath.isEmpty()) {
+ QPixmap pixmap(iconFilePath);
+ if (!pixmap.isNull()) {
+ return pixmap;
+ }
+ qCWarning(LANGUAGE) << "Could not load preview icon" << iconFilePath << "as wanted for" << d->archivePath;
+ }
+ }
+
+ // try theme icon or default to a kdevelop icon
+ // QIcon::hasThemeIcon for empty string can yield true with some engines, not wanted here
+ const bool isThemeIcon = (!d->iconName.isEmpty() && QIcon::hasThemeIcon(d->iconName));
+ const QString iconName = isThemeIcon ? d->iconName : QStringLiteral("kdevelop");
+
+ const QIcon icon = QIcon::fromTheme(iconName);
+ return icon.pixmap(128, 128);
+}
diff -Nru kdevplatform-5.1.0/language/codegen/templatepreviewicon.h kdevplatform-5.1.1/language/codegen/templatepreviewicon.h
--- kdevplatform-5.1.0/language/codegen/templatepreviewicon.h 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/templatepreviewicon.h 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,84 @@
+/* This file is part of KDevelop
+ Copyright 2017 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KDEVPLATFORM_TEMPLATEPREVIEWICON_H
+#define KDEVPLATFORM_TEMPLATEPREVIEWICON_H
+
+#include
+#include
+
+#include
+
+class QPixmap;
+
+namespace KDevelop
+{
+
+class TemplatePreviewIconData;
+
+/**
+ * @brief A class for loading preview images/icons as specified in a template description on demand
+ *
+ * It stores the icon name as extracted from the template description together with
+ * the path to the archive. Only on demand will the icon file tried to be loaded and
+ * returned as pixmap object.
+ * To support also legacy template installations with the preview image installed as separate file,
+ * the local directory prefix in the QStandardPaths::GenericDataLocation is stored as well
+ * to search also those paths as fallback.
+ *
+ * If the icon name is empty, no matching icon file could be found or no image successfully loaded,
+ * the returned pixmap will default to a themed "kdevelop" icon image (128x128).
+ **/
+class KDEVPLATFORMLANGUAGE_EXPORT TemplatePreviewIcon
+{
+public:
+ /**
+ * Creates a new template preview icon object
+ *
+ * @param iconName the raw icon name as specified in the template description
+ * @param archivePath absolute path to the template archive the icon is used by
+ * @param dataDir local directory prefix of the icon file if searching it through QStandardPaths::GenericDataLocation
+ **/
+ TemplatePreviewIcon(const QString& iconName, const QString& archivePath, const QString& dataDir);
+ TemplatePreviewIcon();
+ TemplatePreviewIcon(const TemplatePreviewIcon& other);
+ ~TemplatePreviewIcon();
+
+ TemplatePreviewIcon& operator=(const TemplatePreviewIcon& other);
+
+public:
+ /**
+ * Generates a pixmap to be used as preview for a template.
+ * Either from the preview image file as specified, or falling back
+ * to a themed "kdevelop" icon image (128x128).
+ * The pixmap is not cached, .
+ *
+ * @return pixmap to be used as preview for a template
+ **/
+ QPixmap pixmap() const;
+
+private:
+ QSharedDataPointer d;
+};
+
+}
+
+Q_DECLARE_METATYPE(KDevelop::TemplatePreviewIcon)
+
+#endif // KDEVPLATFORM_TEMPLATEPREVIEWICON_H
diff -Nru kdevplatform-5.1.0/language/codegen/templatesmodel.cpp kdevplatform-5.1.1/language/codegen/templatesmodel.cpp
--- kdevplatform-5.1.0/language/codegen/templatesmodel.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/templatesmodel.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -19,6 +19,8 @@
*/
#include "templatesmodel.h"
+
+#include "templatepreviewicon.h"
#include "util/debug.h"
#include
@@ -146,20 +148,13 @@
QString name = general.readEntry("Name");
QString category = general.readEntry("Category");
QString comment = general.readEntry("Comment");
+ TemplatePreviewIcon icon(general.readEntry("Icon"), templateArchive, d->resourceFilter(TemplatesModelPrivate::Preview));
QStandardItem *templateItem = d->createItem(name, category, invisibleRootItem());
templateItem->setData(templateDescription, DescriptionFileRole);
templateItem->setData(templateArchive, ArchiveFileRole);
templateItem->setData(comment, CommentRole);
-
- if (general.hasKey("Icon"))
- {
- QString icon = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- d->resourceFilter(TemplatesModelPrivate::Preview, general.readEntry("Icon")));
- if (QFile::exists(icon)) {
- templateItem->setData(icon, IconNameRole);
- }
- }
+ templateItem->setData(QVariant::fromValue(icon), PreviewIconRole);
}
}
@@ -300,21 +295,6 @@
QFileInfo descriptionInfo(localDescriptionsDir + templateEntry->name());
QString destinationName = localDescriptionsDir + templateInfo.baseName() + '.' + descriptionInfo.suffix();
QFile::rename(descriptionInfo.absoluteFilePath(), destinationName);
-
- KConfig config(destinationName);
- KConfigGroup group(&config, "General");
- if (group.hasKey("Icon"))
- {
- const KArchiveEntry* iconEntry = templateArchive->directory()->entry(group.readEntry("Icon"));
- if (iconEntry && iconEntry->isFile())
- {
- const KArchiveFile* iconFile = static_cast(iconEntry);
- const QString saveDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +'/'+ resourceFilter(Preview);
- iconFile->copyTo(saveDir);
- QFileInfo iconInfo(saveDir + templateEntry->name());
- QFile::rename(iconInfo.absoluteFilePath(), saveDir + templateInfo.baseName() + '.' + iconInfo.suffix());
- }
- }
}
else
{
diff -Nru kdevplatform-5.1.0/language/codegen/templatesmodel.h kdevplatform-5.1.1/language/codegen/templatesmodel.h
--- kdevplatform-5.1.0/language/codegen/templatesmodel.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/templatesmodel.h 2017-05-13 10:12:21.000000000 +0000
@@ -40,7 +40,9 @@
* We use QStandardPaths with the GenericData type and create a filter string as such:
* \li templates: typePrefix "/templates/"
* \li descriptions: typePrefix "/template_descriptions/"
- * \li previews: typePrefix "/template_previews/"
+ *
+ * Preview images are directly read from the archives on demand (or for legacy
+ * template installations from typePrefix "/template_previews/").
*
* @sa ITemplateProvider::templatesModel()
**/
@@ -56,7 +58,7 @@
enum TemplateRole
{
DescriptionFileRole = Qt::UserRole + 1, ///< Template description file name
- IconNameRole = Qt::UserRole + 2, ///< Template icon name
+ PreviewIconRole = Qt::UserRole + 2, ///< Template preview icon, provides a TemplatePreviewIcon
CommentRole = Qt::UserRole + 3, ///< Template comment
ArchiveFileRole = Qt::UserRole + 4 ///< Template archive file name
};
diff -Nru kdevplatform-5.1.0/language/codegen/tests/data/CMakeLists.txt kdevplatform-5.1.1/language/codegen/tests/data/CMakeLists.txt
--- kdevplatform-5.1.0/language/codegen/tests/data/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/tests/data/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -1 +1 @@
-add_subdirectory(kdevcodegentest)
\ No newline at end of file
+add_subdirectory(kdevcodegentest)
diff -Nru kdevplatform-5.1.0/language/codegen/tests/data/kdevcodegentest/CMakeLists.txt kdevplatform-5.1.1/language/codegen/tests/data/kdevcodegentest/CMakeLists.txt
--- kdevplatform-5.1.0/language/codegen/tests/data/kdevcodegentest/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/tests/data/kdevcodegentest/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -1 +1 @@
-add_subdirectory(templates)
\ No newline at end of file
+add_subdirectory(templates)
diff -Nru kdevplatform-5.1.0/language/codegen/tests/test_templatesmodel.cpp kdevplatform-5.1.1/language/codegen/tests/test_templatesmodel.cpp
--- kdevplatform-5.1.0/language/codegen/tests/test_templatesmodel.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/codegen/tests/test_templatesmodel.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -67,7 +67,6 @@
QStandardItem* item = items.first();
QCOMPARE(item->data(TemplatesModel::CommentRole).toString(), QStringLiteral("Describes a class using YAML syntax"));
- QVERIFY(item->data(TemplatesModel::IconNameRole).toString().isEmpty());
QString descriptionFile = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kdevcodegentest/template_descriptions/test_yaml.desktop";
diff -Nru kdevplatform-5.1.0/language/duchain/duchaindumper.h kdevplatform-5.1.1/language/duchain/duchaindumper.h
--- kdevplatform-5.1.0/language/duchain/duchaindumper.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/duchain/duchaindumper.h 2017-05-13 10:12:21.000000000 +0000
@@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_DUMPCHAIN_H
-#define KDEVPLATFORM_DUMPCHAIN_H
+#ifndef KDEVPLATFORM_DUCHAINDUMPER_H
+#define KDEVPLATFORM_DUCHAINDUMPER_H
#include
@@ -69,4 +69,4 @@
};
}
-#endif // KDEVPLATFORM_DUMPCHAIN_H
+#endif // KDEVPLATFORM_DUCHAINDUMPER_H
diff -Nru kdevplatform-5.1.0/language/util/navigationtooltip.h kdevplatform-5.1.1/language/util/navigationtooltip.h
--- kdevplatform-5.1.0/language/util/navigationtooltip.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/language/util/navigationtooltip.h 2017-05-13 10:12:21.000000000 +0000
@@ -23,7 +23,7 @@
#include
-#include "languageexport.h"
+#include
namespace KDevelop {
diff -Nru kdevplatform-5.1.0/outputview/outputfilteringstrategies.cpp kdevplatform-5.1.1/outputview/outputfilteringstrategies.cpp
--- kdevplatform-5.1.0/outputview/outputfilteringstrategies.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/outputview/outputfilteringstrategies.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -81,7 +81,7 @@
{
CompilerFilterStrategyPrivate(const QUrl& buildDir);
Path pathForFile( const QString& ) const;
- bool isMultiLineCase(ErrorFormat curErrFilter) const;
+ bool isMultiLineCase(const ErrorFormat& curErrFilter) const;
void putDirAtEnd(const Path& pathToInsert);
QVector m_currentDirs;
@@ -117,7 +117,7 @@
return currentPath;
}
-bool CompilerFilterStrategyPrivate::isMultiLineCase(KDevelop::ErrorFormat curErrFilter) const
+bool CompilerFilterStrategyPrivate::isMultiLineCase(const KDevelop::ErrorFormat& curErrFilter) const
{
if(curErrFilter.compiler == QLatin1String("gfortran") || curErrFilter.compiler == QLatin1String("cmake")) {
return true;
diff -Nru kdevplatform-5.1.0/outputview/outputmodel.cpp kdevplatform-5.1.1/outputview/outputmodel.cpp
--- kdevplatform-5.1.0/outputview/outputmodel.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/outputview/outputmodel.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -305,7 +305,7 @@
KDevelop::IDocumentController *docCtrl = KDevelop::ICore::self()->documentController();
QUrl url = item.url;
if (item.url.isEmpty()) {
- qWarning() << "trying to open empty url";
+ qCWarning(OUTPUTVIEW) << "trying to open empty url";
return;
}
if(url.isRelative()) {
Binary files /tmp/tmpguMsth/1Ge4SGLdIw/kdevplatform-5.1.0/pics/22x22/actions/run-clean.png and /tmp/tmpguMsth/SD1iAirry9/kdevplatform-5.1.1/pics/22x22/actions/run-clean.png differ
Binary files /tmp/tmpguMsth/1Ge4SGLdIw/kdevplatform-5.1.0/pics/22x22/actions/run-install.png and /tmp/tmpguMsth/SD1iAirry9/kdevplatform-5.1.1/pics/22x22/actions/run-install.png differ
diff -Nru kdevplatform-5.1.0/pics/CMakeLists.txt kdevplatform-5.1.1/pics/CMakeLists.txt
--- kdevplatform-5.1.0/pics/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/pics/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -1,3 +1,3 @@
install(DIRECTORY 22x22 DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor)
install(DIRECTORY 16x16 DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor)
-
+install(DIRECTORY scalable DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor)
diff -Nru kdevplatform-5.1.0/pics/scalable/actions/breakpoint.svg kdevplatform-5.1.1/pics/scalable/actions/breakpoint.svg
--- kdevplatform-5.1.0/pics/scalable/actions/breakpoint.svg 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/pics/scalable/actions/breakpoint.svg 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,95 @@
+
+
+
+
diff -Nru kdevplatform-5.1.0/pics/scalable/breakpoint.svg kdevplatform-5.1.1/pics/scalable/breakpoint.svg
--- kdevplatform-5.1.0/pics/scalable/breakpoint.svg 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/pics/scalable/breakpoint.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-
-
-
-
diff -Nru kdevplatform-5.1.0/plugins/appwizard/appwizardplugin.cpp kdevplatform-5.1.1/plugins/appwizard/appwizardplugin.cpp
--- kdevplatform-5.1.0/plugins/appwizard/appwizardplugin.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/appwizardplugin.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -98,10 +98,12 @@
KConfig templateConfig(dlg.appInfo().appTemplate);
KConfigGroup general(&templateConfig, "General");
- QString file = general.readEntry("ShowFilesAfterGeneration");
- if (!file.isEmpty())
- {
- file = KMacroExpander::expandMacros(file, m_variables);
+ const QStringList fileArgs = general.readEntry("ShowFilesAfterGeneration").split(QLatin1Char(','), QString::SkipEmptyParts);
+ for (const auto& fileArg : fileArgs) {
+ QString file = KMacroExpander::expandMacros(fileArg.trimmed(), m_variables);
+ if (QDir::isRelativePath(file)) {
+ file = m_variables[QStringLiteral("PROJECTDIR")] + QLatin1Char('/') + file;
+ }
core()->documentController()->openDocument(QUrl::fromUserInput(file));
}
} else {
@@ -209,7 +211,7 @@
{
QFileInfo templateInfo(info.appTemplate);
if (!templateInfo.exists()) {
- qWarning() << "Project app template does not exist:" << info.appTemplate;
+ qCWarning(PLUGIN_APPWIZARD) << "Project app template does not exist:" << info.appTemplate;
return QString();
}
@@ -225,7 +227,7 @@
}
if(templateArchive.isEmpty()) {
- qWarning() << "Template name does not exist in the template list";
+ qCWarning(PLUGIN_APPWIZARD) << "Template name does not exist in the template list";
return QString();
}
@@ -273,8 +275,42 @@
}
}
- if ( !unpackArchive( arch->directory(), unpackDir ) )
- {
+ // estimate metadata files which should not be copied
+ QStringList metaDataFileNames;
+
+ // try by same name
+ const KArchiveEntry *templateEntry =
+ arch->directory()->entry(templateName + QLatin1String(".kdevtemplate"));
+
+ // but could be different name, if e.g. downloaded, so make a guess
+ if (!templateEntry || !templateEntry->isFile()) {
+ for (const auto& entryName : arch->directory()->entries()) {
+ if (entryName.endsWith(QLatin1String(".kdevtemplate"))) {
+ templateEntry = arch->directory()->entry(entryName);
+ break;
+ }
+ }
+ }
+
+ if (templateEntry && templateEntry->isFile()) {
+ metaDataFileNames << templateEntry->name();
+
+ // check if a preview file is to be ignored
+ const KArchiveFile *templateFile = static_cast(templateEntry);
+ QTemporaryDir temporaryDir;
+ templateFile->copyTo(temporaryDir.path());
+
+ KConfig config(temporaryDir.path() + QLatin1Char('/') + templateEntry->name());
+ KConfigGroup group(&config, "General");
+ if (group.hasKey("Icon")) {
+ const KArchiveEntry* iconEntry = arch->directory()->entry(group.readEntry("Icon"));
+ if (iconEntry && iconEntry->isFile()) {
+ metaDataFileNames << iconEntry->name();
+ }
+ }
+ }
+
+ if (!unpackArchive(arch->directory(), unpackDir, metaDataFileNames)) {
QString errorMsg = i18n("Could not create new project");
vcsError(errorMsg, tmpdir, QUrl::fromLocalFile(unpackDir));
return QString();
@@ -332,8 +368,8 @@
qCDebug(PLUGIN_APPWIZARD) << "Returning" << projectFileName << QFileInfo::exists( projectFileName ) ;
- if( ! QFileInfo::exists( projectFileName ) )
- {
+ const QFileInfo projectFileInfo(projectFileName);
+ if (!projectFileInfo.exists()) {
qCDebug(PLUGIN_APPWIZARD) << "creating .kdev4 file";
KSharedConfigPtr cfg = KSharedConfig::openConfig( projectFileName, KConfig::SimpleConfig );
KConfigGroup project = cfg->group( "Project" );
@@ -358,10 +394,21 @@
qCDebug(PLUGIN_APPWIZARD) << "kdev4 file contents:" << project2.readEntry("Name", "") << project2.readEntry("Manager", "" );
}
+ // create developer .kde4 file
+ const QString developerProjectFileName = projectFileInfo.canonicalPath() + QLatin1String("/.kdev4/") + projectFileInfo.fileName();
+
+ qCDebug(PLUGIN_APPWIZARD) << "creating developer .kdev4 file:" << developerProjectFileName;
+ KSharedConfigPtr developerCfg = KSharedConfig::openConfig(developerProjectFileName, KConfig::SimpleConfig);
+ KConfigGroup developerProjectGroup = developerCfg->group("Project");
+ developerProjectGroup.writeEntry("VersionControlSupport", info.vcsPluginName);
+ developerProjectGroup.sync();
+
+ developerCfg->sync();
+
return projectFileName;
}
-bool AppWizardPlugin::unpackArchive(const KArchiveDirectory *dir, const QString &dest)
+bool AppWizardPlugin::unpackArchive(const KArchiveDirectory* dir, const QString& dest, const QStringList& skipList)
{
qCDebug(PLUGIN_APPWIZARD) << "unpacking dir:" << dir->name() << "to" << dest;
const QStringList entries = dir->entries();
@@ -379,8 +426,10 @@
foreach (const QString& entry, entries)
{
- if (entry.endsWith(QLatin1String(".kdevtemplate")))
+ if (skipList.contains(entry)) {
continue;
+ }
+
if (dir->entry(entry)->isDirectory())
{
const KArchiveDirectory *file = (KArchiveDirectory *)dir->entry(entry);
diff -Nru kdevplatform-5.1.0/plugins/appwizard/appwizardplugin.h kdevplatform-5.1.1/plugins/appwizard/appwizardplugin.h
--- kdevplatform-5.1.0/plugins/appwizard/appwizardplugin.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/appwizardplugin.h 2017-05-13 10:12:21.000000000 +0000
@@ -47,7 +47,7 @@
ProjectTemplatesModel* model();
QString createProject(const ApplicationInfo& );
- bool unpackArchive(const KArchiveDirectory *dir, const QString &dest);
+ bool unpackArchive(const KArchiveDirectory* dir, const QString& dest, const QStringList& skipList = {});
bool copyFileAndExpandMacros(const QString &source, const QString &dest);
ProjectTemplatesModel* m_templatesModel;
diff -Nru kdevplatform-5.1.0/plugins/appwizard/kdevappwizard.json kdevplatform-5.1.1/plugins/appwizard/kdevappwizard.json
--- kdevplatform-5.1.0/plugins/appwizard/kdevappwizard.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/kdevappwizard.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,66 +2,66 @@
"KPlugin": {
"Authors": [
{
- "Name": "Alexander Dymo",
- "Name[uk]": "Олександр Димо",
+ "Name": "Alexander Dymo",
+ "Name[uk]": "Олександр Димо",
"Name[x-test]": "xxAlexander Dymoxx"
}
- ],
- "Category": "Core",
- "Description": "Application Wizard",
- "Description[ca@valencia]": "Assistent d'aplicació",
- "Description[ca]": "Assistent d'aplicació",
- "Description[de]": "Anwendungsassistent",
- "Description[es]": "Asistente de aplicaciones",
- "Description[et]": "Rakenduse nõustaja",
- "Description[fi]": "Opastettu sovelluksen luonti",
- "Description[fr]": "Assistant application",
- "Description[gl]": "Asistente para aplicativos",
- "Description[it]": "Procedura guidata applicazione",
- "Description[nl]": "Programma-assistent",
- "Description[pl]": "Pomocnik programu",
- "Description[pt]": "Assistente de Aplicações",
- "Description[pt_BR]": "Assistente de aplicativo",
- "Description[sk]": "Sprievodca aplikáciou",
- "Description[sl]": "Čarovnik za programe",
- "Description[sv]": "Programguide",
- "Description[uk]": "Майстер створення програм",
- "Description[x-test]": "xxApplication Wizardxx",
- "Description[zh_CN]": "应用程序向导",
- "Icon": "project-development-new-template",
- "Id": "kdevappwizard",
- "License": "GPL",
- "Name": "New Project Wizard",
- "Name[ca@valencia]": "Assistent de projecte nou",
- "Name[ca]": "Assistent de projecte nou",
- "Name[cs]": "Průvodce novým projektem",
- "Name[de]": "Projekt-Assistent",
- "Name[es]": "Asistente de nuevo proyecto",
- "Name[et]": "Uue projekti nõustaja",
- "Name[fi]": "Uuden projektin opastettu luonti",
- "Name[fr]": "Assistant de nouveau projet",
- "Name[gl]": "Asistente para proxectos novos",
- "Name[it]": "Procedura guidata nuovo progetto",
- "Name[nb]": "Veiviser for nytt prosjekt",
- "Name[nl]": "Nieuwe projectenassistent",
- "Name[pl]": "Pomocnik nowego projektu",
- "Name[pt]": "Assistente de Novos Projectos",
- "Name[pt_BR]": "Assistente de novo projeto",
- "Name[ru]": "Мастер создания проекта",
- "Name[sk]": "Sprievodca novým projektom",
- "Name[sl]": "Čarovnik za nov projekt",
- "Name[sv]": "Ny projektguide",
- "Name[uk]": "Майстер створення проекту",
- "Name[x-test]": "xxNew Project Wizardxx",
- "Name[zh_CN]": "新工程向导",
+ ],
+ "Category": "Core",
+ "Description": "Application Wizard",
+ "Description[ca@valencia]": "Assistent d'aplicació",
+ "Description[ca]": "Assistent d'aplicació",
+ "Description[de]": "Anwendungsassistent",
+ "Description[es]": "Asistente de aplicaciones",
+ "Description[et]": "Rakenduse nõustaja",
+ "Description[fi]": "Opastettu sovelluksen luonti",
+ "Description[fr]": "Assistant application",
+ "Description[gl]": "Asistente para aplicativos",
+ "Description[it]": "Procedura guidata applicazione",
+ "Description[nl]": "Programma-assistent",
+ "Description[pl]": "Pomocnik programu",
+ "Description[pt]": "Assistente de Aplicações",
+ "Description[pt_BR]": "Assistente de aplicativo",
+ "Description[sk]": "Sprievodca aplikáciou",
+ "Description[sl]": "Čarovnik za programe",
+ "Description[sv]": "Programguide",
+ "Description[uk]": "Майстер створення програм",
+ "Description[x-test]": "xxApplication Wizardxx",
+ "Description[zh_CN]": "应用程序向导",
+ "Icon": "project-development-new-template",
+ "Id": "kdevappwizard",
+ "License": "GPL",
+ "Name": "New Project Wizard",
+ "Name[ca@valencia]": "Assistent de projecte nou",
+ "Name[ca]": "Assistent de projecte nou",
+ "Name[cs]": "Průvodce novým projektem",
+ "Name[de]": "Projekt-Assistent",
+ "Name[es]": "Asistente de nuevo proyecto",
+ "Name[et]": "Uue projekti nõustaja",
+ "Name[fi]": "Uuden projektin opastettu luonti",
+ "Name[fr]": "Assistant de nouveau projet",
+ "Name[gl]": "Asistente para proxectos novos",
+ "Name[it]": "Procedura guidata nuovo progetto",
+ "Name[nb]": "Veiviser for nytt prosjekt",
+ "Name[nl]": "Nieuwe projectenassistent",
+ "Name[pl]": "Pomocnik nowego projektu",
+ "Name[pt]": "Assistente de Novos Projectos",
+ "Name[pt_BR]": "Assistente de novo projeto",
+ "Name[ru]": "Мастер создания проекта",
+ "Name[sk]": "Sprievodca novým projektom",
+ "Name[sl]": "Čarovnik za nov projekt",
+ "Name[sv]": "Ny projektguide",
+ "Name[uk]": "Майстер створення проекту",
+ "Name[x-test]": "xxNew Project Wizardxx",
+ "Name[zh_CN]": "新工程向导",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.1"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.ITemplateProvider"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/appwizard/kdevappwizard.knsrc kdevplatform-5.1.1/plugins/appwizard/kdevappwizard.knsrc
--- kdevplatform-5.1.0/plugins/appwizard/kdevappwizard.knsrc 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/kdevappwizard.knsrc 2017-05-13 10:12:21.000000000 +0000
@@ -3,11 +3,15 @@
Name[ca]=Plantilles d'aplicació (SDK)
Name[ca@valencia]=Plantilles d'aplicació (SDK)
Name[cs]=Šablony aplikací (SDK)
+Name[de]=Anwendungsvorlagen (SDK)
Name[en_GB]=Application Templates (SDK)
Name[es]=Plantillas de aplicaciones (SDK)
Name[it]=Modelli di applicazioni (SDK)
Name[nl]=Toepassingsjablonen (SDK)
+Name[pl]=Szablony aplikacji (SDK)
Name[pt]=Modelos de Aplicações (SDK)
+Name[sk]=Aplikačné šablóny (SDK)
+Name[sl]=Predloge programov (SDK)
Name[sv]=Programmallar (SDK)
Name[uk]=Шаблони програм (SDK)
Name[x-test]=xxApplication Templates (SDK)xx
diff -Nru kdevplatform-5.1.0/plugins/appwizard/projectselectionpage.cpp kdevplatform-5.1.1/plugins/appwizard/projectselectionpage.cpp
--- kdevplatform-5.1.0/plugins/appwizard/projectselectionpage.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/projectselectionpage.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
@@ -122,16 +123,11 @@
void ProjectSelectionPage::itemChanged( const QModelIndex& current)
{
- QString picPath = current.data( KDevelop::TemplatesModel::IconNameRole ).toString();
- if( picPath.isEmpty() ) {
- QIcon icon(QStringLiteral("kdevelop"));
- ui->icon->setPixmap(icon.pixmap(128, 128));
- ui->icon->setFixedHeight(128);
- } else {
- QPixmap pixmap( picPath );
- ui->icon->setPixmap( pixmap );
- ui->icon->setFixedHeight( pixmap.height() );
- }
+ TemplatePreviewIcon icon = current.data(KDevelop::TemplatesModel::PreviewIconRole).value();
+
+ QPixmap pixmap = icon.pixmap();
+ ui->icon->setPixmap(pixmap);
+ ui->icon->setFixedHeight(pixmap.height());
// header name is either from this index directly or the parents if we show the combo box
const QVariant headerData = ui->templateType->isVisible()
? current.parent().data()
@@ -306,10 +302,20 @@
void ProjectSelectionPage::loadFileClicked()
{
- QString filter = QStringLiteral("application/x-desktop application/x-bzip-compressed-tar application/zip");
- const QString fileName = QFileDialog::getOpenFileName(this, i18n("Load Template From File"), QString(), filter);
- if (!fileName.isEmpty())
- {
+ const QStringList supportedMimeTypes {
+ QStringLiteral("application/x-desktop"),
+ QStringLiteral("application/x-bzip-compressed-tar"),
+ QStringLiteral("application/zip")
+ };
+ QFileDialog fileDialog(this, i18n("Load Template From File"));
+ fileDialog.setMimeTypeFilters(supportedMimeTypes);
+ fileDialog.setFileMode(QFileDialog::ExistingFiles);
+
+ if (!fileDialog.exec()) {
+ return;
+ }
+
+ for (const auto& fileName : fileDialog.selectedFiles()) {
QString destination = m_templatesModel->loadTemplateFile(fileName);
QModelIndexList indexes = m_templatesModel->templateIndexes(destination);
if (indexes.size() > 2)
diff -Nru kdevplatform-5.1.0/plugins/appwizard/projectvcspage.cpp kdevplatform-5.1.1/plugins/appwizard/projectvcspage.cpp
--- kdevplatform-5.1.0/plugins/appwizard/projectvcspage.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/projectvcspage.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -35,7 +35,9 @@
using namespace KDevelop;
ProjectVcsPage::ProjectVcsPage( KDevelop::IPluginController* controller, QWidget * parent )
- : AppWizardPageWidget( parent ), m_ui( new Ui::ProjectVcsPage )
+ : AppWizardPageWidget(parent)
+ , m_currentImportWidget(nullptr)
+ , m_ui(new Ui::ProjectVcsPage)
{
m_ui->setupUi( this );
QList vcsplugins = controller->allPluginsForExtension ( QStringLiteral("org.kdevelop.IBasicVersionControl") );
@@ -65,18 +67,25 @@
m_ui->vcsImportOptions, &QStackedWidget::setCurrentIndex );
connect( m_ui->vcsTypes, static_cast(&KComboBox::activated),
this, &ProjectVcsPage::vcsTypeChanged );
- validateData();
+ vcsTypeChanged(m_ui->vcsTypes->currentIndex());
}
void ProjectVcsPage::vcsTypeChanged( int idx )
{
+ if (m_currentImportWidget) {
+ disconnect(m_currentImportWidget, &VcsImportMetadataWidget::changed, this, &ProjectVcsPage::validateData);
+ }
+
+ // first type in list is "no vcs", without an import widget
+ const int widgetIndex = idx - 1;
+ m_currentImportWidget = importWidgets.value(widgetIndex);
+
validateData();
- int widgetidx = idx - 1;
- disconnect( this, static_cast(nullptr), this, &ProjectVcsPage::validateData );
- if ( widgetidx < 0 || widgetidx >= importWidgets.size())
- return;
- connect( importWidgets[widgetidx], &VcsImportMetadataWidget::changed, this, &ProjectVcsPage::validateData );
+
+ if (m_currentImportWidget) {
+ connect(m_currentImportWidget, &VcsImportMetadataWidget::changed, this, &ProjectVcsPage::validateData);
+ }
}
void ProjectVcsPage::validateData()
@@ -115,40 +124,37 @@
QString ProjectVcsPage::commitMessage() const
{
- int idx = m_ui->vcsTypes->currentIndex() - 1;
- if ( idx < 0 || idx >= importWidgets.size())
+ if (!m_currentImportWidget) {
return QString();
+ }
- return importWidgets[idx]->message();
+ return m_currentImportWidget->message();
}
QUrl ProjectVcsPage::source() const
{
- int idx = m_ui->vcsTypes->currentIndex() - 1;
- if ( idx < 0 || idx >= importWidgets.size())
+ if (!m_currentImportWidget) {
return QUrl();
+ }
- return importWidgets[idx]->source();
+ return m_currentImportWidget->source();
}
KDevelop::VcsLocation ProjectVcsPage::destination() const
{
- int idx = m_ui->vcsTypes->currentIndex() - 1;
- if ( idx < 0 || idx >= importWidgets.size())
+ if (!m_currentImportWidget) {
return KDevelop::VcsLocation();
+ }
- return importWidgets[idx]->destination();
+ return m_currentImportWidget->destination();
}
bool ProjectVcsPage::shouldContinue()
{
- int idx = m_ui->vcsTypes->currentIndex() - 1;
- if ( idx < 0 || idx >= importWidgets.size())
+ if (!m_currentImportWidget) {
return true;
+ }
- KDevelop::VcsImportMetadataWidget* widget = importWidgets[idx];
-
- return widget->hasValidData();
+ return m_currentImportWidget->hasValidData();
}
-
diff -Nru kdevplatform-5.1.0/plugins/appwizard/projectvcspage.h kdevplatform-5.1.1/plugins/appwizard/projectvcspage.h
--- kdevplatform-5.1.0/plugins/appwizard/projectvcspage.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/appwizard/projectvcspage.h 2017-05-13 10:12:21.000000000 +0000
@@ -60,6 +60,7 @@
QString commitMessage() const;
private:
QList importWidgets;
+ KDevelop::VcsImportMetadataWidget* m_currentImportWidget;
QList > vcsPlugins;
Ui::ProjectVcsPage* m_ui;
};
diff -Nru kdevplatform-5.1.0/plugins/bazaar/kdevbazaar.json kdevplatform-5.1.1/plugins/bazaar/kdevbazaar.json
--- kdevplatform-5.1.0/plugins/bazaar/kdevbazaar.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/bazaar/kdevbazaar.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,70 +1,70 @@
{
- "Encoding": "UTF-8",
+ "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
- "Email": "d82ks8djf82msd83hf8sc02lqb5gh5@gmail.com",
- "Name": "Maciej Poleski",
+ "Email": "d82ks8djf82msd83hf8sc02lqb5gh5@gmail.com",
+ "Name": "Maciej Poleski",
"Name[x-test]": "xxMaciej Poleskixx"
}
- ],
- "Category": "Version Control",
- "Description": "This plugin integrates Bazaar to KDevelop",
- "Description[ca@valencia]": "Este connector integra Bazaar al KDevelop",
- "Description[ca]": "Aquest connector integra Bazaar al KDevelop",
- "Description[cs]": "Tento modul integruje podporu pro Bazaar v KDevelop",
- "Description[de]": "Dieses Modul integriert Bazaar in KDevelop",
- "Description[es]": "Este complemento integra Bazaar en KDevelop",
- "Description[et]": "See plugin lõimib Bazaari KDevelopiga",
- "Description[fi]": "Tämä liitännäinen integroi Bazaarin KDevelop-ympäristöön",
- "Description[fr]": "Ce module intègre Bazaar dans KDevelop",
- "Description[gl]": "Este complemento integra Bazaar con KDevelop",
- "Description[it]": "Questa estensione integra Bazaar in KDevelop",
- "Description[nl]": "Deze plugin integreert Bazaar in KDevelop",
- "Description[pl]": "Ta wtyczka udostępnia Bazaar w KDevelopie",
- "Description[pt]": "Este 'plugin' integra o Bazaar no KDevelop",
- "Description[pt_BR]": "Esta extensão integra o Bazaar ao KDevelop",
- "Description[sk]": "Tento plugin integruje Bazaar do KDevelop.",
- "Description[sl]": "Vstavek v KDevelop vgradi Bazaar",
- "Description[sv]": "Insticksprogrammet integrerar Bazaar i KDevelop",
- "Description[uk]": "За допомогою цього додатка можна інтегрувати Bazaar до KDevelop",
- "Description[x-test]": "xxThis plugin integrates Bazaar to KDevelopxx",
- "Description[zh_CN]": "此插件将 Bazaar 整合到 KDevelop",
- "Icon": "bazaar",
- "Id": "kdevbazaar",
- "License": "GPL",
- "Name": "Bazaar Support",
- "Name[ca@valencia]": "Implementació de Bazaar",
- "Name[ca]": "Implementació de Bazaar",
- "Name[cs]": "Podpora Bazaar",
- "Name[de]": "Bazaar-Unterstützung",
- "Name[es]": "Implementación de Bazaar",
- "Name[et]": "Bazaari toetus",
- "Name[fi]": "Bazaar-tuki",
- "Name[fr]": "Prise en charge de Bazaar",
- "Name[gl]": "Soporte de Bazaar",
- "Name[it]": "Supporto Bazaar",
- "Name[nb]": "Bazaar-støtte",
- "Name[nl]": "Ondersteuning van Bazaar",
- "Name[nn]": "DPMS-støtte",
- "Name[pl]": "Obsługa Bazaar",
- "Name[pt]": "Suporte para o Bazaar",
- "Name[pt_BR]": "Suporte a Bazaar",
- "Name[ru]": "Поддержка Bazaar",
- "Name[sk]": "Podpora Bazaar",
- "Name[sl]": "Podpora za Bazaar",
- "Name[sv]": "Stöd för Bazaar",
- "Name[uk]": "Підтримка Bazaar",
- "Name[x-test]": "xxBazaar Supportxx",
- "Name[zh_CN]": "Bazaar 支持",
+ ],
+ "Category": "Version Control",
+ "Description": "This plugin integrates Bazaar to KDevelop",
+ "Description[ca@valencia]": "Este connector integra Bazaar al KDevelop",
+ "Description[ca]": "Aquest connector integra Bazaar al KDevelop",
+ "Description[cs]": "Tento modul integruje podporu pro Bazaar v KDevelop",
+ "Description[de]": "Dieses Modul integriert Bazaar in KDevelop",
+ "Description[es]": "Este complemento integra Bazaar en KDevelop",
+ "Description[et]": "See plugin lõimib Bazaari KDevelopiga",
+ "Description[fi]": "Tämä liitännäinen integroi Bazaarin KDevelop-ympäristöön",
+ "Description[fr]": "Ce module intègre Bazaar dans KDevelop",
+ "Description[gl]": "Este complemento integra Bazaar con KDevelop",
+ "Description[it]": "Questa estensione integra Bazaar in KDevelop",
+ "Description[nl]": "Deze plugin integreert Bazaar in KDevelop",
+ "Description[pl]": "Ta wtyczka udostępnia Bazaar w KDevelopie",
+ "Description[pt]": "Este 'plugin' integra o Bazaar no KDevelop",
+ "Description[pt_BR]": "Esta extensão integra o Bazaar ao KDevelop",
+ "Description[sk]": "Tento plugin integruje Bazaar do KDevelop.",
+ "Description[sl]": "Vstavek v KDevelop vgradi Bazaar",
+ "Description[sv]": "Insticksprogrammet integrerar Bazaar i KDevelop",
+ "Description[uk]": "За допомогою цього додатка можна інтегрувати Bazaar до KDevelop",
+ "Description[x-test]": "xxThis plugin integrates Bazaar to KDevelopxx",
+ "Description[zh_CN]": "此插件将 Bazaar 整合到 KDevelop",
+ "Icon": "bazaar",
+ "Id": "kdevbazaar",
+ "License": "GPL",
+ "Name": "Bazaar Support",
+ "Name[ca@valencia]": "Implementació de Bazaar",
+ "Name[ca]": "Implementació de Bazaar",
+ "Name[cs]": "Podpora Bazaar",
+ "Name[de]": "Bazaar-Unterstützung",
+ "Name[es]": "Implementación de Bazaar",
+ "Name[et]": "Bazaari toetus",
+ "Name[fi]": "Bazaar-tuki",
+ "Name[fr]": "Prise en charge de Bazaar",
+ "Name[gl]": "Soporte de Bazaar",
+ "Name[it]": "Supporto Bazaar",
+ "Name[nb]": "Bazaar-støtte",
+ "Name[nl]": "Ondersteuning van Bazaar",
+ "Name[nn]": "DPMS-støtte",
+ "Name[pl]": "Obsługa Bazaar",
+ "Name[pt]": "Suporte para o Bazaar",
+ "Name[pt_BR]": "Suporte a Bazaar",
+ "Name[ru]": "Поддержка Bazaar",
+ "Name[sk]": "Podpora Bazaar",
+ "Name[sl]": "Podpora za Bazaar",
+ "Name[sv]": "Stöd för Bazaar",
+ "Name[uk]": "Підтримка Bazaar",
+ "Name[x-test]": "xxBazaar Supportxx",
+ "Name[zh_CN]": "Bazaar 支持",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "1.0"
- },
+ },
"X-KDevelop-Interfaces": [
- "org.kdevelop.IBasicVersionControl",
+ "org.kdevelop.IBasicVersionControl",
"org.kdevelop.IDistributedVersionControl"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/classbrowser/kdevclassbrowser.json kdevplatform-5.1.1/plugins/classbrowser/kdevclassbrowser.json
--- kdevplatform-5.1.0/plugins/classbrowser/kdevclassbrowser.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/classbrowser/kdevclassbrowser.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,61 +2,61 @@
"KPlugin": {
"Authors": [
{
- "Name": "Hamish Rodda",
+ "Name": "Hamish Rodda",
"Name[x-test]": "xxHamish Roddaxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin provides a browsable model of the currently parsed classes and other items.",
- "Description[ca@valencia]": "Este connector proporciona un model navegable de les classes analitzades actualment i altres elements.",
- "Description[ca]": "Aquest connector proporciona un model navegable de les classes analitzades actualment i altres elements.",
- "Description[de]": "Dieses Modul bietet eine Liste der aktuell eingelesenen Klassen und anderer Elemente.",
- "Description[es]": "Este complemento proporciona un modelo navegable de las clases actualmente analizadas y de otros elementos.",
- "Description[et]": "See plugin pakub parajasti parsitavate klasside ja teiste elementide sirvitavat mudelit.",
- "Description[fi]": "Tämä liitännäinen tarjoaa selattavan mallin nykyisellään jäsennetyistä luokista ja muista kohteista.",
- "Description[fr]": "Ce module fournit un modèle navigable des classes actuellement analysées et d'autres éléments.",
- "Description[gl]": "Este complemento fornece un modelo navegábel das clases e outros elementos que estean procesados.",
- "Description[it]": "Questa estensione fornisce un modello sfogliabile delle classi attualmente analizzate e altri elementi.",
- "Description[nl]": "Deze plugin levert een model om door te bladeren van de nu ontlede klasse's en andere items.",
- "Description[pl]": "Ta wtyczka udostępnia możliwy do przeglądania model przeanalizowanych klas i innych elementów.",
- "Description[pt]": "Este 'plugin' oferece uma visão navegável sobre as classes e outros itens que estejam a ser processados de momento.",
- "Description[pt_BR]": "Este plugin fornece um modelo navegável das classes atualmente analisadas e outros itens.",
- "Description[sk]": "Tento plugin poskytuje prehliadateľný model aktuálne analyzovanej triedy a iných položiek.",
- "Description[sl]": "Vstavek vgradi model trenutno razčlenjenih razredov in drugih predmetov, po katerih je mogoče brskati.",
- "Description[sv]": "Insticksprogrammet tillhandahåller en bläddringsbar modell av klasser och andra objekt som för närvarande har tolkats.",
- "Description[uk]": "За допомогою цього додатка можна створити придатну для перегляду модель класів та інших елементів, над якими ви працюєте.",
- "Description[x-test]": "xxThis plugin provides a browsable model of the currently parsed classes and other items.xx",
- "Description[zh_CN]": "此插件提供了一个当前已分析类和其它项目的可浏览化视窗模型。",
- "Icon": "code-class",
- "Id": "kdevclassbrowser",
- "License": "GPL",
- "Name": "Class Browser",
- "Name[ca@valencia]": "Navegador de classes",
- "Name[ca]": "Navegador de classes",
- "Name[cs]": "Prohlížeč tříd",
- "Name[de]": "Klassen-Browser",
- "Name[es]": "Navegador de clases",
- "Name[et]": "Klassibrauser",
- "Name[fi]": "Luokkaselain",
- "Name[fr]": "Navigateur de classe",
- "Name[gl]": "Navegador de clases",
- "Name[it]": "Browser classi",
- "Name[nb]": "Klasseleser",
- "Name[nl]": "Klassen-browser",
- "Name[pl]": "Przeglądarka klas",
- "Name[pt]": "Navegador de Classes",
- "Name[pt_BR]": "Navegador de classes",
- "Name[ru]": "Дерево классов",
- "Name[sk]": "Prehliadač tried",
- "Name[sl]": "Brskalnik po razredih",
- "Name[sv]": "Klassbläddrare",
- "Name[uk]": "Переглядач класів",
- "Name[x-test]": "xxClass Browserxx",
- "Name[zh_CN]": "类浏览器",
+ ],
+ "Category": "Core",
+ "Description": "This plugin provides a browsable model of the currently parsed classes and other items.",
+ "Description[ca@valencia]": "Este connector proporciona un model navegable de les classes analitzades actualment i altres elements.",
+ "Description[ca]": "Aquest connector proporciona un model navegable de les classes analitzades actualment i altres elements.",
+ "Description[de]": "Dieses Modul bietet eine Liste der aktuell eingelesenen Klassen und anderer Elemente.",
+ "Description[es]": "Este complemento proporciona un modelo navegable de las clases actualmente analizadas y de otros elementos.",
+ "Description[et]": "See plugin pakub parajasti parsitavate klasside ja teiste elementide sirvitavat mudelit.",
+ "Description[fi]": "Tämä liitännäinen tarjoaa selattavan mallin nykyisellään jäsennetyistä luokista ja muista kohteista.",
+ "Description[fr]": "Ce module fournit un modèle navigable des classes actuellement analysées et d'autres éléments.",
+ "Description[gl]": "Este complemento fornece un modelo navegábel das clases e outros elementos que estean procesados.",
+ "Description[it]": "Questa estensione fornisce un modello sfogliabile delle classi attualmente analizzate e altri elementi.",
+ "Description[nl]": "Deze plugin levert een model om door te bladeren van de nu ontlede klasse's en andere items.",
+ "Description[pl]": "Ta wtyczka udostępnia możliwy do przeglądania model przeanalizowanych klas i innych elementów.",
+ "Description[pt]": "Este 'plugin' oferece uma visão navegável sobre as classes e outros itens que estejam a ser processados de momento.",
+ "Description[pt_BR]": "Este plugin fornece um modelo navegável das classes atualmente analisadas e outros itens.",
+ "Description[sk]": "Tento plugin poskytuje prehliadateľný model aktuálne analyzovanej triedy a iných položiek.",
+ "Description[sl]": "Vstavek vgradi model trenutno razčlenjenih razredov in drugih predmetov, po katerih je mogoče brskati.",
+ "Description[sv]": "Insticksprogrammet tillhandahåller en bläddringsbar modell av klasser och andra objekt som för närvarande har tolkats.",
+ "Description[uk]": "За допомогою цього додатка можна створити придатну для перегляду модель класів та інших елементів, над якими ви працюєте.",
+ "Description[x-test]": "xxThis plugin provides a browsable model of the currently parsed classes and other items.xx",
+ "Description[zh_CN]": "此插件提供了一个当前已分析类和其它项目的可浏览化视窗模型。",
+ "Icon": "code-class",
+ "Id": "kdevclassbrowser",
+ "License": "GPL",
+ "Name": "Class Browser",
+ "Name[ca@valencia]": "Navegador de classes",
+ "Name[ca]": "Navegador de classes",
+ "Name[cs]": "Prohlížeč tříd",
+ "Name[de]": "Klassen-Browser",
+ "Name[es]": "Navegador de clases",
+ "Name[et]": "Klassibrauser",
+ "Name[fi]": "Luokkaselain",
+ "Name[fr]": "Navigateur de classe",
+ "Name[gl]": "Navegador de clases",
+ "Name[it]": "Browser classi",
+ "Name[nb]": "Klasseleser",
+ "Name[nl]": "Klassen-browser",
+ "Name[pl]": "Przeglądarka klas",
+ "Name[pt]": "Navegador de Classes",
+ "Name[pt_BR]": "Navegador de classes",
+ "Name[ru]": "Дерево классов",
+ "Name[sk]": "Prehliadač tried",
+ "Name[sl]": "Brskalnik po razredih",
+ "Name[sv]": "Klassbläddrare",
+ "Name[uk]": "Переглядач класів",
+ "Name[x-test]": "xxClass Browserxx",
+ "Name[zh_CN]": "类浏览器",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/codeutils/codeutilsplugin.cpp kdevplatform-5.1.1/plugins/codeutils/codeutilsplugin.cpp
--- kdevplatform-5.1.0/plugins/codeutils/codeutilsplugin.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/codeutils/codeutilsplugin.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -144,7 +144,7 @@
QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdevcodeutils/templates/" + templateName + ".txt");
if (fileName.isEmpty())
{
- qWarning() << "No suitable template found" << fileName;
+ qCWarning(PLUGIN_CODEUTILS) << "No suitable template found" << fileName;
return;
}
diff -Nru kdevplatform-5.1.0/plugins/codeutils/doc_templates/CMakeLists.txt kdevplatform-5.1.1/plugins/codeutils/doc_templates/CMakeLists.txt
--- kdevplatform-5.1.0/plugins/codeutils/doc_templates/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/codeutils/doc_templates/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -4,4 +4,4 @@
rest_python.txt
phpdoc_php.txt
DESTINATION ${KDE_INSTALL_DATADIR}/kdevcodeutils/templates
-)
\ No newline at end of file
+)
diff -Nru kdevplatform-5.1.0/plugins/codeutils/kdevcodeutils.json kdevplatform-5.1.1/plugins/codeutils/kdevcodeutils.json
--- kdevplatform-5.1.0/plugins/codeutils/kdevcodeutils.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/codeutils/kdevcodeutils.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,54 +1,54 @@
{
"KPlugin": {
- "Category": "Utilities",
- "Description": "Collection of various utilities that increase productivity while programming.",
- "Description[ca@valencia]": "Col·lecció de diverses utilitats que augmenten la productivitat durant la programació.",
- "Description[ca]": "Col·lecció de diverses utilitats que augmenten la productivitat durant la programació.",
- "Description[de]": "Sammlung verschiedener Werkzeuge, die die Produktivität während des Programmierens erhöhen.",
- "Description[es]": "Colección de diversas utilidades que incrementan la productividad de la programación.",
- "Description[et]": "Mitmesugused tööriistad, mis suurendavad produktiivsust programmeerimisel.",
- "Description[fi]": "Kokoelma sekalaisia työkaluja, jotka lisäävät ohjelmointisi tuottavuutta.",
- "Description[fr]": "Collection d'utilitaires variés qui améliorent la productivité pour programmer.",
- "Description[gl]": "Colección de varias utilidades que aumentan a produtividade durante a programación.",
- "Description[it]": "Raccolta di varie utilità che aumentano la produttività durante la programmazione.",
- "Description[nl]": "Verzameling van hulpprogramma's die de productiviteit vergroot bij het programmeren.",
- "Description[pl]": "Zbiór różnych narzędzi zwiększających produktywność podczas programowania.",
- "Description[pt]": "Uma colecção de vários utilitários que aumentam a produtividade durante o desenvolvimento.",
- "Description[pt_BR]": "Uma coleção de vários utilitários que aumentam a produtividade durante a programação.",
- "Description[sk]": "Zbierka rôznych utilít, ktoré zvyšujú produktivitu počas programovania.",
- "Description[sl]": "Zbirka raznih pripomočkov, ki povečajo učinkovitost med programiranjem.",
- "Description[sv]": "Samling av diverse verktyg för att öka produktiviteten vid programmering.",
- "Description[uk]": "Збірка різноманітних допоміжних програм, яка підвищує продуктивність програмування.",
- "Description[x-test]": "xxCollection of various utilities that increase productivity while programming.xx",
- "Description[zh_CN]": "多种提升编程生产力的工具集合。",
- "Icon": "help-hint",
- "Id": "kdevcodeutils",
- "Name": "Code Utilities",
- "Name[ca@valencia]": "Utilitats de codi",
- "Name[ca]": "Utilitats de codi",
- "Name[de]": "Quelltext-Werkzeuge",
- "Name[es]": "Utilidades de código fuente",
- "Name[et]": "Kooditööriistad",
- "Name[fi]": "Koodityökalut",
- "Name[fr]": "Utilitaires de code",
- "Name[gl]": "Utilidades de código",
- "Name[it]": "Utilità per il codice",
- "Name[nb]": "Kodeverktøy",
- "Name[nl]": "Hulpmiddelen bij coderen",
- "Name[pl]": "Narzędzia kodu",
- "Name[pt]": "Utilitários de Código",
- "Name[pt_BR]": "Utilitários de código",
- "Name[ru]": "Утилиты для работы с кодом",
- "Name[sk]": "Nástroje kódu",
- "Name[sl]": "Pripomočki za kodo",
- "Name[sv]": "Kodverktyg",
- "Name[uk]": "Допоміжні засоби",
- "Name[x-test]": "xxCode Utilitiesxx",
- "Name[zh_CN]": "代码工具",
+ "Category": "Utilities",
+ "Description": "Collection of various utilities that increase productivity while programming.",
+ "Description[ca@valencia]": "Col·lecció de diverses utilitats que augmenten la productivitat durant la programació.",
+ "Description[ca]": "Col·lecció de diverses utilitats que augmenten la productivitat durant la programació.",
+ "Description[de]": "Sammlung verschiedener Werkzeuge, die die Produktivität während des Programmierens erhöhen.",
+ "Description[es]": "Colección de diversas utilidades que incrementan la productividad de la programación.",
+ "Description[et]": "Mitmesugused tööriistad, mis suurendavad produktiivsust programmeerimisel.",
+ "Description[fi]": "Kokoelma sekalaisia työkaluja, jotka lisäävät ohjelmointisi tuottavuutta.",
+ "Description[fr]": "Collection d'utilitaires variés qui améliorent la productivité pour programmer.",
+ "Description[gl]": "Colección de varias utilidades que aumentan a produtividade durante a programación.",
+ "Description[it]": "Raccolta di varie utilità che aumentano la produttività durante la programmazione.",
+ "Description[nl]": "Verzameling van hulpprogramma's die de productiviteit vergroot bij het programmeren.",
+ "Description[pl]": "Zbiór różnych narzędzi zwiększających produktywność podczas programowania.",
+ "Description[pt]": "Uma colecção de vários utilitários que aumentam a produtividade durante o desenvolvimento.",
+ "Description[pt_BR]": "Uma coleção de vários utilitários que aumentam a produtividade durante a programação.",
+ "Description[sk]": "Zbierka rôznych utilít, ktoré zvyšujú produktivitu počas programovania.",
+ "Description[sl]": "Zbirka raznih pripomočkov, ki povečajo učinkovitost med programiranjem.",
+ "Description[sv]": "Samling av diverse verktyg för att öka produktiviteten vid programmering.",
+ "Description[uk]": "Збірка різноманітних допоміжних програм, яка підвищує продуктивність програмування.",
+ "Description[x-test]": "xxCollection of various utilities that increase productivity while programming.xx",
+ "Description[zh_CN]": "多种提升编程生产力的工具集合。",
+ "Icon": "help-hint",
+ "Id": "kdevcodeutils",
+ "Name": "Code Utilities",
+ "Name[ca@valencia]": "Utilitats de codi",
+ "Name[ca]": "Utilitats de codi",
+ "Name[de]": "Quelltext-Werkzeuge",
+ "Name[es]": "Utilidades de código fuente",
+ "Name[et]": "Kooditööriistad",
+ "Name[fi]": "Koodityökalut",
+ "Name[fr]": "Utilitaires de code",
+ "Name[gl]": "Utilidades de código",
+ "Name[it]": "Utilità per il codice",
+ "Name[nb]": "Kodeverktøy",
+ "Name[nl]": "Hulpmiddelen bij coderen",
+ "Name[pl]": "Narzędzia kodu",
+ "Name[pt]": "Utilitários de Código",
+ "Name[pt_BR]": "Utilitários de código",
+ "Name[ru]": "Утилиты для работы с кодом",
+ "Name[sk]": "Nástroje kódu",
+ "Name[sl]": "Pripomočki za kodo",
+ "Name[sv]": "Kodverktyg",
+ "Name[uk]": "Допоміжні засоби",
+ "Name[x-test]": "xxCode Utilitiesxx",
+ "Name[zh_CN]": "代码工具",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/contextbrowser/contextbrowser.cpp kdevplatform-5.1.1/plugins/contextbrowser/contextbrowser.cpp
--- kdevplatform-5.1.0/plugins/contextbrowser/contextbrowser.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/contextbrowser/contextbrowser.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -400,7 +400,7 @@
{
m_plugin->m_mouseHoverCursor = KTextEditor::Cursor(cursor);
if(!view) {
- qWarning() << "could not cast to view";
+ qCWarning(PLUGIN_CONTEXTBROWSER) << "could not cast to view";
}else{
m_plugin->m_mouseHoverDocument = view->document()->url();
m_plugin->m_updateViews << view;
@@ -1388,7 +1388,7 @@
{
KTextEditor::View* view = qobject_cast(sender());
if(!view) {
- qWarning() << "sender is not a view";
+ qCWarning(PLUGIN_CONTEXTBROWSER) << "sender is not a view";
return;
}
KTextEditor::CodeCompletionInterface* iface = qobject_cast(view);
diff -Nru kdevplatform-5.1.0/plugins/contextbrowser/kdevcontextbrowser.json kdevplatform-5.1.1/plugins/contextbrowser/kdevcontextbrowser.json
--- kdevplatform-5.1.0/plugins/contextbrowser/kdevcontextbrowser.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/contextbrowser/kdevcontextbrowser.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,67 +2,67 @@
"KPlugin": {
"Authors": [
{
- "Name": "David Nolden",
+ "Name": "David Nolden",
"Name[x-test]": "xxDavid Noldenxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin shows information about the current language context in a side view, and highlights relevant declarations and uses.",
- "Description[ca@valencia]": "Este connector mostra informació quant al context del llenguatge actual en una vista lateral i ressalta les declaracions i els usos apropiats.",
- "Description[ca]": "Aquest connector mostra informació quant al context del llenguatge actual en una vista lateral i ressalta les declaracions i els usos apropiats.",
- "Description[de]": "Dieses Modul zeigt Informationen über den aktuellen Sprachkontext an und hebt die wichtigen Deklarationen und Vorkommen hervor.",
- "Description[es]": "Este complemento muestra información de contexto sobre el lenguaje actual en una vista lateral, resaltando declaraciones relevantes y sus usos.",
- "Description[et]": "See plugin pakub külgvaates teavet aktiivse keele konteksti kohta ning tõstab esile asjakohased deklaratsioonid ja kasutused.",
- "Description[fi]": "Tämä liitännäinen näyttää tietoja nykyisestä kielikontekstista sivunäkymässä ja korostaa olennaisia esittelyjä ja käyttöjä.",
- "Description[fr]": "Ce module affiche des informations à propos du contexte du langage courant dans une vue latérale, et met en évidence les déclarations et utilisations reliées.",
- "Description[gl]": "Este complemento mostra información acerca do contexto da linguaxe actual nunha vista lateral, e realza as declaracións e utilizacións relevantes.",
- "Description[it]": "Questa estensione mostra le informazioni sul contesto del linguaggio corrente in una vista laterale, mettendo in evidenza le dichiarazioni e gli usi.",
- "Description[nl]": "Deze plugin toont informatie over de huidige taalcontext in een zijvak en accentueert relevante declaraties en gebruik.",
- "Description[pl]": "Ta wtyczka pokazuje informacje dotyczące kontekstu bieżącego języka w widoku bocznym, podświetla deklaracja i ich użycia.",
- "Description[pt]": "Este 'plugin' mostra informações sobre o contexto da linguagem actual numa vista lateral, assim como realça as declarações e utilizações relevantes.",
- "Description[pt_BR]": "Este plugin mostra informações sobre a linguagem utilizada no momento, numa visão lateral, e destaca declarações relevantes e seus usos.",
- "Description[sk]": "Tento plugin zobrazuje informácie o aktuálnom jazykovom kontexte v božnom pohľade, a zvýrazní relevantné deklarácie a použitia.",
- "Description[sl]": "Vstavek prikazuje podatke o trenutnem kontekstu jezika in poudari pomembne deklaracije in uporabe.",
- "Description[sv]": "Insticksprogrammet visar information om nuvarande språksammanhang i en sidovy, och markerar relevanta deklarationer och användningar.",
- "Description[uk]": "За допомогою цього додатка можна переглянути у перегляді на бічній панелі відомості про поточний контекст мови, а також підсвітити пов’язані оголошення і випадки використання.",
- "Description[x-test]": "xxThis plugin shows information about the current language context in a side view, and highlights relevant declarations and uses.xx",
- "Description[zh_CN]": "此插件在侧边视图中显示关于当前语言上下文的信息,并加亮突出相关的声明和调用。",
- "Icon": "code-context",
- "Id": "kdevcontextbrowser",
- "License": "GPL",
- "Name": "Code Browser",
- "Name[ca@valencia]": "Navegador de codi",
- "Name[ca]": "Navegador de codi",
- "Name[cs]": "Prohlížeč kódu",
- "Name[de]": "Quelltext-Browser",
- "Name[es]": "Navegador de código",
- "Name[et]": "Koodibrauser",
- "Name[fi]": "Koodiselain",
- "Name[fr]": "Navigateur de code",
- "Name[gl]": "Navegador do código",
- "Name[it]": "Browser del codice",
- "Name[nb]": "Kodeleser",
- "Name[nl]": "Broncode-browser",
- "Name[pl]": "Przeglądarka kodu",
- "Name[pt]": "Navegador do Código",
- "Name[pt_BR]": "Navegador de código",
- "Name[ru]": "Навигация по коду",
- "Name[sk]": "Prehliadač kódu",
- "Name[sl]": "Brskalnik po kodi",
- "Name[sv]": "Kodbläddrare",
- "Name[uk]": "Переглядач коду",
- "Name[x-test]": "xxCode Browserxx",
- "Name[zh_CN]": "代码浏览器",
+ ],
+ "Category": "Core",
+ "Description": "This plugin shows information about the current language context in a side view, and highlights relevant declarations and uses.",
+ "Description[ca@valencia]": "Este connector mostra informació quant al context del llenguatge actual en una vista lateral i ressalta les declaracions i els usos apropiats.",
+ "Description[ca]": "Aquest connector mostra informació quant al context del llenguatge actual en una vista lateral i ressalta les declaracions i els usos apropiats.",
+ "Description[de]": "Dieses Modul zeigt Informationen über den aktuellen Sprachkontext an und hebt die wichtigen Deklarationen und Vorkommen hervor.",
+ "Description[es]": "Este complemento muestra información de contexto sobre el lenguaje actual en una vista lateral, resaltando declaraciones relevantes y sus usos.",
+ "Description[et]": "See plugin pakub külgvaates teavet aktiivse keele konteksti kohta ning tõstab esile asjakohased deklaratsioonid ja kasutused.",
+ "Description[fi]": "Tämä liitännäinen näyttää tietoja nykyisestä kielikontekstista sivunäkymässä ja korostaa olennaisia esittelyjä ja käyttöjä.",
+ "Description[fr]": "Ce module affiche des informations à propos du contexte du langage courant dans une vue latérale, et met en évidence les déclarations et utilisations reliées.",
+ "Description[gl]": "Este complemento mostra información sobre o contexto da linguaxe actual nunha vista lateral, e realza as declaracións e utilizacións relevantes.",
+ "Description[it]": "Questa estensione mostra le informazioni sul contesto del linguaggio corrente in una vista laterale, mettendo in evidenza le dichiarazioni e gli usi.",
+ "Description[nl]": "Deze plugin toont informatie over de huidige taalcontext in een zijvak en accentueert relevante declaraties en gebruik.",
+ "Description[pl]": "Ta wtyczka pokazuje informacje dotyczące kontekstu bieżącego języka w widoku bocznym, podświetla deklaracja i ich użycia.",
+ "Description[pt]": "Este 'plugin' mostra informações sobre o contexto da linguagem actual numa vista lateral, assim como realça as declarações e utilizações relevantes.",
+ "Description[pt_BR]": "Este plugin mostra informações sobre a linguagem utilizada no momento, numa visão lateral, e destaca declarações relevantes e seus usos.",
+ "Description[sk]": "Tento plugin zobrazuje informácie o aktuálnom jazykovom kontexte v božnom pohľade, a zvýrazní relevantné deklarácie a použitia.",
+ "Description[sl]": "Vstavek prikazuje podatke o trenutnem kontekstu jezika in poudari pomembne deklaracije in uporabe.",
+ "Description[sv]": "Insticksprogrammet visar information om nuvarande språksammanhang i en sidovy, och markerar relevanta deklarationer och användningar.",
+ "Description[uk]": "За допомогою цього додатка можна переглянути у перегляді на бічній панелі відомості про поточний контекст мови, а також підсвітити пов’язані оголошення і випадки використання.",
+ "Description[x-test]": "xxThis plugin shows information about the current language context in a side view, and highlights relevant declarations and uses.xx",
+ "Description[zh_CN]": "此插件在侧边视图中显示关于当前语言上下文的信息,并加亮突出相关的声明和调用。",
+ "Icon": "code-context",
+ "Id": "kdevcontextbrowser",
+ "License": "GPL",
+ "Name": "Code Browser",
+ "Name[ca@valencia]": "Navegador de codi",
+ "Name[ca]": "Navegador de codi",
+ "Name[cs]": "Prohlížeč kódu",
+ "Name[de]": "Quelltext-Browser",
+ "Name[es]": "Navegador de código",
+ "Name[et]": "Koodibrauser",
+ "Name[fi]": "Koodiselain",
+ "Name[fr]": "Navigateur de code",
+ "Name[gl]": "Navegador do código",
+ "Name[it]": "Browser del codice",
+ "Name[nb]": "Kodeleser",
+ "Name[nl]": "Broncode-browser",
+ "Name[pl]": "Przeglądarka kodu",
+ "Name[pt]": "Navegador do Código",
+ "Name[pt_BR]": "Navegador de código",
+ "Name[ru]": "Навигация по коду",
+ "Name[sk]": "Prehliadač kódu",
+ "Name[sl]": "Brskalnik po kodi",
+ "Name[sv]": "Kodbläddrare",
+ "Name[uk]": "Переглядач коду",
+ "Name[x-test]": "xxCode Browserxx",
+ "Name[zh_CN]": "代码浏览器",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-IRequired": [
"org.kdevelop.IQuickOpen"
- ],
+ ],
"X-KDevelop-Interfaces": [
"org.kdevelop.IContextBrowser"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/cvs/checkoutdialog.ui kdevplatform-5.1.1/plugins/cvs/checkoutdialog.ui
--- kdevplatform-5.1.0/plugins/cvs/checkoutdialog.ui 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/cvs/checkoutdialog.ui 2017-05-13 10:12:21.000000000 +0000
@@ -113,11 +113,6 @@
kcombobox.h
- QLineEdit
- QLineEdit
- klineedit.h
-
- KUrlRequesterQWidgetkurlrequester.h
diff -Nru kdevplatform-5.1.0/plugins/cvs/CMakeLists.txt kdevplatform-5.1.1/plugins/cvs/CMakeLists.txt
--- kdevplatform-5.1.0/plugins/cvs/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/cvs/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -43,4 +43,4 @@
KDev::Vcs
KDev::Project
KDev::Language
-)
\ No newline at end of file
+)
diff -Nru kdevplatform-5.1.0/plugins/cvs/importmetadatawidget.ui kdevplatform-5.1.1/plugins/cvs/importmetadatawidget.ui
--- kdevplatform-5.1.0/plugins/cvs/importmetadatawidget.ui 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/cvs/importmetadatawidget.ui 2017-05-13 10:12:21.000000000 +0000
@@ -118,11 +118,6 @@
- QLineEdit
- QLineEdit
- klineedit.h
-
- KTextEditQTextEditktextedit.h
diff -Nru kdevplatform-5.1.0/plugins/cvs/kdevcvs.json kdevplatform-5.1.1/plugins/cvs/kdevcvs.json
--- kdevplatform-5.1.0/plugins/cvs/kdevcvs.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/cvs/kdevcvs.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,66 +2,66 @@
"KPlugin": {
"Authors": [
{
- "Name": "Robert Gruber",
+ "Name": "Robert Gruber",
"Name[x-test]": "xxRobert Gruberxx"
}
- ],
- "Category": "Version Control",
- "Description": "This plugin integrates CVS to KDevelop",
- "Description[ca@valencia]": "Este connector integra CVS al KDevelop",
- "Description[ca]": "Aquest connector integra CVS al KDevelop",
- "Description[cs]": "Tento modul integruje podporu pro CVS v KDevelop",
- "Description[de]": "Dieses Modul integriert CVS in KDevelop.",
- "Description[es]": "Este complemento integra CVS en KDevelop",
- "Description[et]": "See plugin lõimib CVS-i KDevelopiga",
- "Description[fi]": "Tämä liitännäinen integroi CVS:n KDevelopiin",
- "Description[fr]": "Ce module intègre CVS dans KDevelop",
- "Description[gl]": "Este complemento integra CVS en KDevelop",
- "Description[it]": "Questa estensione integra CVS in KDevelop",
- "Description[nl]": "Deze plugin integreert CVS in KDevelop",
- "Description[pl]": "Ta wtyczka udostępnia obsługę CVS w KDevelopie",
- "Description[pt]": "Este 'plugin' integra o CVS no KDevelop",
- "Description[pt_BR]": "Esta extensão integra o CVS ao KDevelop",
- "Description[sk]": "Tento plugin integruje CVS do KDevelop.",
- "Description[sl]": "Vstavek v KDevelop vgradi CVS",
- "Description[sv]": "Insticksprogrammet integrerar CVS i KDevelop",
- "Description[uk]": "За допомогою цього додатка можна інтегрувати CVS до KDevelop",
- "Description[x-test]": "xxThis plugin integrates CVS to KDevelopxx",
- "Description[zh_CN]": "此插件将 CVS 整合到 KDevelop",
- "Icon": "cervisia",
- "Id": "kdevcvs",
- "License": "GPL",
- "Name": "CVS Support",
- "Name[ca@valencia]": "Implementació de CVS",
- "Name[ca]": "Implementació de CVS",
- "Name[cs]": "Podpora CVS",
- "Name[de]": "CVS-Unterstützung",
- "Name[es]": "Implementación de CVS",
- "Name[et]": "CVS-i toetus",
- "Name[fi]": "CVS-tuki",
- "Name[fr]": "Prise en charge de CVS",
- "Name[gl]": "Soporte de CVS",
- "Name[it]": "Supporto CVS",
- "Name[nb]": "CVS-støtte",
- "Name[nl]": "CVS-ondersteuning",
- "Name[pl]": "Obsługa CVS",
- "Name[pt]": "Suporte para o CVS",
- "Name[pt_BR]": "Suporte a CVS",
- "Name[ru]": "Поддержка CVS",
- "Name[sk]": "Podpora CVS",
- "Name[sl]": "Podpora za CVS",
- "Name[sv]": "Stöd för CVS",
- "Name[uk]": "Підтримка CVS",
- "Name[x-test]": "xxCVS Supportxx",
- "Name[zh_CN]": "CVS 支持",
+ ],
+ "Category": "Version Control",
+ "Description": "This plugin integrates CVS to KDevelop",
+ "Description[ca@valencia]": "Este connector integra CVS al KDevelop",
+ "Description[ca]": "Aquest connector integra CVS al KDevelop",
+ "Description[cs]": "Tento modul integruje podporu pro CVS v KDevelop",
+ "Description[de]": "Dieses Modul integriert CVS in KDevelop.",
+ "Description[es]": "Este complemento integra CVS en KDevelop",
+ "Description[et]": "See plugin lõimib CVS-i KDevelopiga",
+ "Description[fi]": "Tämä liitännäinen integroi CVS:n KDevelopiin",
+ "Description[fr]": "Ce module intègre CVS dans KDevelop",
+ "Description[gl]": "Este complemento integra CVS en KDevelop",
+ "Description[it]": "Questa estensione integra CVS in KDevelop",
+ "Description[nl]": "Deze plugin integreert CVS in KDevelop",
+ "Description[pl]": "Ta wtyczka udostępnia obsługę CVS w KDevelopie",
+ "Description[pt]": "Este 'plugin' integra o CVS no KDevelop",
+ "Description[pt_BR]": "Esta extensão integra o CVS ao KDevelop",
+ "Description[sk]": "Tento plugin integruje CVS do KDevelop.",
+ "Description[sl]": "Vstavek v KDevelop vgradi CVS",
+ "Description[sv]": "Insticksprogrammet integrerar CVS i KDevelop",
+ "Description[uk]": "За допомогою цього додатка можна інтегрувати CVS до KDevelop",
+ "Description[x-test]": "xxThis plugin integrates CVS to KDevelopxx",
+ "Description[zh_CN]": "此插件将 CVS 整合到 KDevelop",
+ "Icon": "cervisia",
+ "Id": "kdevcvs",
+ "License": "GPL",
+ "Name": "CVS Support",
+ "Name[ca@valencia]": "Implementació de CVS",
+ "Name[ca]": "Implementació de CVS",
+ "Name[cs]": "Podpora CVS",
+ "Name[de]": "CVS-Unterstützung",
+ "Name[es]": "Implementación de CVS",
+ "Name[et]": "CVS-i toetus",
+ "Name[fi]": "CVS-tuki",
+ "Name[fr]": "Prise en charge de CVS",
+ "Name[gl]": "Soporte de CVS",
+ "Name[it]": "Supporto CVS",
+ "Name[nb]": "CVS-støtte",
+ "Name[nl]": "CVS-ondersteuning",
+ "Name[pl]": "Obsługa CVS",
+ "Name[pt]": "Suporte para o CVS",
+ "Name[pt_BR]": "Suporte a CVS",
+ "Name[ru]": "Поддержка CVS",
+ "Name[sk]": "Podpora CVS",
+ "Name[sl]": "Podpora za CVS",
+ "Name[sv]": "Stöd för CVS",
+ "Name[uk]": "Підтримка CVS",
+ "Name[x-test]": "xxCVS Supportxx",
+ "Name[zh_CN]": "CVS 支持",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.1"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.IBasicVersionControl"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/documentswitcher/documentswitcherplugin.cpp kdevplatform-5.1.1/plugins/documentswitcher/documentswitcherplugin.cpp
--- kdevplatform-5.1.0/plugins/documentswitcher/documentswitcherplugin.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/documentswitcher/documentswitcherplugin.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -123,7 +123,7 @@
Sublime::MainWindow* window = qobject_cast( KDevelop::ICore::self()->uiController()->activeMainWindow() );
if( !window || !documentLists.contains( window ) || !documentLists[window].contains( window->area() ) )
{
- qWarning() << "This should not happen, tried to walk through document list of an unknown mainwindow!";
+ qCWarning(PLUGIN_DOCUMENTSWITCHER) << "This should not happen, tried to walk through document list of an unknown mainwindow!";
return;
}
QModelIndex idx;
diff -Nru kdevplatform-5.1.0/plugins/documentswitcher/kdevdocumentswitcher.json kdevplatform-5.1.1/plugins/documentswitcher/kdevdocumentswitcher.json
--- kdevplatform-5.1.0/plugins/documentswitcher/kdevdocumentswitcher.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/documentswitcher/kdevdocumentswitcher.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,61 +2,61 @@
"KPlugin": {
"Authors": [
{
- "Name": "Andreas Pakulat",
+ "Name": "Andreas Pakulat",
"Name[x-test]": "xxAndreas Pakulatxx"
}
- ],
- "Category": "Utilities",
- "Description": "A most-recently-used document switcher for KDevPlatform.",
- "Description[ca@valencia]": "Un commutador del document usat més recentment per KDevPlatform.",
- "Description[ca]": "Un commutador del document usat més recentment per KDevPlatform.",
- "Description[de]": "Ein Umschalter zwischen zuletzt geöffneten Dokumenten für KDevPlatform.",
- "Description[es]": "Un cambiador de documentos recientemente usados para KDevPlatform.",
- "Description[et]": "KDevPlatformi viimati kasutatud dokumentide vahetaja",
- "Description[fi]": "Vaihtaa tiedostoja niiden käyttöjärjestyksen perusteella",
- "Description[fr]": "Un changeur de document dernièrement utilisé pour KDevPlatform.",
- "Description[gl]": "Un selector entre documentos empregados recentemente para KDevPlatform.",
- "Description[it]": "Uno scambia documento utilizzato più di recente per KDevPlatform.",
- "Description[nl]": "De meest-recent-gebruikte documentwisselaar voor KDevPlatform.",
- "Description[pl]": "Przełączanie między ostatnio używanymi dokumentacji w KDevPlatform.",
- "Description[pt]": "Um selector dos documentos usados mais recentemente para o KDevPlatform.",
- "Description[pt_BR]": "Um seletor dos documentos mais recentes para o KDevPlatform.",
- "Description[sk]": "Prepínač posledných použitých dokumentov pre KDevPlatform.",
- "Description[sl]": "Vstavek za preklapljanje med nazadnje uporabljenimi dokumenti.",
- "Description[sv]": "Byte till senast använda dokument för KDevelop-plattformen.",
- "Description[uk]": "Перемикач останніх використаних документів для KDevPlatform.",
- "Description[x-test]": "xxA most-recently-used document switcher for KDevPlatform.xx",
- "Description[zh_CN]": "KDevPlatform 的最近经常使用文档的切换器。",
- "Icon": "document-open-recent",
- "Id": "kdevdocumentswitcher",
- "License": "GPL",
- "Name": "Most-Recently-Used Document Switcher",
- "Name[ca@valencia]": "Commutador del document usat més recentment",
- "Name[ca]": "Commutador del document usat més recentment",
- "Name[de]": "Zuletzt-Verwendet-Dokumentumschalter",
- "Name[es]": "Cambiador del documento usado más recientemente",
- "Name[et]": "Viimati kasutatud dokumentide vahetaja",
- "Name[fi]": "Viimeksi käytetty ensin -tiedostovaihtaja",
- "Name[fr]": "Changeur de document dernièrement utilisé",
- "Name[gl]": "Selector entre documentos empregados recentemente",
- "Name[it]": "Scambia documento utilizzato più di recente",
- "Name[nb]": "Sist-brukte dokumentbytter",
- "Name[nl]": "Meest-recent-gebruikte documentwisselaar",
- "Name[pl]": "Przełączanie między ostatnio używanymi dokumentami",
- "Name[pt]": "Selector dos Documentos Usados Mais Recentemente",
- "Name[pt_BR]": "Seletor dos documentos usados mais recentemente",
- "Name[ru]": "Переключатель недавних документов",
- "Name[sk]": "Prepínač posledných použitých dokumentov",
- "Name[sl]": "Preklapljanje med nazadnje uporabljenimi dokumenti",
- "Name[sv]": "Byte till senast använda dokument",
- "Name[uk]": "Перемикач нещодавно використаних документів",
- "Name[x-test]": "xxMost-Recently-Used Document Switcherxx",
- "Name[zh_CN]": "最近经常使用文档切换器",
+ ],
+ "Category": "Utilities",
+ "Description": "A most-recently-used document switcher for KDevPlatform.",
+ "Description[ca@valencia]": "Un commutador del document usat més recentment per KDevPlatform.",
+ "Description[ca]": "Un commutador del document usat més recentment per KDevPlatform.",
+ "Description[de]": "Ein Umschalter zwischen zuletzt geöffneten Dokumenten für KDevPlatform.",
+ "Description[es]": "Un cambiador de documentos recientemente usados para KDevPlatform.",
+ "Description[et]": "KDevPlatformi viimati kasutatud dokumentide vahetaja",
+ "Description[fi]": "Vaihtaa tiedostoja niiden käyttöjärjestyksen perusteella",
+ "Description[fr]": "Un changeur de document dernièrement utilisé pour KDevPlatform.",
+ "Description[gl]": "Un selector entre documentos empregados recentemente para KDevPlatform.",
+ "Description[it]": "Uno scambia documento utilizzato più di recente per KDevPlatform.",
+ "Description[nl]": "De meest-recent-gebruikte documentwisselaar voor KDevPlatform.",
+ "Description[pl]": "Przełączanie między ostatnio używanymi dokumentacji w KDevPlatform.",
+ "Description[pt]": "Um selector dos documentos usados mais recentemente para o KDevPlatform.",
+ "Description[pt_BR]": "Um seletor dos documentos mais recentes para o KDevPlatform.",
+ "Description[sk]": "Prepínač posledných použitých dokumentov pre KDevPlatform.",
+ "Description[sl]": "Vstavek za preklapljanje med nazadnje uporabljenimi dokumenti.",
+ "Description[sv]": "Byte till senast använda dokument för KDevelop-plattformen.",
+ "Description[uk]": "Перемикач останніх використаних документів для KDevPlatform.",
+ "Description[x-test]": "xxA most-recently-used document switcher for KDevPlatform.xx",
+ "Description[zh_CN]": "KDevPlatform 的最近经常使用文档的切换器。",
+ "Icon": "document-open-recent",
+ "Id": "kdevdocumentswitcher",
+ "License": "GPL",
+ "Name": "Most-Recently-Used Document Switcher",
+ "Name[ca@valencia]": "Commutador del document usat més recentment",
+ "Name[ca]": "Commutador del document usat més recentment",
+ "Name[de]": "Zuletzt-Verwendet-Dokumentumschalter",
+ "Name[es]": "Cambiador del documento usado más recientemente",
+ "Name[et]": "Viimati kasutatud dokumentide vahetaja",
+ "Name[fi]": "Viimeksi käytetty ensin -tiedostovaihtaja",
+ "Name[fr]": "Changeur de document dernièrement utilisé",
+ "Name[gl]": "Selector entre documentos empregados recentemente",
+ "Name[it]": "Scambia documento utilizzato più di recente",
+ "Name[nb]": "Sist-brukte dokumentbytter",
+ "Name[nl]": "Meest-recent-gebruikte documentwisselaar",
+ "Name[pl]": "Przełączanie między ostatnio używanymi dokumentami",
+ "Name[pt]": "Selector dos Documentos Usados Mais Recentemente",
+ "Name[pt_BR]": "Seletor dos documentos usados mais recentemente",
+ "Name[ru]": "Переключатель недавних документов",
+ "Name[sk]": "Prepínač posledných použitých dokumentov",
+ "Name[sl]": "Preklapljanje med nazadnje uporabljenimi dokumenti",
+ "Name[sv]": "Byte till senast använda dokument",
+ "Name[uk]": "Перемикач нещодавно використаних документів",
+ "Name[x-test]": "xxMost-Recently-Used Document Switcherxx",
+ "Name[zh_CN]": "最近经常使用文档切换器",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.1"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/documentview/kdevdocumentview.json kdevplatform-5.1.1/plugins/documentview/kdevdocumentview.json
--- kdevplatform-5.1.0/plugins/documentview/kdevdocumentview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/documentview/kdevdocumentview.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,62 +2,62 @@
"KPlugin": {
"Authors": [
{
- "Name": "Adam Treat",
+ "Name": "Adam Treat",
"Name[x-test]": "xxAdam Treatxx"
}
- ],
- "Category": "Utilities",
- "Description": "This plugin displays a graphical view of all documents currently loaded and separates them by mimetype.",
- "Description[ca@valencia]": "Este connector mostra una visualització gràfica de tots els documents carregats actualment, separats per tipus MIME.",
- "Description[ca]": "Aquest connector mostra una visualització gràfica de tots els documents carregats actualment, separats per tipus MIME.",
- "Description[de]": "Dieses Modul zeigt alle aktuell geladenen Dokumente getrennt nach ihren MIME-Typen an.",
- "Description[es]": "Este complemento muestra una vista gráfica de todos los documentos actualmente cargados y los separa por su tipo MIME.",
- "Description[et]": "See plugin näitab graafiliselt kõiki laaditud dokumente ja eraldab need MIME tüübi alusel.",
- "Description[fi]": "Tämä liitännäinen näyttää kaikkien parhaillaan ladattujen tiedostojen graafisen näkymän ja erottelee ne MIME-tyypin perusteella.",
- "Description[fr]": "Ce module affiche une vue graphique de tous les documents actuellement chargés et les sépare par type MIME.",
- "Description[gl]": "Este complemento mostra unha vista gráfica de todos os documentos que están cargados e sepáraos segundo o seu tipo mime.",
- "Description[it]": "Questa estensione mostra una vista grafica di tutti i documenti attualmente caricati e li separa per il tipo MIME.",
- "Description[nl]": "Deze plugin toont een grafische voorstelling van alle nu geladen documenten en scheidt deze door het mimetype.",
- "Description[pl]": "Ta wtyczka udostępnia graficzny widok wszystkich obecnie wczytanych dokumentów i dzieli je według typu MIME.",
- "Description[pt]": "Este 'plugin' mostra uma vista gráfica sobre todos os documentos abertos de momento e separa-os pelo seu tipo MIME.",
- "Description[pt_BR]": "Este plugin mostra uma vista gráfica sobre todos os documentos carregados no momento e separa-os por tipo MIME.",
- "Description[sk]": "Tento plugin zobrazí grafický pohľad všetkých dokumentov aktuálne načítaných a rozdelí ich podľa mimetype.",
- "Description[sl]": "Ta vstavek prikazuje vse trenutno naložene dokumente in jih ločuje glede na vrsto MIME.",
- "Description[sv]": "Insticksprogrammet visar en grafisk vy av alla dokument som för närvarande har laddats och delar upp dem enligt Mime-typ.",
- "Description[uk]": "Цей додаток відображає у графічному вигляді всі відкриті документи і впорядковує їх за типом MIME.",
- "Description[x-test]": "xxThis plugin displays a graphical view of all documents currently loaded and separates them by mimetype.xx",
- "Description[zh_CN]": "此插件显示当前已装入文档的图形视图并按照 mime 类型分类。",
- "Icon": "document-preview",
- "Id": "kdevdocumentview",
- "License": "LGPL",
- "Name": "Document View",
- "Name[ca@valencia]": "Visor de document",
- "Name[ca]": "Visor de document",
- "Name[cs]": "Pohled na dokumenty",
- "Name[de]": "Dokumentansicht",
- "Name[es]": "Vista de documento",
- "Name[et]": "Dokumendivaade",
- "Name[fi]": "Tiedostonäkymä",
- "Name[fr]": "Vue du document",
- "Name[gl]": "Vista do documento",
- "Name[it]": "Vista documento",
- "Name[nb]": "Dokumentvisning",
- "Name[nl]": "Documentweergave",
- "Name[pl]": "Widok dokumentu",
- "Name[pt]": "Área de Documentos",
- "Name[pt_BR]": "Área de documentos",
- "Name[ru]": "Панель документов",
- "Name[sk]": "Pohľad na dokumenty",
- "Name[sl]": "Prikaz dokumentov",
- "Name[sv]": "Dokumentvisning",
- "Name[uk]": "Перегляд документів",
- "Name[x-test]": "xxDocument Viewxx",
- "Name[zh_CN]": "文档视图",
+ ],
+ "Category": "Utilities",
+ "Description": "This plugin displays a graphical view of all documents currently loaded and separates them by mimetype.",
+ "Description[ca@valencia]": "Este connector mostra una visualització gràfica de tots els documents carregats actualment, separats per tipus MIME.",
+ "Description[ca]": "Aquest connector mostra una visualització gràfica de tots els documents carregats actualment, separats per tipus MIME.",
+ "Description[de]": "Dieses Modul zeigt alle aktuell geladenen Dokumente getrennt nach ihren MIME-Typen an.",
+ "Description[es]": "Este complemento muestra una vista gráfica de todos los documentos actualmente cargados y los separa por su tipo MIME.",
+ "Description[et]": "See plugin näitab graafiliselt kõiki laaditud dokumente ja eraldab need MIME tüübi alusel.",
+ "Description[fi]": "Tämä liitännäinen näyttää kaikkien parhaillaan ladattujen tiedostojen graafisen näkymän ja erottelee ne MIME-tyypin perusteella.",
+ "Description[fr]": "Ce module affiche une vue graphique de tous les documents actuellement chargés et les sépare par type MIME.",
+ "Description[gl]": "Este complemento mostra unha vista gráfica de todos os documentos que están cargados e sepáraos segundo o seu tipo mime.",
+ "Description[it]": "Questa estensione mostra una vista grafica di tutti i documenti attualmente caricati e li separa per il tipo MIME.",
+ "Description[nl]": "Deze plugin toont een grafische voorstelling van alle nu geladen documenten en scheidt deze door het mimetype.",
+ "Description[pl]": "Ta wtyczka udostępnia graficzny widok wszystkich obecnie wczytanych dokumentów i dzieli je według typu MIME.",
+ "Description[pt]": "Este 'plugin' mostra uma vista gráfica sobre todos os documentos abertos de momento e separa-os pelo seu tipo MIME.",
+ "Description[pt_BR]": "Este plugin mostra uma vista gráfica sobre todos os documentos carregados no momento e separa-os por tipo MIME.",
+ "Description[sk]": "Tento plugin zobrazí grafický pohľad všetkých dokumentov aktuálne načítaných a rozdelí ich podľa mimetype.",
+ "Description[sl]": "Ta vstavek prikazuje vse trenutno naložene dokumente in jih ločuje glede na vrsto MIME.",
+ "Description[sv]": "Insticksprogrammet visar en grafisk vy av alla dokument som för närvarande har laddats och delar upp dem enligt Mime-typ.",
+ "Description[uk]": "Цей додаток відображає у графічному вигляді всі відкриті документи і впорядковує їх за типом MIME.",
+ "Description[x-test]": "xxThis plugin displays a graphical view of all documents currently loaded and separates them by mimetype.xx",
+ "Description[zh_CN]": "此插件显示当前已装入文档的图形视图并按照 mime 类型分类。",
+ "Icon": "document-preview",
+ "Id": "kdevdocumentview",
+ "License": "LGPL",
+ "Name": "Document View",
+ "Name[ca@valencia]": "Visor de document",
+ "Name[ca]": "Visor de document",
+ "Name[cs]": "Pohled na dokumenty",
+ "Name[de]": "Dokumentansicht",
+ "Name[es]": "Vista de documento",
+ "Name[et]": "Dokumendivaade",
+ "Name[fi]": "Tiedostonäkymä",
+ "Name[fr]": "Vue du document",
+ "Name[gl]": "Vista do documento",
+ "Name[it]": "Vista documento",
+ "Name[nb]": "Dokumentvisning",
+ "Name[nl]": "Documentweergave",
+ "Name[pl]": "Widok dokumentu",
+ "Name[pt]": "Área de Documentos",
+ "Name[pt_BR]": "Área de documentos",
+ "Name[ru]": "Панель документов",
+ "Name[sk]": "Pohľad na dokumenty",
+ "Name[sl]": "Prikaz dokumentov",
+ "Name[sv]": "Dokumentvisning",
+ "Name[uk]": "Перегляд документів",
+ "Name[x-test]": "xxDocument Viewxx",
+ "Name[zh_CN]": "文档视图",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.1"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/documentview/kdevdocumentviewplugin.h kdevplatform-5.1.1/plugins/documentview/kdevdocumentviewplugin.h
--- kdevplatform-5.1.0/plugins/documentview/kdevdocumentviewplugin.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/documentview/kdevdocumentviewplugin.h 2017-05-13 10:12:21.000000000 +0000
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_PLUGIN_KDEVDOCUMENTVIEW_PART_H
-#define KDEVPLATFORM_PLUGIN_KDEVDOCUMENTVIEW_PART_H
+#ifndef KDEVPLATFORM_PLUGIN_KDEVDOCUMENTVIEWPLUGIN_H
+#define KDEVPLATFORM_PLUGIN_KDEVDOCUMENTVIEWPLUGIN_H
#include
#include
diff -Nru kdevplatform-5.1.0/plugins/execute/executeplugin.cpp kdevplatform-5.1.1/plugins/execute/executeplugin.cpp
--- kdevplatform-5.1.0/plugins/execute/executeplugin.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/execute/executeplugin.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -106,7 +106,7 @@
"this is not supported currently. Aborting start.", cfg->name() );
}
args = QStringList();
- qWarning() << "Launch Configuration:" << cfg->name() << "arguments have meta characters";
+ qCWarning(PLUGIN_EXECUTE) << "Launch Configuration:" << cfg->name() << "arguments have meta characters";
}
return args;
}
@@ -184,7 +184,7 @@
if( executable.isEmpty() )
{
err = i18n("No valid executable specified");
- qWarning() << "Launch Configuration:" << cfg->name() << "no valid executable set";
+ qCWarning(PLUGIN_EXECUTE) << "Launch Configuration:" << cfg->name() << "no valid executable set";
} else
{
KShell::Errors err_;
@@ -202,7 +202,7 @@
"executable for the launch configuration '%1', "
"this is not supported currently. Aborting start.", cfg->name() );
}
- qWarning() << "Launch Configuration:" << cfg->name() << "executable has meta characters";
+ qCWarning(PLUGIN_EXECUTE) << "Launch Configuration:" << cfg->name() << "executable has meta characters";
}
}
return executable;
diff -Nru kdevplatform-5.1.0/plugins/execute/kdevexecute.json kdevplatform-5.1.1/plugins/execute/kdevexecute.json
--- kdevplatform-5.1.0/plugins/execute/kdevexecute.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/execute/kdevexecute.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,64 +2,64 @@
"KPlugin": {
"Authors": [
{
- "Name": "Hamish Rodda",
+ "Name": "Hamish Rodda",
"Name[x-test]": "xxHamish Roddaxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin allows running of programs with no instrumentor, ie. natively by the current host.",
- "Description[ca@valencia]": "Este connector permet executar programes sense «instrumentor», és a dir, nativament per a la màquina actual.",
- "Description[ca]": "Aquest connector permet executar programes sense «instrumentor», és a dir, nativament per a la màquina actual.",
- "Description[de]": "Dieses Modul erlaubt das Ausführen von Programmen im Kontext des Betriebssystems.",
- "Description[es]": "Este complemento permite ejecutar programas sin instrumentador (es decir, de forma nativa) en la máquina actual.",
- "Description[et]": "See plugin võimaldab panna programme aktiivses masinas tööle ilma instrumentaatorita, s.t loomulikult.",
- "Description[fi]": "Tämä liitännäinen mahdollistaa ohjelmien suorittamisen ilman välikappaletta, ts. natiivisti nykyisellä tietokoneella.",
- "Description[fr]": "Ce module permet d'exécuter des programmes sans instrumentation, c'est-à-dire de manière native sur l'hôte courant.",
- "Description[gl]": "Este complemento permite executar programas sen instrumentador, i.e. de xeito nativo na máquina actual.",
- "Description[it]": "Questa estensione permette l'esecuzione dei programmi senza instrumentor, vale a dire nativamente da parte dell'host attuale.",
- "Description[nl]": "Deze plugin staat het uitvoeren van programma's toe zonder hulpprogramma, dwz. van nature op de huidige host.",
- "Description[pl]": "Wtyczka ta pozwala na uruchamianie programów bez instrumentora, np. natywnie przez obecnego hosta.",
- "Description[pt]": "Este 'plugin' permite a execução de programas sem instrumentação, i.e. nativamente na máquina-anfitriã actual.",
- "Description[pt_BR]": "Este plugin permite executar programas sem orquestrador, ou seja, nativamente pelo computador hospedeiro.",
- "Description[sk]": "Tento plugin umožňuje spustenie programov bez inštrumentora, teda natívne aktuálnym hostiteľom.",
- "Description[sl]": "Vstavek omogoča zaganjanje programov, za katere v KDevelop ni posebnega grafičnega vmesnika.",
- "Description[sv]": "Insticksprogrammet tillåter att program utan instrumentering körs, dvs. direkt av nuvarande värddator.",
- "Description[uk]": "За допомогою цього додатка можна запускати програми безпосередньо на поточному вузлі.",
- "Description[x-test]": "xxThis plugin allows running of programs with no instrumentor, ie. natively by the current host.xx",
- "Description[zh_CN]": "此插件允许以无操作者方式运行程序,例如,当前主机的原生方式。",
- "Icon": "system-run",
- "Id": "kdevexecute",
- "License": "GPL",
- "Name": "Execute Programs",
- "Name[ca@valencia]": "Executa programes",
- "Name[ca]": "Executa programes",
- "Name[cs]": "Spustit programy",
- "Name[de]": "Programme ausführen",
- "Name[es]": "Ejecutar programas",
- "Name[et]": "Programmide täitmine",
- "Name[fi]": "Ohjelmien suorittaminen",
- "Name[fr]": "Exécuter des programmes",
- "Name[gl]": "Executar programas",
- "Name[it]": "Esegui i programmi",
- "Name[nb]": "Kjør programmer",
- "Name[nl]": "Programma's uitvoeren",
- "Name[pl]": "Wykonaj programy",
- "Name[pt]": "Execução de Programas",
- "Name[pt_BR]": "Executar programas",
- "Name[ru]": "Запуск программ",
- "Name[sk]": "Spustiť programy",
- "Name[sl]": "Izvedi programe",
- "Name[sv]": "Kör program",
- "Name[uk]": "Виконання програм",
- "Name[x-test]": "xxExecute Programsxx",
- "Name[zh_CN]": "执行程序",
+ ],
+ "Category": "Core",
+ "Description": "This plugin allows running of programs with no instrumentor, ie. natively by the current host.",
+ "Description[ca@valencia]": "Este connector permet executar programes sense «instrumentor», és a dir, nativament per a la màquina actual.",
+ "Description[ca]": "Aquest connector permet executar programes sense «instrumentor», és a dir, nativament per a la màquina actual.",
+ "Description[de]": "Dieses Modul erlaubt das Ausführen von Programmen im Kontext des Betriebssystems.",
+ "Description[es]": "Este complemento permite ejecutar programas sin instrumentador (es decir, de forma nativa) en la máquina actual.",
+ "Description[et]": "See plugin võimaldab panna programme aktiivses masinas tööle ilma instrumentaatorita, s.t loomulikult.",
+ "Description[fi]": "Tämä liitännäinen mahdollistaa ohjelmien suorittamisen ilman välikappaletta, ts. natiivisti nykyisellä tietokoneella.",
+ "Description[fr]": "Ce module permet d'exécuter des programmes sans instrumentation, c'est-à-dire de manière native sur l'hôte courant.",
+ "Description[gl]": "Este complemento permite executar programas sen instrumentador, i.e. de xeito nativo na máquina actual.",
+ "Description[it]": "Questa estensione permette l'esecuzione dei programmi senza instrumentor, vale a dire nativamente da parte dell'host attuale.",
+ "Description[nl]": "Deze plugin staat het uitvoeren van programma's toe zonder hulpprogramma, dwz. van nature op de huidige host.",
+ "Description[pl]": "Wtyczka ta pozwala na uruchamianie programów bez instrumentora, np. natywnie przez obecnego hosta.",
+ "Description[pt]": "Este 'plugin' permite a execução de programas sem instrumentação, i.e. nativamente na máquina-anfitriã actual.",
+ "Description[pt_BR]": "Este plugin permite executar programas sem orquestrador, ou seja, nativamente pelo computador hospedeiro.",
+ "Description[sk]": "Tento plugin umožňuje spustenie programov bez inštrumentora, teda natívne aktuálnym hostiteľom.",
+ "Description[sl]": "Vstavek omogoča zaganjanje programov, za katere v KDevelop ni posebnega grafičnega vmesnika.",
+ "Description[sv]": "Insticksprogrammet tillåter att program utan instrumentering körs, dvs. direkt av nuvarande värddator.",
+ "Description[uk]": "За допомогою цього додатка можна запускати програми безпосередньо на поточному вузлі.",
+ "Description[x-test]": "xxThis plugin allows running of programs with no instrumentor, ie. natively by the current host.xx",
+ "Description[zh_CN]": "此插件允许以无操作者方式运行程序,例如,当前主机的原生方式。",
+ "Icon": "system-run",
+ "Id": "kdevexecute",
+ "License": "GPL",
+ "Name": "Execute Programs",
+ "Name[ca@valencia]": "Executa programes",
+ "Name[ca]": "Executa programes",
+ "Name[cs]": "Spustit programy",
+ "Name[de]": "Programme ausführen",
+ "Name[es]": "Ejecutar programas",
+ "Name[et]": "Programmide täitmine",
+ "Name[fi]": "Ohjelmien suorittaminen",
+ "Name[fr]": "Exécuter des programmes",
+ "Name[gl]": "Executar programas",
+ "Name[it]": "Esegui i programmi",
+ "Name[nb]": "Kjør programmer",
+ "Name[nl]": "Programma's uitvoeren",
+ "Name[pl]": "Wykonaj programy",
+ "Name[pt]": "Execução de Programas",
+ "Name[pt_BR]": "Executar programas",
+ "Name[ru]": "Запуск программ",
+ "Name[sk]": "Spustiť programy",
+ "Name[sl]": "Izvedi programe",
+ "Name[sv]": "Kör program",
+ "Name[uk]": "Виконання програм",
+ "Name[x-test]": "xxExecute Programsxx",
+ "Name[zh_CN]": "执行程序",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.IExecutePlugin"
- ],
+ ],
"X-KDevelop-Mode": "NoGUI"
}
diff -Nru kdevplatform-5.1.0/plugins/executescript/kdevexecutescript.json kdevplatform-5.1.1/plugins/executescript/kdevexecutescript.json
--- kdevplatform-5.1.0/plugins/executescript/kdevexecutescript.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/executescript/kdevexecutescript.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,63 +2,63 @@
"KPlugin": {
"Authors": [
{
- "Name": "Niko Sams",
+ "Name": "Niko Sams",
"Name[x-test]": "xxNiko Samsxx"
}
- ],
- "Description": "This plugin allows running of scripts.",
- "Description[ca@valencia]": "Este connector permet executar scripts.",
- "Description[ca]": "Aquest connector permet executar scripts.",
- "Description[de]": "Dieses Modul ermöglicht das Ausführen von Skripten.",
- "Description[es]": "Este complemento permite la ejecución de scripts.",
- "Description[et]": "See plugin võimaldab käivitada skripte.",
- "Description[fi]": "Tämä liitännäinen mahdollistaa skriptien suorittamisen.",
- "Description[fr]": "Ce module permet d'exécuter des scripts.",
- "Description[gl]": "Este complemento permite a execución de scripts.",
- "Description[it]": "Questa estensione permette l'esecuzione degli script.",
- "Description[nl]": "Deze plugin staat het uitvoeren van scripts toe.",
- "Description[pl]": "Wtyczka ta pozwala na uruchamianie skryptów.",
- "Description[pt]": "Este 'plugin' permite a execução de programas.",
- "Description[pt_BR]": "Este plugin permite a execução de scripts.",
- "Description[sk]": "Tento plugin povoľuje spúšťanie skriptov.",
- "Description[sl]": "Ta vstavek omogoča zaganjanje skript.",
- "Description[sv]": "Insticksprogrammet gör det möjligt att köra skript.",
- "Description[uk]": "За допомогою цього додатка можна запускати скрипти.",
- "Description[x-test]": "xxThis plugin allows running of scripts.xx",
- "Description[zh_CN]": "此插件可以执行脚本.",
- "Icon": "system-run",
- "Id": "kdevexecutescript",
- "License": "GPL",
- "Name": "Execute Scripts",
- "Name[ca@valencia]": "Executa scripts",
- "Name[ca]": "Executa scripts",
- "Name[cs]": "Spustit skripty",
- "Name[de]": "Skripte ausführen",
- "Name[es]": "Ejecutar scripts",
- "Name[et]": "Skriptide käivitamine",
- "Name[fi]": "Skriptien suorittaminen",
- "Name[fr]": "Exécuter des scripts",
- "Name[gl]": "Executar scripts",
- "Name[it]": "Esegui script",
- "Name[nb]": "Kjør skripter",
- "Name[nl]": "Scripts uitvoeren",
- "Name[pl]": "Wykonaj skrypty",
- "Name[pt]": "Executar Programas",
- "Name[pt_BR]": "Executar scripts",
- "Name[ru]": "Запуск сценариев",
- "Name[sk]": "Spustiť skripty",
- "Name[sl]": "Izvedi skripte",
- "Name[sv]": "Kör skript",
- "Name[uk]": "Виконання скриптів",
- "Name[x-test]": "xxExecute Scriptsxx",
- "Name[zh_CN]": "执行脚本",
+ ],
+ "Description": "This plugin allows running of scripts.",
+ "Description[ca@valencia]": "Este connector permet executar scripts.",
+ "Description[ca]": "Aquest connector permet executar scripts.",
+ "Description[de]": "Dieses Modul ermöglicht das Ausführen von Skripten.",
+ "Description[es]": "Este complemento permite la ejecución de scripts.",
+ "Description[et]": "See plugin võimaldab käivitada skripte.",
+ "Description[fi]": "Tämä liitännäinen mahdollistaa skriptien suorittamisen.",
+ "Description[fr]": "Ce module permet d'exécuter des scripts.",
+ "Description[gl]": "Este complemento permite a execución de scripts.",
+ "Description[it]": "Questa estensione permette l'esecuzione degli script.",
+ "Description[nl]": "Deze plugin staat het uitvoeren van scripts toe.",
+ "Description[pl]": "Wtyczka ta pozwala na uruchamianie skryptów.",
+ "Description[pt]": "Este 'plugin' permite a execução de programas.",
+ "Description[pt_BR]": "Este plugin permite a execução de scripts.",
+ "Description[sk]": "Tento plugin povoľuje spúšťanie skriptov.",
+ "Description[sl]": "Ta vstavek omogoča zaganjanje skript.",
+ "Description[sv]": "Insticksprogrammet gör det möjligt att köra skript.",
+ "Description[uk]": "За допомогою цього додатка можна запускати скрипти.",
+ "Description[x-test]": "xxThis plugin allows running of scripts.xx",
+ "Description[zh_CN]": "此插件可以执行脚本.",
+ "Icon": "system-run",
+ "Id": "kdevexecutescript",
+ "License": "GPL",
+ "Name": "Execute Scripts",
+ "Name[ca@valencia]": "Executa scripts",
+ "Name[ca]": "Executa scripts",
+ "Name[cs]": "Spustit skripty",
+ "Name[de]": "Skripte ausführen",
+ "Name[es]": "Ejecutar scripts",
+ "Name[et]": "Skriptide käivitamine",
+ "Name[fi]": "Skriptien suorittaminen",
+ "Name[fr]": "Exécuter des scripts",
+ "Name[gl]": "Executar scripts",
+ "Name[it]": "Esegui script",
+ "Name[nb]": "Kjør skripter",
+ "Name[nl]": "Scripts uitvoeren",
+ "Name[pl]": "Wykonaj skrypty",
+ "Name[pt]": "Executar Programas",
+ "Name[pt_BR]": "Executar scripts",
+ "Name[ru]": "Запуск сценариев",
+ "Name[sk]": "Spustiť skripty",
+ "Name[sl]": "Izvedi skripte",
+ "Name[sv]": "Kör skript",
+ "Name[uk]": "Виконання скриптів",
+ "Name[x-test]": "xxExecute Scriptsxx",
+ "Name[zh_CN]": "执行脚本",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.IExecuteScriptPlugin"
- ],
+ ],
"X-KDevelop-Mode": "NoGUI"
}
diff -Nru kdevplatform-5.1.0/plugins/externalscript/externalscriptplugin.cpp kdevplatform-5.1.1/plugins/externalscript/externalscriptplugin.cpp
--- kdevplatform-5.1.0/plugins/externalscript/externalscriptplugin.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/externalscript/externalscriptplugin.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -126,7 +126,7 @@
item = new ExternalScriptItem;
item->setText( i18n("Google Selection") );
- item->setCommand( QStringLiteral("xdg-open \"http://www.google.de/search?q=%s\"") );
+ item->setCommand( QStringLiteral("xdg-open \"https://www.google.com/search?q=%s\"") );
item->setShowOutput( false );
m_model->appendRow( item );
diff -Nru kdevplatform-5.1.0/plugins/externalscript/kdevexternalscript.json kdevplatform-5.1.1/plugins/externalscript/kdevexternalscript.json
--- kdevplatform-5.1.0/plugins/externalscript/kdevexternalscript.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/externalscript/kdevexternalscript.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,67 +2,67 @@
"KPlugin": {
"Authors": [
{
- "Name": "Milian Wolff",
+ "Name": "Milian Wolff",
"Name[x-test]": "xxMilian Wolffxx"
}
- ],
- "Category": "Utilities",
- "Description": "Run external scripts or applications to manipulate the editor contents or do other arbitrary actions.",
- "Description[ca@valencia]": "Executa scripts externs o aplicacions per a manipular el contingut de l'editor o altres accions arbitràries.",
- "Description[ca]": "Executa scripts externs o aplicacions per a manipular el contingut de l'editor o altres accions arbitràries.",
- "Description[de]": "Führen Sie externe Skripte oder Programme zum Verändern des Editorinhalts oder für beliebige andere Aktionen aus.",
- "Description[es]": "Ejecutar scripts externos o aplicaciones para manipular el contenido del editor o realizar otras acciones.",
- "Description[et]": "Välised skriptid või rakendused, mis võimaldavad muuta redaktori sisu või ette võtta mingeid muid toiminguid.",
- "Description[fi]": "Suorittaa ulkoisia skriptejä tai sovelluksia editorisisällön manipuloimiseksi tai muiden satunnaisten tehtävien tekemiseksi.",
- "Description[fr]": "Exécuter des scripts externes ou des applications pour manipuler les contenus de l'éditeur ou autres actions arbitraires.",
- "Description[gl]": "Executa scripts externos ou aplicativos para manipular os contidos do editor ou levar a cabo outras accións.",
- "Description[it]": "Eseguire script o applicazioni esterne per manipolare il contenuto dell'editor o per fare altre azioni.",
- "Description[nl]": "Externe scripts of programma's uitvoeren om de inhoud van de bewerker te manipuleren of andere acties uit te voeren.",
- "Description[pl]": "Uruchamiaj zewnętrzne skrypty lub programy, aby manipulować zawartością edytora lub innymi dowolnymi działaniami.",
- "Description[pt]": "Executa programas ou aplicações externas para manipular o conteúdo do editor ou para efectuar outras acções arbitrárias.",
- "Description[pt_BR]": "Execute scripts externos ou aplicativos para manipular os conteúdos do editor ou para fazer outras ações ordinárias.",
- "Description[sk]": "Spustí externé skripty alebo aplikácie na manipuláciu s obsahom editora alebo robí iné ľubovoľné akcie.",
- "Description[sl]": "Zaganjajte zunanje skripte ali programe, ki upravljajo z vsebino urejevalnika ali pa opravljajo druga poljubna dejanja.",
- "Description[sv]": "Kör externa skript eller program för att behandla editorns innehåll eller utför andra godtyckliga åtgärder.",
- "Description[uk]": "Запускає зовнішні скрипти або програми для обробки текстових даних редактора або виконання інших потрібних дій.",
- "Description[x-test]": "xxRun external scripts or applications to manipulate the editor contents or do other arbitrary actions.xx",
- "Description[zh_CN]": "运行外部脚本或应用程序来处理编辑器内容或者执行其它任意动作。",
- "Icon": "system-run",
- "Id": "kdevexternalscript",
- "License": "GPL",
- "Name": "External Scripts",
- "Name[ca@valencia]": "Scripts externs",
- "Name[ca]": "Scripts externs",
- "Name[cs]": "Externí skripty",
- "Name[de]": "Externe Skripte",
- "Name[es]": "Scripts externos",
- "Name[et]": "Välised skriptid",
- "Name[fi]": "Ulkoiset skriptit",
- "Name[fr]": "Scripts externes",
- "Name[gl]": "Scripts externos",
- "Name[it]": "Script esterni",
- "Name[nb]": "Eksterne skripter",
- "Name[nl]": "Externe scripts",
- "Name[pl]": "Zewnętrzne skrypty",
- "Name[pt]": "Programas Externos",
- "Name[pt_BR]": "Scripts externos",
- "Name[ru]": "Внешние сценарии",
- "Name[sk]": "Externé skripty",
- "Name[sl]": "Zunanji skripti",
- "Name[sv]": "Externa skript",
- "Name[uk]": "Зовнішні скрипти",
- "Name[x-test]": "xxExternal Scriptsxx",
- "Name[zh_CN]": "外部脚本",
+ ],
+ "Category": "Utilities",
+ "Description": "Run external scripts or applications to manipulate the editor contents or do other arbitrary actions.",
+ "Description[ca@valencia]": "Executa scripts externs o aplicacions per a manipular el contingut de l'editor o altres accions arbitràries.",
+ "Description[ca]": "Executa scripts externs o aplicacions per a manipular el contingut de l'editor o altres accions arbitràries.",
+ "Description[de]": "Führen Sie externe Skripte oder Programme zum Verändern des Editorinhalts oder für beliebige andere Aktionen aus.",
+ "Description[es]": "Ejecutar scripts externos o aplicaciones para manipular el contenido del editor o realizar otras acciones.",
+ "Description[et]": "Välised skriptid või rakendused, mis võimaldavad muuta redaktori sisu või ette võtta mingeid muid toiminguid.",
+ "Description[fi]": "Suorittaa ulkoisia skriptejä tai sovelluksia editorisisällön manipuloimiseksi tai muiden satunnaisten tehtävien tekemiseksi.",
+ "Description[fr]": "Exécuter des scripts externes ou des applications pour manipuler les contenus de l'éditeur ou autres actions arbitraires.",
+ "Description[gl]": "Executa scripts externos ou aplicativos para manipular os contidos do editor ou levar a cabo outras accións.",
+ "Description[it]": "Eseguire script o applicazioni esterne per manipolare il contenuto dell'editor o per fare altre azioni.",
+ "Description[nl]": "Externe scripts of programma's uitvoeren om de inhoud van de bewerker te manipuleren of andere acties uit te voeren.",
+ "Description[pl]": "Uruchamiaj zewnętrzne skrypty lub programy, aby manipulować zawartością edytora lub innymi dowolnymi działaniami.",
+ "Description[pt]": "Executa programas ou aplicações externas para manipular o conteúdo do editor ou para efectuar outras acções arbitrárias.",
+ "Description[pt_BR]": "Execute scripts externos ou aplicativos para manipular os conteúdos do editor ou para fazer outras ações ordinárias.",
+ "Description[sk]": "Spustí externé skripty alebo aplikácie na manipuláciu s obsahom editora alebo robí iné ľubovoľné akcie.",
+ "Description[sl]": "Zaganjajte zunanje skripte ali programe, ki upravljajo z vsebino urejevalnika ali pa opravljajo druga poljubna dejanja.",
+ "Description[sv]": "Kör externa skript eller program för att behandla editorns innehåll eller utför andra godtyckliga åtgärder.",
+ "Description[uk]": "Запускає зовнішні скрипти або програми для обробки текстових даних редактора або виконання інших потрібних дій.",
+ "Description[x-test]": "xxRun external scripts or applications to manipulate the editor contents or do other arbitrary actions.xx",
+ "Description[zh_CN]": "运行外部脚本或应用程序来处理编辑器内容或者执行其它任意动作。",
+ "Icon": "system-run",
+ "Id": "kdevexternalscript",
+ "License": "GPL",
+ "Name": "External Scripts",
+ "Name[ca@valencia]": "Scripts externs",
+ "Name[ca]": "Scripts externs",
+ "Name[cs]": "Externí skripty",
+ "Name[de]": "Externe Skripte",
+ "Name[es]": "Scripts externos",
+ "Name[et]": "Välised skriptid",
+ "Name[fi]": "Ulkoiset skriptit",
+ "Name[fr]": "Scripts externes",
+ "Name[gl]": "Scripts externos",
+ "Name[it]": "Script esterni",
+ "Name[nb]": "Eksterne skripter",
+ "Name[nl]": "Externe scripts",
+ "Name[pl]": "Zewnętrzne skrypty",
+ "Name[pt]": "Programas Externos",
+ "Name[pt_BR]": "Scripts externos",
+ "Name[ru]": "Внешние сценарии",
+ "Name[sk]": "Externé skripty",
+ "Name[sl]": "Zunanji skripti",
+ "Name[sv]": "Externa skript",
+ "Name[uk]": "Зовнішні скрипти",
+ "Name[x-test]": "xxExternal Scriptsxx",
+ "Name[zh_CN]": "外部脚本",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-IRequired": [
"org.kdevelop.IOutputView"
- ],
+ ],
"X-KDevelop-Interfaces": [
"org.kdevelop.IPlugin"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/filemanager/kdevfilemanager.json kdevplatform-5.1.1/plugins/filemanager/kdevfilemanager.json
--- kdevplatform-5.1.0/plugins/filemanager/kdevfilemanager.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/filemanager/kdevfilemanager.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,63 +2,63 @@
"KPlugin": {
"Authors": [
{
- "Name": "Alexander Dymo",
- "Name[uk]": "Олександр Димо",
+ "Name": "Alexander Dymo",
+ "Name[uk]": "Олександр Димо",
"Name[x-test]": "xxAlexander Dymoxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin brings a filemanager to KDevelop.",
- "Description[ca@valencia]": "Este connector proporciona un gestor de fitxers al KDevelop.",
- "Description[ca]": "Aquest connector proporciona un gestor de fitxers al KDevelop.",
- "Description[cs]": "Tento modul do KDevelop přináší správce souborů.",
- "Description[de]": "Dieses Modul integriert einen Datei-Browser in KDevelop.",
- "Description[es]": "Este complemento proporciona un gestor de archivos a KDevelop.",
- "Description[et]": "See plugin võimaldab kasutada KDevelopis failihaldurit.",
- "Description[fi]": "Tämä liitännäinen tuo tiedostohallinnan KDevelopiin.",
- "Description[fr]": "Ce module apporte un gestionnaire de fichiers à KDevelop",
- "Description[gl]": "Este complemento incorpora un xestor de ficheiros no KDevelop.",
- "Description[it]": "Questa estensione porta un gestore di file in KDevelop.",
- "Description[nl]": "Deze plugin brengt een bestandsbeheerder in KDevelop.",
- "Description[pl]": "Ta wtyczka udostępnia zarządzanie plikami w KDevelopie.",
- "Description[pt]": "Este 'plugin' traz um gestor de ficheiros para o KDevelop.",
- "Description[pt_BR]": "Este plugin provê um gerenciador de arquivos ao KDevelop.",
- "Description[sk]": "Tento plugin prináša správcu súborov do KDevelop.",
- "Description[sl]": "Vstavek v KDevelop vgradi upravljalnika datotek.",
- "Description[sv]": "Insticksprogrammet integrerar en filhanterare i KDevelop.",
- "Description[uk]": "За допомогою цього додатка можна отримати доступ до менеджера файлів у KDevelop.",
- "Description[x-test]": "xxThis plugin brings a filemanager to KDevelop.xx",
- "Description[zh_CN]": "此插件为 KDevelop 提供了一个文件管理器。",
- "Icon": "system-file-manager",
- "Id": "kdevfilemanager",
- "License": "GPL",
- "Name": "KDE File Manager Integration",
- "Name[ca@valencia]": "Integració del gestor de fitxers del KDE",
- "Name[ca]": "Integració del gestor de fitxers del KDE",
- "Name[de]": "Integration der KDE-Dateiverwaltung",
- "Name[es]": "Integración del gestor de archivos de KDE",
- "Name[et]": "KDE failihalduri lõimimine",
- "Name[fi]": "KDE-tiedostonhallintaintegrointi",
- "Name[fr]": "Intégration avec le gestionnaire de fichiers de KDE",
- "Name[gl]": "Integración co xestor de ficheiros do KDE",
- "Name[it]": "Integrazione gestore di file di KDE",
- "Name[nb]": "Integrasjon med KDE filbehandler",
- "Name[nl]": "KDE Bestandsbeheerder-integratie",
- "Name[pl]": "Integracja zarządzania plikami KDE",
- "Name[pt]": "Integração com o Gestor de Ficheiros do KDE",
- "Name[pt_BR]": "Integração com o gerenciador de arquivos do KDE",
- "Name[ru]": "Интеграция файлового менеджера KDE",
- "Name[sk]": "Integrácia správcu súborov KDE",
- "Name[sl]": "Vgradnja KDE-jevega upravljalnika datotek",
- "Name[sv]": "Integrering av KDE:s filhanterare",
- "Name[uk]": "Інтеграція засобу керування файлами KDE",
- "Name[x-test]": "xxKDE File Manager Integrationxx",
- "Name[zh_CN]": "KDE 文件管理器整合",
+ ],
+ "Category": "Core",
+ "Description": "This plugin brings a filemanager to KDevelop.",
+ "Description[ca@valencia]": "Este connector proporciona un gestor de fitxers al KDevelop.",
+ "Description[ca]": "Aquest connector proporciona un gestor de fitxers al KDevelop.",
+ "Description[cs]": "Tento modul do KDevelop přináší správce souborů.",
+ "Description[de]": "Dieses Modul integriert einen Datei-Browser in KDevelop.",
+ "Description[es]": "Este complemento proporciona un gestor de archivos a KDevelop.",
+ "Description[et]": "See plugin võimaldab kasutada KDevelopis failihaldurit.",
+ "Description[fi]": "Tämä liitännäinen tuo tiedostohallinnan KDevelopiin.",
+ "Description[fr]": "Ce module apporte un gestionnaire de fichiers à KDevelop",
+ "Description[gl]": "Este complemento incorpora un xestor de ficheiros no KDevelop.",
+ "Description[it]": "Questa estensione porta un gestore di file in KDevelop.",
+ "Description[nl]": "Deze plugin brengt een bestandsbeheerder in KDevelop.",
+ "Description[pl]": "Ta wtyczka udostępnia zarządzanie plikami w KDevelopie.",
+ "Description[pt]": "Este 'plugin' traz um gestor de ficheiros para o KDevelop.",
+ "Description[pt_BR]": "Este plugin provê um gerenciador de arquivos ao KDevelop.",
+ "Description[sk]": "Tento plugin prináša správcu súborov do KDevelop.",
+ "Description[sl]": "Vstavek v KDevelop vgradi upravljalnika datotek.",
+ "Description[sv]": "Insticksprogrammet integrerar en filhanterare i KDevelop.",
+ "Description[uk]": "За допомогою цього додатка можна отримати доступ до менеджера файлів у KDevelop.",
+ "Description[x-test]": "xxThis plugin brings a filemanager to KDevelop.xx",
+ "Description[zh_CN]": "此插件为 KDevelop 提供了一个文件管理器。",
+ "Icon": "system-file-manager",
+ "Id": "kdevfilemanager",
+ "License": "GPL",
+ "Name": "KDE File Manager Integration",
+ "Name[ca@valencia]": "Integració del gestor de fitxers del KDE",
+ "Name[ca]": "Integració del gestor de fitxers del KDE",
+ "Name[de]": "Integration der KDE-Dateiverwaltung",
+ "Name[es]": "Integración del gestor de archivos de KDE",
+ "Name[et]": "KDE failihalduri lõimimine",
+ "Name[fi]": "KDE-tiedostonhallintaintegrointi",
+ "Name[fr]": "Intégration avec le gestionnaire de fichiers de KDE",
+ "Name[gl]": "Integración co xestor de ficheiros do KDE",
+ "Name[it]": "Integrazione gestore di file di KDE",
+ "Name[nb]": "Integrasjon med KDE filbehandler",
+ "Name[nl]": "KDE Bestandsbeheerder-integratie",
+ "Name[pl]": "Integracja zarządzania plikami KDE",
+ "Name[pt]": "Integração com o Gestor de Ficheiros do KDE",
+ "Name[pt_BR]": "Integração com o gerenciador de arquivos do KDE",
+ "Name[ru]": "Интеграция файлового менеджера KDE",
+ "Name[sk]": "Integrácia správcu súborov KDE",
+ "Name[sl]": "Vgradnja KDE-jevega upravljalnika datotek",
+ "Name[sv]": "Integrering av KDE:s filhanterare",
+ "Name[uk]": "Інтеграція засобу керування файлами KDE",
+ "Name[x-test]": "xxKDE File Manager Integrationxx",
+ "Name[zh_CN]": "KDE 文件管理器整合",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.1"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/filetemplates/kdevfiletemplates.json kdevplatform-5.1.1/plugins/filetemplates/kdevfiletemplates.json
--- kdevplatform-5.1.0/plugins/filetemplates/kdevfiletemplates.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/filetemplates/kdevfiletemplates.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,65 +2,65 @@
"KPlugin": {
"Authors": [
{
- "Name": "Alexander Dymo",
- "Name[uk]": "Олександр Димо",
+ "Name": "Alexander Dymo",
+ "Name[uk]": "Олександр Димо",
"Name[x-test]": "xxAlexander Dymoxx"
}
- ],
- "Category": "Core",
- "Description": "Manages templates for source files",
- "Description[ca@valencia]": "Gestiona les plantilles dels fitxers de codi font",
- "Description[ca]": "Gestiona les plantilles dels fitxers de codi font",
- "Description[de]": "Verwaltung von Vorlagen für Quelltextdateien",
- "Description[es]": "Gestiona plantillas para los archivos de código fuente",
- "Description[et]": "Lähtekoodi failide mallide haldamine",
- "Description[fi]": "Hallitsee lähdekooditiedostojen malleja",
- "Description[fr]": "Gère les modèles de fichiers sources",
- "Description[gl]": "Xestiona modelos para os ficheiros de fonte",
- "Description[it]": "Gestisce i modelli per i file sorgente",
- "Description[nl]": "Beheert sjablonen voor broncodebestanden",
- "Description[pl]": "Zarządza szablonami dla plików źródłowych",
- "Description[pt]": "Gere os modelos de ficheiros de código",
- "Description[pt_BR]": "Gerencia os modelos dos arquivos de código",
- "Description[sk]": "Spravuje šablóny pre zdrojové súbory",
- "Description[sl]": "Upravlja predloge za datoteke z izvorno kodo",
- "Description[sv]": "Hanterar mallar för källkodsfiler",
- "Description[uk]": "Керування шаблонами для початкових файлів коду",
- "Description[x-test]": "xxManages templates for source filesxx",
- "Description[zh_CN]": "管理源文件的模板",
- "Icon": "code-class",
- "Id": "kdevfiletemplates",
- "License": "GPL",
- "Name": "File Templates Configuration",
- "Name[ca@valencia]": "Configuració de les plantilles de fitxer",
- "Name[ca]": "Configuració de les plantilles de fitxer",
- "Name[de]": "Einrichtung der Dateivorlagen",
- "Name[es]": "Configuración de las plantillas de archivos",
- "Name[et]": "Failimallide seadistamine",
- "Name[fi]": "Tiedostomallien asetukset",
- "Name[fr]": "Configuration des modèles de fichiers",
- "Name[gl]": "Configuración dos modelos de ficheiros",
- "Name[it]": "Configurazione dei file dei modelli",
- "Name[nb]": "Oppsett av fil-maler",
- "Name[nl]": "Configuratie van sjabloonbestanden",
- "Name[pl]": "Ustawienia szablonów plików",
- "Name[pt]": "Configuração dos Modelos de Ficheiros",
- "Name[pt_BR]": "Configuração dos modelos de arquivos",
- "Name[ru]": "Настройка шаблонов файлов",
- "Name[sk]": "Nastavenie šablón súborov",
- "Name[sl]": "Nastavitev predlog dokumentov",
- "Name[sv]": "Inställning av filmallar",
- "Name[uk]": "Налаштовування шаблонів файлів",
- "Name[x-test]": "xxFile Templates Configurationxx",
- "Name[zh_CN]": "文件模板配置",
+ ],
+ "Category": "Core",
+ "Description": "Manages templates for source files",
+ "Description[ca@valencia]": "Gestiona les plantilles dels fitxers de codi font",
+ "Description[ca]": "Gestiona les plantilles dels fitxers de codi font",
+ "Description[de]": "Verwaltung von Vorlagen für Quelltextdateien",
+ "Description[es]": "Gestiona plantillas para los archivos de código fuente",
+ "Description[et]": "Lähtekoodi failide mallide haldamine",
+ "Description[fi]": "Hallitsee lähdekooditiedostojen malleja",
+ "Description[fr]": "Gère les modèles de fichiers sources",
+ "Description[gl]": "Xestiona modelos para os ficheiros de fonte",
+ "Description[it]": "Gestisce i modelli per i file sorgente",
+ "Description[nl]": "Beheert sjablonen voor broncodebestanden",
+ "Description[pl]": "Zarządza szablonami dla plików źródłowych",
+ "Description[pt]": "Gere os modelos de ficheiros de código",
+ "Description[pt_BR]": "Gerencia os modelos dos arquivos de código",
+ "Description[sk]": "Spravuje šablóny pre zdrojové súbory",
+ "Description[sl]": "Upravlja predloge za datoteke z izvorno kodo",
+ "Description[sv]": "Hanterar mallar för källkodsfiler",
+ "Description[uk]": "Керування шаблонами для початкових файлів коду",
+ "Description[x-test]": "xxManages templates for source filesxx",
+ "Description[zh_CN]": "管理源文件的模板",
+ "Icon": "code-class",
+ "Id": "kdevfiletemplates",
+ "License": "GPL",
+ "Name": "File Templates Configuration",
+ "Name[ca@valencia]": "Configuració de les plantilles de fitxer",
+ "Name[ca]": "Configuració de les plantilles de fitxer",
+ "Name[de]": "Einrichtung der Dateivorlagen",
+ "Name[es]": "Configuración de las plantillas de archivos",
+ "Name[et]": "Failimallide seadistamine",
+ "Name[fi]": "Tiedostomallien asetukset",
+ "Name[fr]": "Configuration des modèles de fichiers",
+ "Name[gl]": "Configuración dos modelos de ficheiros",
+ "Name[it]": "Configurazione dei file dei modelli",
+ "Name[nb]": "Oppsett av fil-maler",
+ "Name[nl]": "Configuratie van sjabloonbestanden",
+ "Name[pl]": "Ustawienia szablonów plików",
+ "Name[pt]": "Configuração dos Modelos de Ficheiros",
+ "Name[pt_BR]": "Configuração dos modelos de arquivos",
+ "Name[ru]": "Настройка шаблонов файлов",
+ "Name[sk]": "Nastavenie šablón súborov",
+ "Name[sl]": "Nastavitev predlog dokumentov",
+ "Name[sv]": "Inställning av filmallar",
+ "Name[uk]": "Налаштовування шаблонів файлів",
+ "Name[x-test]": "xxFile Templates Configurationxx",
+ "Name[zh_CN]": "文件模板配置",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.1"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.ITemplateProvider"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/filetemplates/kdevfiletemplates.knsrc kdevplatform-5.1.1/plugins/filetemplates/kdevfiletemplates.knsrc
--- kdevplatform-5.1.0/plugins/filetemplates/kdevfiletemplates.knsrc 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/filetemplates/kdevfiletemplates.knsrc 2017-05-13 10:12:21.000000000 +0000
@@ -8,7 +8,10 @@
Name[es]=Plantillas de archivos (SDK)
Name[it]=Modelli di file (SDK)
Name[nl]=Bestandssjablonen (SDK)
+Name[pl]=Szablony plików (SDK)
Name[pt]=Modelos de Ficheiros (SDK)
+Name[sk]=Súborové šablóny (SDK)
+Name[sl]=Predloge datotek (SDK)
Name[sv]=Filmallar (SDK)
Name[uk]=Шаблони файлів (SDK)
Name[x-test]=xxFile Templates (SDK)xx
diff -Nru kdevplatform-5.1.0/plugins/genericprojectmanager/kdevgenericmanager.json kdevplatform-5.1.1/plugins/genericprojectmanager/kdevgenericmanager.json
--- kdevplatform-5.1.0/plugins/genericprojectmanager/kdevgenericmanager.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/genericprojectmanager/kdevgenericmanager.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,64 +2,64 @@
"KPlugin": {
"Authors": [
{
- "Name": "Milian Wolff",
+ "Name": "Milian Wolff",
"Name[x-test]": "xxMilian Wolffxx"
}
- ],
- "Category": "Project Management",
- "Description": "Allow KDevelop to manage generic projects",
- "Description[ca@valencia]": "Permet al KDevelop gestionar projectes genèrics",
- "Description[ca]": "Permet al KDevelop gestionar projectes genèrics",
- "Description[de]": "Zum Verwalten allgemeiner Projekte in KDevelop",
- "Description[es]": "Permite que KDevelop use proyectos genéricos",
- "Description[et]": "Võimaldab KDevelopil hallata üldisi projekte",
- "Description[fi]": "Sallii KDevelop-ohjelman hallita yleisiä projekteja",
- "Description[fr]": "Permet à KDevelop de gérer des projets génériques",
- "Description[gl]": "Permítelle a KDevelop xestionar proxectos xenéricos",
- "Description[it]": "Permette a KDevelop di gestire progetti generici",
- "Description[nl]": "Sta toe dat KDevelop generieke projecten beheert",
- "Description[pl]": "Zezwól KDevelopowi na zarządzanie zwykłymi projektami",
- "Description[pt]": "Permitir ao KDevelop gerir projectos genéricos",
- "Description[pt_BR]": "Permite que o KDevelop gerencie projetos genéricos",
- "Description[sk]": "Povoliť KDevelopu spravovať všeobecné projekty",
- "Description[sl]": "Omogoča, da KDevelop upravlja splošne projekte",
- "Description[sv]": "Tillåter att KDevelop hanterar generella projekt",
- "Description[uk]": "За допомогою цього додатка можна увімкнути керування загальними проектами у KDevelop",
- "Description[x-test]": "xxAllow KDevelop to manage generic projectsxx",
- "Description[zh_CN]": "允许 KDevelop 管理常规工程",
- "Icon": "kdevelop",
- "Id": "KDevGenericManager",
- "Name": "Generic Project Manager",
- "Name[ca@valencia]": "Gestor de projectes genèric",
- "Name[ca]": "Gestor de projectes genèric",
- "Name[cs]": "Obecný správce projektů",
- "Name[de]": "Allgemeine Projektverwaltung",
- "Name[es]": "Gestor de proyectos genéricos",
- "Name[et]": "Üldine projektihaldur",
- "Name[fi]": "Yleinen projektinhallinta",
- "Name[fr]": "Gestionnaire de projet générique",
- "Name[gl]": "Xestor de proxectos xenérico",
- "Name[it]": "Gestore progetto generico",
- "Name[nb]": "Generisk prosjektbehandler",
- "Name[nl]": "Generieke projectenbeheerder",
- "Name[pl]": "Zwykłe zarządzanie projektami",
- "Name[pt]": "Gestor de Projectos Genérico",
- "Name[pt_BR]": "Gerenciador de projetos genérico",
- "Name[ru]": "Управление произвольными проектами",
- "Name[sk]": "Všeobecný správca projektov",
- "Name[sl]": "Splošni upravljalnik projektov",
- "Name[sv]": "Generell projekthantering",
- "Name[uk]": "Звичайний засіб керування проектом",
- "Name[x-test]": "xxGeneric Project Managerxx",
- "Name[zh_CN]": "常规工程管理器",
+ ],
+ "Category": "Project Management",
+ "Description": "Allow KDevelop to manage generic projects",
+ "Description[ca@valencia]": "Permet al KDevelop gestionar projectes genèrics",
+ "Description[ca]": "Permet al KDevelop gestionar projectes genèrics",
+ "Description[de]": "Zum Verwalten allgemeiner Projekte in KDevelop",
+ "Description[es]": "Permite que KDevelop use proyectos genéricos",
+ "Description[et]": "Võimaldab KDevelopil hallata üldisi projekte",
+ "Description[fi]": "Sallii KDevelop-ohjelman hallita yleisiä projekteja",
+ "Description[fr]": "Permet à KDevelop de gérer des projets génériques",
+ "Description[gl]": "Permítelle a KDevelop xestionar proxectos xenéricos",
+ "Description[it]": "Permette a KDevelop di gestire progetti generici",
+ "Description[nl]": "Sta toe dat KDevelop generieke projecten beheert",
+ "Description[pl]": "Zezwól KDevelopowi na zarządzanie zwykłymi projektami",
+ "Description[pt]": "Permitir ao KDevelop gerir projectos genéricos",
+ "Description[pt_BR]": "Permite que o KDevelop gerencie projetos genéricos",
+ "Description[sk]": "Povoliť KDevelopu spravovať všeobecné projekty",
+ "Description[sl]": "Omogoča, da KDevelop upravlja splošne projekte",
+ "Description[sv]": "Tillåter att KDevelop hanterar generella projekt",
+ "Description[uk]": "За допомогою цього додатка можна увімкнути керування загальними проектами у KDevelop",
+ "Description[x-test]": "xxAllow KDevelop to manage generic projectsxx",
+ "Description[zh_CN]": "允许 KDevelop 管理常规工程",
+ "Icon": "kdevelop",
+ "Id": "KDevGenericManager",
+ "Name": "Generic Project Manager",
+ "Name[ca@valencia]": "Gestor de projectes genèric",
+ "Name[ca]": "Gestor de projectes genèric",
+ "Name[cs]": "Obecný správce projektů",
+ "Name[de]": "Allgemeine Projektverwaltung",
+ "Name[es]": "Gestor de proyectos genéricos",
+ "Name[et]": "Üldine projektihaldur",
+ "Name[fi]": "Yleinen projektinhallinta",
+ "Name[fr]": "Gestionnaire de projet générique",
+ "Name[gl]": "Xestor de proxectos xenérico",
+ "Name[it]": "Gestore progetto generico",
+ "Name[nb]": "Generisk prosjektbehandler",
+ "Name[nl]": "Generieke projectenbeheerder",
+ "Name[pl]": "Zwykłe zarządzanie projektami",
+ "Name[pt]": "Gestor de Projectos Genérico",
+ "Name[pt_BR]": "Gerenciador de projetos genérico",
+ "Name[ru]": "Управление произвольными проектами",
+ "Name[sk]": "Všeobecný správca projektov",
+ "Name[sl]": "Splošni upravljalnik projektov",
+ "Name[sv]": "Generell projekthantering",
+ "Name[uk]": "Звичайний засіб керування проектом",
+ "Name[x-test]": "xxGeneric Project Managerxx",
+ "Name[zh_CN]": "常规工程管理器",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Project",
- "X-KDevelop-FileManager": "None",
+ },
+ "X-KDevelop-Category": "Project",
+ "X-KDevelop-FileManager": "None",
"X-KDevelop-Interfaces": [
"org.kdevelop.IProjectFileManager"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/git/kdevgit.json kdevplatform-5.1.1/plugins/git/kdevgit.json
--- kdevplatform-5.1.0/plugins/git/kdevgit.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/git/kdevgit.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,66 +2,66 @@
"KPlugin": {
"Authors": [
{
- "Email": "powerfox@kde.ru",
- "Name": "Evgeniy Ivanov",
+ "Email": "powerfox@kde.ru",
+ "Name": "Evgeniy Ivanov",
"Name[x-test]": "xxEvgeniy Ivanovxx"
}
- ],
- "Category": "Version Control",
- "Description": "This plugin integrates Git to KDevelop",
- "Description[ca@valencia]": "Este connector integra Git al KDevelop",
- "Description[ca]": "Aquest connector integra Git al KDevelop",
- "Description[cs]": "Tento modul integruje podporu pro Git v KDevelop",
- "Description[de]": "Dieses Modul integriert Git in KDevelop.",
- "Description[es]": "Este complemento integra Git en KDevelop",
- "Description[et]": "See plugin lõimib Giti KDevelopiga",
- "Description[fi]": "Tämä liitännäinen integroi Git-ohjelman KDevelop-ympäristöön",
- "Description[fr]": "Ce module externe intègre la gestion de Git dans KDevelop",
- "Description[gl]": "Este complemento integra Git en KDevelop",
- "Description[it]": "Questa estensione integra Git in KDevelop",
- "Description[nl]": "Deze plug-in integreert Git in KDevelop",
- "Description[pl]": "Wtyczka ta integruje Git z KDevelop",
- "Description[pt]": "Este 'plugin' integra o Git no KDevelop",
- "Description[pt_BR]": "Este plugin integra o Git ao KDevelop",
- "Description[sk]": "Tento plugin integruje GIT do KDevelop.",
- "Description[sl]": "Vstavek v KDevelop vgradi Git",
- "Description[sv]": "Insticksprogrammet integrerar Git i KDevelop",
- "Description[uk]": "Цей додаток інтегрує Git із KDevelop",
- "Description[x-test]": "xxThis plugin integrates Git to KDevelopxx",
- "Description[zh_CN]": "此插件对 KDevelop 整合 Git",
- "Icon": "git",
- "Id": "kdevgit",
- "License": "GPL",
- "Name": "Git Support",
- "Name[ca@valencia]": "Implementació de Git",
- "Name[ca]": "Implementació de Git",
- "Name[cs]": "Podpora Git",
- "Name[de]": "Git-Unterstützung",
- "Name[es]": "Implementación de Git",
- "Name[et]": "Giti toetus",
- "Name[fi]": "Git-tuki",
- "Name[fr]": "Gestion de Git",
- "Name[gl]": "Soporte de GIT",
- "Name[it]": "Supporto Git",
- "Name[nl]": "Git-ondersteuning",
- "Name[pl]": "Obsługa Git",
- "Name[pt]": "Suporte para o Git",
- "Name[pt_BR]": "Suporte ao Git",
- "Name[ru]": "Поддержка Git",
- "Name[sk]": "Podpora GIT",
- "Name[sl]": "Podpora za Git",
- "Name[sv]": "Stöd för Git",
- "Name[uk]": "Підтримка Git",
- "Name[x-test]": "xxGit Supportxx",
- "Name[zh_CN]": "Git 支持",
+ ],
+ "Category": "Version Control",
+ "Description": "This plugin integrates Git to KDevelop",
+ "Description[ca@valencia]": "Este connector integra Git al KDevelop",
+ "Description[ca]": "Aquest connector integra Git al KDevelop",
+ "Description[cs]": "Tento modul integruje podporu pro Git v KDevelop",
+ "Description[de]": "Dieses Modul integriert Git in KDevelop.",
+ "Description[es]": "Este complemento integra Git en KDevelop",
+ "Description[et]": "See plugin lõimib Giti KDevelopiga",
+ "Description[fi]": "Tämä liitännäinen integroi Git-ohjelman KDevelop-ympäristöön",
+ "Description[fr]": "Ce module externe intègre la gestion de Git dans KDevelop",
+ "Description[gl]": "Este complemento integra Git en KDevelop",
+ "Description[it]": "Questa estensione integra Git in KDevelop",
+ "Description[nl]": "Deze plug-in integreert Git in KDevelop",
+ "Description[pl]": "Wtyczka ta integruje Git z KDevelop",
+ "Description[pt]": "Este 'plugin' integra o Git no KDevelop",
+ "Description[pt_BR]": "Este plugin integra o Git ao KDevelop",
+ "Description[sk]": "Tento plugin integruje GIT do KDevelop.",
+ "Description[sl]": "Vstavek v KDevelop vgradi Git",
+ "Description[sv]": "Insticksprogrammet integrerar Git i KDevelop",
+ "Description[uk]": "Цей додаток інтегрує Git із KDevelop",
+ "Description[x-test]": "xxThis plugin integrates Git to KDevelopxx",
+ "Description[zh_CN]": "此插件对 KDevelop 整合 Git",
+ "Icon": "git",
+ "Id": "kdevgit",
+ "License": "GPL",
+ "Name": "Git Support",
+ "Name[ca@valencia]": "Implementació de Git",
+ "Name[ca]": "Implementació de Git",
+ "Name[cs]": "Podpora Git",
+ "Name[de]": "Git-Unterstützung",
+ "Name[es]": "Implementación de Git",
+ "Name[et]": "Giti toetus",
+ "Name[fi]": "Git-tuki",
+ "Name[fr]": "Gestion de Git",
+ "Name[gl]": "Soporte de GIT",
+ "Name[it]": "Supporto Git",
+ "Name[nl]": "Git-ondersteuning",
+ "Name[pl]": "Obsługa Git",
+ "Name[pt]": "Suporte para o Git",
+ "Name[pt_BR]": "Suporte ao Git",
+ "Name[ru]": "Поддержка Git",
+ "Name[sk]": "Podpora GIT",
+ "Name[sl]": "Podpora za Git",
+ "Name[sv]": "Stöd för Git",
+ "Name[uk]": "Підтримка Git",
+ "Name[x-test]": "xxGit Supportxx",
+ "Name[zh_CN]": "Git 支持",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "0.9"
- },
+ },
"X-KDevelop-Interfaces": [
- "org.kdevelop.IBasicVersionControl",
+ "org.kdevelop.IBasicVersionControl",
"org.kdevelop.IDistributedVersionControl"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/grepview/grepoutputdelegate.cpp kdevplatform-5.1.1/plugins/grepview/grepoutputdelegate.cpp
--- kdevplatform-5.1.0/plugins/grepview/grepoutputdelegate.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/grepview/grepoutputdelegate.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -53,13 +53,6 @@
m_self = nullptr;
}
-QColor GrepOutputDelegate::blendColor(QColor color1, QColor color2, double blend) const
-{
- return QColor(color1.red() * blend + color2.red() * (1-blend),
- color1.green() * blend + color2.green() * (1-blend),
- color1.blue() * blend + color2.blue() * (1-blend));
-}
-
void GrepOutputDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{
// there is no function in QString to left-trim. A call to remove this this regexp does the job
diff -Nru kdevplatform-5.1.0/plugins/grepview/grepoutputdelegate.h kdevplatform-5.1.1/plugins/grepview/grepoutputdelegate.h
--- kdevplatform-5.1.0/plugins/grepview/grepoutputdelegate.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/grepview/grepoutputdelegate.h 2017-05-13 10:12:21.000000000 +0000
@@ -36,7 +36,6 @@
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
private:
static GrepOutputDelegate* m_self;
- QColor blendColor(QColor color1, QColor color2, double blend) const;
};
#endif
diff -Nru kdevplatform-5.1.0/plugins/grepview/grepoutputmodel.cpp kdevplatform-5.1.1/plugins/grepview/grepoutputmodel.cpp
--- kdevplatform-5.1.0/plugins/grepview/grepoutputmodel.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/grepview/grepoutputmodel.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -153,7 +153,8 @@
const QString match = isCheckable() ? grepModel->replacementFor(m_change->m_oldText) : m_change->m_oldText;
const QString repl = QLatin1String("") + match.toHtmlEscaped() + QLatin1String("");
QString end = text().right(text().length() - m_change->m_range.end().column()).toHtmlEscaped();
- return QVariant(QString(start + repl + end).trimmed());
+ const QString toolTip = QLatin1String("") + QString(start + repl + end).trimmed() + QLatin1String("");
+ return toolTip;
} else if (role == Qt::FontRole) {
return QFontDatabase::systemFont(QFontDatabase::FixedFont);
} else {
diff -Nru kdevplatform-5.1.0/plugins/grepview/grepviewplugin.h kdevplatform-5.1.1/plugins/grepview/grepviewplugin.h
--- kdevplatform-5.1.0/plugins/grepview/grepviewplugin.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/grepview/grepviewplugin.h 2017-05-13 10:12:21.000000000 +0000
@@ -10,8 +10,8 @@
* *
***************************************************************************/
-#ifndef GREPVIEWPART_H_
-#define GREPVIEWPART_H_
+#ifndef KDEVPLATFORM_PLUGIN_GREPVIEWPLUGIN_H
+#define KDEVPLATFORM_PLUGIN_GREPVIEWPLUGIN_H
#include
#include
@@ -27,6 +27,7 @@
class GrepViewPlugin : public KDevelop::IPlugin
{
Q_OBJECT
+ Q_CLASSINFO( "D-Bus Interface", "org.kdevelop.GrepViewPlugin" )
public:
explicit GrepViewPlugin( QObject *parent, const QVariantList & = QVariantList() );
diff -Nru kdevplatform-5.1.0/plugins/grepview/kdevgrepview.json kdevplatform-5.1.1/plugins/grepview/kdevgrepview.json
--- kdevplatform-5.1.0/plugins/grepview/kdevgrepview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/grepview/kdevgrepview.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,55 +1,55 @@
{
"KPlugin": {
- "Category": "Utilities",
- "Description": "Allows fast searching of multiple files using patterns or regular expressions. And allow to replace it too.",
- "Description[ca@valencia]": "Permet la busca ràpida de múltiples fitxers usant patrons o expressions regulars. I també permet substitucions.",
- "Description[ca]": "Permet la cerca ràpida de múltiples fitxers usant patrons o expressions regulars. I també permet substitucions.",
- "Description[de]": "Ermöglicht es, Dateien mit Hilfe von Mustern und regulären Ausdrücken zu durchsuchen bzw. Ersetzungen vorzunehmen.",
- "Description[es]": "Permite la búsqueda rápida de múltiples archivos usando patrones o expresiones regulares. También permite realizar sustituciones.",
- "Description[et]": "Lubab mustreid või regulaaravaldisi kasutades kiiresti paljudes failides teksti otsida, samuti asendada.",
- "Description[fi]": "Mahdollistaa nopean useiden tiedostojen etsinnän käyttäen malleja tai säännöllisiä lausekkeita. Sallii myös korvauksen.",
- "Description[fr]": "Permet de rechercher rapidement dans plusieurs fichiers en utilisant des motifs ou des expressions rationnelles. Et permet de le remplacer aussi.",
- "Description[gl]": "Permite facer unha busca rápida en varios ficheiros empregando padróns ou expresións regulares, e tamén realizar substitucións.",
- "Description[it]": "Consente la ricerca veloce di file multipli usando espressioni regolari o modelli. E consente anche di sostituirli.",
- "Description[nl]": "Staat toe snel te zoeken naar meerdere bestanden met gebruik van patronen of reguliere expressies. Staat ook vervanging toe.",
- "Description[pl]": "Pozwala na szybkie znajdowanie wielu plików wykorzystując wzorce lub regularne wyrażenia. Pozwala także na ich zastępowanie.",
- "Description[pt]": "Permite a pesquisa rápida em vários ficheiros, usando padrões ou expressões regulares. Permite também a sua substituição.",
- "Description[pt_BR]": "Permite pesquisar rapidamente em vários arquivos, usando padrões ou expressões regulares e também realizar substituições.",
- "Description[sk]": "Umožní rýchle hľadanie viacerých súborov pomocou vzorov alebo regulárnych výrazov a umožní ich nahradiť.",
- "Description[sl]": "Omogoča hitro iskanje po več datotekah z uporabo vzorcev ali regularnih izrazov. Omogoča tudi zamenjave.",
- "Description[sv]": "Tillåter snabb sökning i flera filer med mönster eller reguljära uttryck, och tillåter dessutom ersättning.",
- "Description[uk]": "Надає можливості швидкого пошуку та заміни у декількох файлів на основі шаблонів або формальних виразів.",
- "Description[x-test]": "xxAllows fast searching of multiple files using patterns or regular expressions. And allow to replace it too.xx",
- "Description[zh_CN]": "可以用模式或正则表达式快速搜索多个文件,还可以替换。",
- "Icon": "kfind",
- "Id": "kdevgrepview",
- "Name": "Find/Replace In Files",
- "Name[ca@valencia]": "Busca i substitució en fitxers",
- "Name[ca]": "Cerca i substitució en fitxers",
- "Name[cs]": "Hledat-nahradit v souborech",
- "Name[de]": "In Dateien suchen/ersetzen",
- "Name[es]": "Buscar/sustituir en archivos",
- "Name[et]": "Failides otsimine ja asendamine",
- "Name[fi]": "Etsi ja korvaa tiedostoista",
- "Name[fr]": "Rechercher / remplacer dans les fichiers",
- "Name[gl]": "Buscar/Substituír nos ficheiros",
- "Name[it]": "Trova/Sostituisci nei file",
- "Name[nb]": "Finn/erstatt i filer",
- "Name[nl]": "Zoeken/vervangen in bestanden",
- "Name[pl]": "Znajdź/zastąp w plikach",
- "Name[pt]": "Procurar/Substituir nos Ficheiros",
- "Name[pt_BR]": "Procurar/substituir nos arquivos",
- "Name[ru]": "Поиск/замена в файлах",
- "Name[sk]": "Hľadať/nahradiť v súboroch",
- "Name[sl]": "Najdi/zamenjaj v datotekah",
- "Name[sv]": "Sök eller ersätt i filer",
- "Name[uk]": "Пошук або заміна у файлах",
- "Name[x-test]": "xxFind/Replace In Filesxx",
- "Name[zh_CN]": "在文件中查找/替换",
+ "Category": "Utilities",
+ "Description": "Allows fast searching of multiple files using patterns or regular expressions. And allow to replace it too.",
+ "Description[ca@valencia]": "Permet la busca ràpida de múltiples fitxers usant patrons o expressions regulars. I també permet substitucions.",
+ "Description[ca]": "Permet la cerca ràpida de múltiples fitxers usant patrons o expressions regulars. I també permet substitucions.",
+ "Description[de]": "Ermöglicht es, Dateien mit Hilfe von Mustern und regulären Ausdrücken zu durchsuchen bzw. Ersetzungen vorzunehmen.",
+ "Description[es]": "Permite la búsqueda rápida de múltiples archivos usando patrones o expresiones regulares. También permite realizar sustituciones.",
+ "Description[et]": "Lubab mustreid või regulaaravaldisi kasutades kiiresti paljudes failides teksti otsida, samuti asendada.",
+ "Description[fi]": "Mahdollistaa nopean useiden tiedostojen etsinnän käyttäen malleja tai säännöllisiä lausekkeita. Sallii myös korvauksen.",
+ "Description[fr]": "Permet de rechercher rapidement dans plusieurs fichiers en utilisant des motifs ou des expressions rationnelles. Et permet de le remplacer aussi.",
+ "Description[gl]": "Permite facer unha busca rápida en varios ficheiros empregando padróns ou expresións regulares, e tamén realizar substitucións.",
+ "Description[it]": "Consente la ricerca veloce di file multipli usando espressioni regolari o modelli. E consente anche di sostituirli.",
+ "Description[nl]": "Staat toe snel te zoeken naar meerdere bestanden met gebruik van patronen of reguliere expressies. Staat ook vervanging toe.",
+ "Description[pl]": "Pozwala na szybkie znajdowanie wielu plików wykorzystując wzorce lub regularne wyrażenia. Pozwala także na ich zastępowanie.",
+ "Description[pt]": "Permite a pesquisa rápida em vários ficheiros, usando padrões ou expressões regulares. Permite também a sua substituição.",
+ "Description[pt_BR]": "Permite pesquisar rapidamente em vários arquivos, usando padrões ou expressões regulares e também realizar substituições.",
+ "Description[sk]": "Umožní rýchle hľadanie viacerých súborov pomocou vzorov alebo regulárnych výrazov a umožní ich nahradiť.",
+ "Description[sl]": "Omogoča hitro iskanje po več datotekah z uporabo vzorcev ali regularnih izrazov. Omogoča tudi zamenjave.",
+ "Description[sv]": "Tillåter snabb sökning i flera filer med mönster eller reguljära uttryck, och tillåter dessutom ersättning.",
+ "Description[uk]": "Надає можливості швидкого пошуку та заміни у декількох файлів на основі шаблонів або формальних виразів.",
+ "Description[x-test]": "xxAllows fast searching of multiple files using patterns or regular expressions. And allow to replace it too.xx",
+ "Description[zh_CN]": "可以用模式或正则表达式快速搜索多个文件,还可以替换。",
+ "Icon": "kfind",
+ "Id": "kdevgrepview",
+ "Name": "Find/Replace In Files",
+ "Name[ca@valencia]": "Busca i substitució en fitxers",
+ "Name[ca]": "Cerca i substitució en fitxers",
+ "Name[cs]": "Hledat-nahradit v souborech",
+ "Name[de]": "In Dateien suchen/ersetzen",
+ "Name[es]": "Buscar/sustituir en archivos",
+ "Name[et]": "Failides otsimine ja asendamine",
+ "Name[fi]": "Etsi ja korvaa tiedostoista",
+ "Name[fr]": "Rechercher / remplacer dans les fichiers",
+ "Name[gl]": "Buscar/Substituír nos ficheiros",
+ "Name[it]": "Trova/Sostituisci nei file",
+ "Name[nb]": "Finn/erstatt i filer",
+ "Name[nl]": "Zoeken/vervangen in bestanden",
+ "Name[pl]": "Znajdź/zastąp w plikach",
+ "Name[pt]": "Procurar/Substituir nos Ficheiros",
+ "Name[pt_BR]": "Procurar/substituir nos arquivos",
+ "Name[ru]": "Поиск/замена в файлах",
+ "Name[sk]": "Hľadať/nahradiť v súboroch",
+ "Name[sl]": "Najdi/zamenjaj v datotekah",
+ "Name[sv]": "Sök eller ersätt i filer",
+ "Name[uk]": "Пошук або заміна у файлах",
+ "Name[x-test]": "xxFind/Replace In Filesxx",
+ "Name[zh_CN]": "在文件中查找/替换",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/konsole/kdevkonsoleview.json kdevplatform-5.1.1/plugins/konsole/kdevkonsoleview.json
--- kdevplatform-5.1.0/plugins/konsole/kdevkonsoleview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/konsole/kdevkonsoleview.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,54 +1,54 @@
{
"KPlugin": {
- "Category": "Utilities",
- "Description": "This plugin provides KDevelop with an embedded konsole for quick and easy command line access.",
- "Description[ca@valencia]": "Este connector proporciona al KDevelop un Konsole incrustat per accedir de manera ràpida i fàcil a la línia d'ordes.",
- "Description[ca]": "Aquest connector proporciona al KDevelop un Konsole incrustat per accedir de manera ràpida i fàcil a la línia d'ordres.",
- "Description[de]": "Dieses Modul stattet KDevelop mit einer eingebetteten Konsole zum einfachen Zugriff auf die Befehlszeile aus.",
- "Description[es]": "Este complemento proporciona una consola integrada a KDevelop para acceder a la línea de órdenes de forma rápida y fácil.",
- "Description[et]": "See plugin pakub KDevelopile põimitud konsooli käsurea kiireks ja lihtsaks kasutamiseks.",
- "Description[fi]": "Tämä liitännäinen tarjoaa KDevelop-ohjelmalle upotetun pääteikkunan nopeaan ja helppoon komentorivityöskentelyyn.",
- "Description[fr]": "Ce module apporte à KDevelop une konsole intégrée pour un accès à la ligne de commande rapide et facile.",
- "Description[gl]": "Este complemento fornécelle a KDevelop un konsole integrado para dispor de acceso rápido e sinxelo á liña de ordes.",
- "Description[it]": "Questa estensione dota KDevelop di una console integrata per un rapido e semplice accesso alla riga di comando.",
- "Description[nl]": "Deze plugin biedt KDevelop een ingebed konsole voor snelle en gemakkelijke toegang tot commandoregels.",
- "Description[pl]": "Ta wtyczka dodaje do KDevelopa wbudowaną konsolę umożliwiając szybki i łatwy dostęp do wiersza poleceń.",
- "Description[pt]": "Este 'plugin' oferece ao KDevelop um Konsole incorporado para aceder rápida e facilmente à linha de comandos.",
- "Description[pt_BR]": "Este plugin fornece ao KDevelop um terminal embutido para acesso rápido e fácil à linha de comando.",
- "Description[sk]": "Tento plugin poskytuje KDevelop so zabudovanou konzolou na rýchly a ľahký prístup k príkazovému riadku.",
- "Description[sl]": "Vstavek v KDevelop vgradi program Konsole za hiter in preprost dostop do ukazne vrstice.",
- "Description[sv]": "Insticksprogrammet ger KDevelop en inbyggd terminal för snabb och enkel åtkomst av kommandoraden.",
- "Description[uk]": "За допомогою цього додатка у KDevelop можна буде скористатися вбудованою konsole, яка пришвидшить і полегшить доступ до командного рядка.",
- "Description[x-test]": "xxThis plugin provides KDevelop with an embedded konsole for quick and easy command line access.xx",
- "Description[zh_CN]": "此插件为 KDevelop 提供了一个快速方便地访问命令行的嵌入式控制台。",
- "Icon": "utilities-terminal",
- "Id": "kdevkonsoleview",
- "Name": "Konsole Integration",
- "Name[ca@valencia]": "Integració del Konsole",
- "Name[ca]": "Integració del Konsole",
- "Name[de]": "Konsole-Integration",
- "Name[es]": "Integración de la consola",
- "Name[et]": "Lõimimine Konsooliga",
- "Name[fi]": "Konsole-integraatio",
- "Name[fr]": "Intégration avec Konsole",
- "Name[gl]": "Integración con Konsole",
- "Name[it]": "Integrazione Konsole",
- "Name[nb]": "Konsole-integrering",
- "Name[nl]": "Console-integratie",
- "Name[pl]": "Integracja Konsoli",
- "Name[pt]": "Integração com o Konsole",
- "Name[pt_BR]": "Integração com o Konsole",
- "Name[ru]": "Интеграция Konsole",
- "Name[sk]": "Integrácia Konsole",
- "Name[sl]": "Vgradnja programa Konsole",
- "Name[sv]": "Integrering av Konsole",
- "Name[uk]": "Інтеграція з Konsole",
- "Name[x-test]": "xxKonsole Integrationxx",
- "Name[zh_CN]": "Konsole 整合",
+ "Category": "Utilities",
+ "Description": "This plugin provides KDevelop with an embedded konsole for quick and easy command line access.",
+ "Description[ca@valencia]": "Este connector proporciona al KDevelop un Konsole incrustat per accedir de manera ràpida i fàcil a la línia d'ordes.",
+ "Description[ca]": "Aquest connector proporciona al KDevelop un Konsole incrustat per accedir de manera ràpida i fàcil a la línia d'ordres.",
+ "Description[de]": "Dieses Modul stattet KDevelop mit einer eingebetteten Konsole zum einfachen Zugriff auf die Befehlszeile aus.",
+ "Description[es]": "Este complemento proporciona una consola integrada a KDevelop para acceder a la línea de órdenes de forma rápida y fácil.",
+ "Description[et]": "See plugin pakub KDevelopile põimitud konsooli käsurea kiireks ja lihtsaks kasutamiseks.",
+ "Description[fi]": "Tämä liitännäinen tarjoaa KDevelop-ohjelmalle upotetun pääteikkunan nopeaan ja helppoon komentorivityöskentelyyn.",
+ "Description[fr]": "Ce module apporte à KDevelop une konsole intégrée pour un accès à la ligne de commande rapide et facile.",
+ "Description[gl]": "Este complemento fornécelle a KDevelop un konsole integrado para dispor de acceso rápido e sinxelo á liña de ordes.",
+ "Description[it]": "Questa estensione dota KDevelop di una console integrata per un rapido e semplice accesso alla riga di comando.",
+ "Description[nl]": "Deze plugin biedt KDevelop een ingebed konsole voor snelle en gemakkelijke toegang tot commandoregels.",
+ "Description[pl]": "Ta wtyczka dodaje do KDevelopa wbudowaną konsolę umożliwiając szybki i łatwy dostęp do wiersza poleceń.",
+ "Description[pt]": "Este 'plugin' oferece ao KDevelop um Konsole incorporado para aceder rápida e facilmente à linha de comandos.",
+ "Description[pt_BR]": "Este plugin fornece ao KDevelop um terminal embutido para acesso rápido e fácil à linha de comando.",
+ "Description[sk]": "Tento plugin poskytuje KDevelop so zabudovanou konzolou na rýchly a ľahký prístup k príkazovému riadku.",
+ "Description[sl]": "Vstavek v KDevelop vgradi program Konsole za hiter in preprost dostop do ukazne vrstice.",
+ "Description[sv]": "Insticksprogrammet ger KDevelop en inbyggd terminal för snabb och enkel åtkomst av kommandoraden.",
+ "Description[uk]": "За допомогою цього додатка у KDevelop можна буде скористатися вбудованою konsole, яка пришвидшить і полегшить доступ до командного рядка.",
+ "Description[x-test]": "xxThis plugin provides KDevelop with an embedded konsole for quick and easy command line access.xx",
+ "Description[zh_CN]": "此插件为 KDevelop 提供了一个快速方便地访问命令行的嵌入式控制台。",
+ "Icon": "utilities-terminal",
+ "Id": "kdevkonsoleview",
+ "Name": "Konsole Integration",
+ "Name[ca@valencia]": "Integració del Konsole",
+ "Name[ca]": "Integració del Konsole",
+ "Name[de]": "Konsole-Integration",
+ "Name[es]": "Integración de la consola",
+ "Name[et]": "Lõimimine Konsooliga",
+ "Name[fi]": "Konsole-integraatio",
+ "Name[fr]": "Intégration avec Konsole",
+ "Name[gl]": "Integración con Konsole",
+ "Name[it]": "Integrazione Konsole",
+ "Name[nb]": "Konsole-integrering",
+ "Name[nl]": "Console-integratie",
+ "Name[pl]": "Integracja Konsoli",
+ "Name[pt]": "Integração com o Konsole",
+ "Name[pt_BR]": "Integração com o Konsole",
+ "Name[ru]": "Интеграция Konsole",
+ "Name[sk]": "Integrácia Konsole",
+ "Name[sl]": "Vgradnja programa Konsole",
+ "Name[sv]": "Integrering av Konsole",
+ "Name[uk]": "Інтеграція з Konsole",
+ "Name[x-test]": "xxKonsole Integrationxx",
+ "Name[zh_CN]": "Konsole 整合",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/openwith/kdevopenwith.json kdevplatform-5.1.1/plugins/openwith/kdevopenwith.json
--- kdevplatform-5.1.0/plugins/openwith/kdevopenwith.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/openwith/kdevopenwith.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,63 +2,63 @@
"KPlugin": {
"Authors": [
{
- "Name": "Andreas Pakulat",
+ "Name": "Andreas Pakulat",
"Name[x-test]": "xxAndreas Pakulatxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin allows one to open files with associated external applications.",
- "Description[ca@valencia]": "Este connector permet obrir fitxers amb les aplicacions externes associades.",
- "Description[ca]": "Aquest connector permet obrir fitxers amb les aplicacions externes associades.",
- "Description[de]": "Mit diesem Modul können Dateien mit ihnen zugewiesenen externen Anwendungen gestartet werden.",
- "Description[es]": "Este complemento permite abrir archivos con las aplicaciones externas asociadas.",
- "Description[et]": "See plugin võimaldab avada väliste rakendustega seostatud faile.",
- "Description[fi]": "Tämä liitännäinen mahdollistaa ulkoisiin sovelluksiin liitettyjen tiedostojen avaamisen.",
- "Description[fr]": "Ce module permet d'ouvrir des fichiers en association avec des applications externes.",
- "Description[gl]": "Este complemento permítelle abrir ficheiros cos aplicativos externos asociados.",
- "Description[it]": "Questa estensione permette di aprire i file con le relative applicazioni esterne.",
- "Description[nl]": "Deze plugin biedt u het openen van bestanden met geassocieerde externe toepassingen.",
- "Description[pl]": "Ta wtyczka umożliwia otwieranie plików, z którymi są powiązane zewnętrzne programy.",
- "Description[pt]": "Este 'plugin' permite abrir os ficheiros com as aplicações externas associadas.",
- "Description[pt_BR]": "Este plugin permite abrir os arquivos com os aplicativos externos associados.",
- "Description[sk]": "Tento plugin umožňuje otvoriť súbory s asociovanými externými aplikáciami.",
- "Description[sl]": "Vstavek omogoča odpiranje datotek v povezanih zunanjih programih.",
- "Description[sv]": "Insticksprogrammet tillåter att öppna filer med tillhörande externa program.",
- "Description[uk]": "За допомогою цього додатка ви зможете відкривати файли у пов’язаній з ними зовнішній програмі.",
- "Description[x-test]": "xxThis plugin allows one to open files with associated external applications.xx",
- "Icon": "document-open",
- "Id": "kdevopenwith",
- "License": "GPL",
- "Name": "Open With",
- "Name[ca@valencia]": "Obri amb",
- "Name[ca]": "Obre amb",
- "Name[cs]": "Otevřít pomocí",
- "Name[de]": "Öffnen mit",
- "Name[es]": "Abrir con",
- "Name[et]": "Avamine rakendusega",
- "Name[fi]": "Avaa ohjelmalla",
- "Name[fr]": "Ouvrir avec",
- "Name[gl]": "Abrir con",
- "Name[it]": "Apri con",
- "Name[nb]": "Åpne med",
- "Name[nl]": "Openen met",
- "Name[pl]": "Otwórz za pomocą",
- "Name[pt]": "Abrir Com",
- "Name[pt_BR]": "Abrir com",
- "Name[ru]": "Открыть с помощью",
- "Name[sk]": "Otvoriť s",
- "Name[sl]": "Odpri z",
- "Name[sv]": "Öppna med",
- "Name[uk]": "Відкриття у зовнішніх програмах",
- "Name[x-test]": "xxOpen Withxx",
- "Name[zh_CN]": "打开方式",
+ ],
+ "Category": "Core",
+ "Description": "This plugin allows one to open files with associated external applications.",
+ "Description[ca@valencia]": "Este connector permet obrir fitxers amb les aplicacions externes associades.",
+ "Description[ca]": "Aquest connector permet obrir fitxers amb les aplicacions externes associades.",
+ "Description[de]": "Mit diesem Modul können Dateien mit ihnen zugewiesenen externen Anwendungen gestartet werden.",
+ "Description[es]": "Este complemento permite abrir archivos con las aplicaciones externas asociadas.",
+ "Description[et]": "See plugin võimaldab avada väliste rakendustega seostatud faile.",
+ "Description[fi]": "Tämä liitännäinen mahdollistaa ulkoisiin sovelluksiin liitettyjen tiedostojen avaamisen.",
+ "Description[fr]": "Ce module permet d'ouvrir des fichiers en association avec des applications externes.",
+ "Description[gl]": "Este complemento permítelle abrir ficheiros cos aplicativos externos asociados.",
+ "Description[it]": "Questa estensione permette di aprire i file con le relative applicazioni esterne.",
+ "Description[nl]": "Deze plugin biedt u het openen van bestanden met geassocieerde externe toepassingen.",
+ "Description[pl]": "Ta wtyczka umożliwia otwieranie plików, z którymi są powiązane zewnętrzne programy.",
+ "Description[pt]": "Este 'plugin' permite abrir os ficheiros com as aplicações externas associadas.",
+ "Description[pt_BR]": "Este plugin permite abrir os arquivos com os aplicativos externos associados.",
+ "Description[sk]": "Tento plugin umožňuje otvoriť súbory s asociovanými externými aplikáciami.",
+ "Description[sl]": "Vstavek omogoča odpiranje datotek v povezanih zunanjih programih.",
+ "Description[sv]": "Insticksprogrammet tillåter att öppna filer med tillhörande externa program.",
+ "Description[uk]": "За допомогою цього додатка ви зможете відкривати файли у пов’язаній з ними зовнішній програмі.",
+ "Description[x-test]": "xxThis plugin allows one to open files with associated external applications.xx",
+ "Icon": "document-open",
+ "Id": "kdevopenwith",
+ "License": "GPL",
+ "Name": "Open With",
+ "Name[ca@valencia]": "Obri amb",
+ "Name[ca]": "Obre amb",
+ "Name[cs]": "Otevřít pomocí",
+ "Name[de]": "Öffnen mit",
+ "Name[es]": "Abrir con",
+ "Name[et]": "Avamine rakendusega",
+ "Name[fi]": "Avaa ohjelmalla",
+ "Name[fr]": "Ouvrir avec",
+ "Name[gl]": "Abrir con",
+ "Name[it]": "Apri con",
+ "Name[nb]": "Åpne med",
+ "Name[nl]": "Openen met",
+ "Name[pl]": "Otwórz za pomocą",
+ "Name[pt]": "Abrir Com",
+ "Name[pt_BR]": "Abrir com",
+ "Name[ru]": "Открыть с помощью",
+ "Name[sk]": "Otvoriť s",
+ "Name[sl]": "Odpri z",
+ "Name[sv]": "Öppna med",
+ "Name[uk]": "Відкриття у зовнішніх програмах",
+ "Name[x-test]": "xxOpen Withxx",
+ "Name[zh_CN]": "打开方式",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.IOpenWith"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/outlineview/kdevoutlineview.json kdevplatform-5.1.1/plugins/outlineview/kdevoutlineview.json
--- kdevplatform-5.1.0/plugins/outlineview/kdevoutlineview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/outlineview/kdevoutlineview.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,59 +2,59 @@
"KPlugin": {
"Authors": [
{
- "Email": "arichardson.kde@gmail.com",
- "Name": "Alex Richardson",
+ "Email": "arichardson.kde@gmail.com",
+ "Name": "Alex Richardson",
"Name[x-test]": "xxAlex Richardsonxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin provides a view to show the outline of the currently open document.",
- "Description[ca@valencia]": "Este connector proporciona una visualització que mostra una visió general del document obert actualment.",
- "Description[ca]": "Aquest connector proporciona una visualització que mostra una visió general del document obert actualment.",
- "Description[de]": "Dieses Modul zeigt eine Ansicht der Funktions-Kurzinfos im aktuell geöffneten Dokument.",
- "Description[es]": "Este complemento proporciona una vista para mostrar el boceto del documento actualmente abierto.",
- "Description[et]": "See plugin pakub parajasti avatud dokumendi struktuuri vaadet.",
- "Description[fi]": "Tämä liitännäinen tarjoaa näkymän, jossa näkyy tällä hetkellä avoimen tiedoston rakenne.",
- "Description[fr]": "Ce module fournit une vue pour afficher le plan du document ouvert",
- "Description[gl]": "Este complemento fornece unha vista para mostrar o esquema do documento actual.",
- "Description[it]": "Questa estensione fornisce una vista che mostra uno schema di massima del documento attualmente aperto.",
- "Description[nl]": "Deze plugin biedt zicht op de outline van het nu geopende document.",
- "Description[pl]": "Ta wtyczka dostarcza zarys obecnie otwartego dokumentu.",
- "Description[pt]": "Este 'plugin' oferece uma visão geral sobre o documento aberto de momento.",
- "Description[pt_BR]": "Este plugin fornece uma visão geral do documento que estiver aberto.",
- "Description[sk]": "Tento plugin poskytuje pohľad na zobrazenie obrysu aktuálne otvoreného dokumentu.",
- "Description[sl]": "Ta vstavek ponuja prikaz za oris trenutno odprtega dokumenta.",
- "Description[sv]": "Insticksprogrammet tillhandahåller en vy för att visa dispositionen av dokumentet som för närvarande är öppet.",
- "Description[uk]": "За допомогою цього додатка можна переглянути схему поточного відкритого документа.",
- "Description[x-test]": "xxThis plugin provides a view to show the outline of the currently open document.xx",
- "Description[zh_CN]": "此插件提供了一个当前显示当前打开文档的概要的视图。",
- "Icon": "code-class",
- "Id": "KDevOutlineView",
- "License": "LGPL",
- "Name": "Outline",
- "Name[ca@valencia]": "Visió general",
- "Name[ca]": "Visió general",
- "Name[cs]": "Obrys",
- "Name[de]": "Funktions-Kurzinfo",
- "Name[es]": "Boceto",
- "Name[et]": "Struktuur",
- "Name[fi]": "Rakenne",
- "Name[fr]": "Plan",
- "Name[gl]": "Esquema",
- "Name[it]": "Schema di massima",
- "Name[pl]": "Zarys",
- "Name[pt]": "Visão Geral",
- "Name[pt_BR]": "Contorno",
- "Name[sk]": "Obrys",
- "Name[sl]": "Oris",
- "Name[sv]": "Disposition",
- "Name[uk]": "Схема",
- "Name[x-test]": "xxOutlinexx",
- "Name[zh_CN]": "概要",
+ ],
+ "Category": "Core",
+ "Description": "This plugin provides a view to show the outline of the currently open document.",
+ "Description[ca@valencia]": "Este connector proporciona una visualització que mostra una visió general del document obert actualment.",
+ "Description[ca]": "Aquest connector proporciona una visualització que mostra una visió general del document obert actualment.",
+ "Description[de]": "Dieses Modul zeigt eine Ansicht der Funktions-Kurzinfos im aktuell geöffneten Dokument.",
+ "Description[es]": "Este complemento proporciona una vista para mostrar el boceto del documento actualmente abierto.",
+ "Description[et]": "See plugin pakub parajasti avatud dokumendi struktuuri vaadet.",
+ "Description[fi]": "Tämä liitännäinen tarjoaa näkymän, jossa näkyy tällä hetkellä avoimen tiedoston rakenne.",
+ "Description[fr]": "Ce module fournit une vue pour afficher le plan du document ouvert",
+ "Description[gl]": "Este complemento fornece unha vista para mostrar o esquema do documento actual.",
+ "Description[it]": "Questa estensione fornisce una vista che mostra uno schema di massima del documento attualmente aperto.",
+ "Description[nl]": "Deze plugin biedt zicht op de outline van het nu geopende document.",
+ "Description[pl]": "Ta wtyczka dostarcza zarys obecnie otwartego dokumentu.",
+ "Description[pt]": "Este 'plugin' oferece uma visão geral sobre o documento aberto de momento.",
+ "Description[pt_BR]": "Este plugin fornece uma visão geral do documento que estiver aberto.",
+ "Description[sk]": "Tento plugin poskytuje pohľad na zobrazenie obrysu aktuálne otvoreného dokumentu.",
+ "Description[sl]": "Ta vstavek ponuja prikaz za oris trenutno odprtega dokumenta.",
+ "Description[sv]": "Insticksprogrammet tillhandahåller en vy för att visa dispositionen av dokumentet som för närvarande är öppet.",
+ "Description[uk]": "За допомогою цього додатка можна переглянути схему поточного відкритого документа.",
+ "Description[x-test]": "xxThis plugin provides a view to show the outline of the currently open document.xx",
+ "Description[zh_CN]": "此插件提供了一个当前显示当前打开文档的概要的视图。",
+ "Icon": "code-class",
+ "Id": "KDevOutlineView",
+ "License": "LGPL",
+ "Name": "Outline",
+ "Name[ca@valencia]": "Visió general",
+ "Name[ca]": "Visió general",
+ "Name[cs]": "Obrys",
+ "Name[de]": "Funktions-Kurzinfo",
+ "Name[es]": "Boceto",
+ "Name[et]": "Struktuur",
+ "Name[fi]": "Rakenne",
+ "Name[fr]": "Plan",
+ "Name[gl]": "Esquema",
+ "Name[it]": "Schema di massima",
+ "Name[pl]": "Zarys",
+ "Name[pt]": "Visão Geral",
+ "Name[pt_BR]": "Contorno",
+ "Name[sk]": "Obrys",
+ "Name[sl]": "Oris",
+ "Name[sv]": "Disposition",
+ "Name[uk]": "Схема",
+ "Name[x-test]": "xxOutlinexx",
+ "Name[zh_CN]": "概要",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/patchreview/kdevpatchreview.json kdevplatform-5.1.1/plugins/patchreview/kdevpatchreview.json
--- kdevplatform-5.1.0/plugins/patchreview/kdevpatchreview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/patchreview/kdevpatchreview.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,70 +2,70 @@
"KPlugin": {
"Authors": [
{
- "Name": "David Nolden",
+ "Name": "David Nolden",
"Name[x-test]": "xxDavid Noldenxx"
}
- ],
- "Category": "Utilities",
- "Description": "This plugin allows reviewing patches directly in the editor.",
- "Description[ca@valencia]": "Este connector permet revisar pedaços directament en l'editor.",
- "Description[ca]": "Aquest connector permet revisar pedaços directament en l'editor.",
- "Description[de]": "Dieses Modul ermöglicht es, Patches direkt im Editor durchzusehen.",
- "Description[es]": "Este complemento permite la revisión de parches directamente en el editor.",
- "Description[et]": "See plugin võimaldab paiku üle vaadata otse redaktoris.",
- "Description[fi]": "Tämä liitännäinen salli korjausten katselmoinnin suoraan editorissa.",
- "Description[fr]": "Ce module permet de passer en revue des correctifs directement dans l'éditeur.",
- "Description[gl]": "Este complemento permite revisar parches directamente no editor.",
- "Description[it]": "Questa estensione permette di rivedere le patch direttamente nell'editor.",
- "Description[nl]": "Deze plugin laat patches herzien direct in de editor.",
- "Description[pl]": "Ta wtyczka pozwala na przeglądanie poprawek bezpośrednio w edytorze.",
- "Description[pt]": "Este 'plugin' permite a revisão das modificações directamente no editor.",
- "Description[pt_BR]": "Este plugin permite obter as modificações diretamente no editor.",
- "Description[sk]": "Tento plugin umožňuje zhodnotenie záplat priamo v editore.",
- "Description[sl]": "Vstavek omogoča pregled popravkov neposredno v urejevalniku.",
- "Description[sv]": "Insticksprogrammet gör det möjligt att direkt granska programfixar i editorn.",
- "Description[uk]": "За допомогою цього додатка ви зможете рецензувати латки безпосередньо у редакторі.",
- "Description[x-test]": "xxThis plugin allows reviewing patches directly in the editor.xx",
- "Description[zh_CN]": "此插件允许在编辑器中直接审阅补丁。",
- "Icon": "applications-engineering",
- "Id": "kdevpatchreview",
- "License": "GPL",
- "Name": "Patch Review",
- "Name[ca@valencia]": "Revisió del pedaç",
- "Name[ca]": "Revisió del pedaç",
- "Name[de]": "Patch-Durchsicht",
- "Name[es]": "Revisión de parches",
- "Name[et]": "Paikade läbivaatus",
- "Name[fi]": "Korjauksen katselmointi",
- "Name[fr]": "Revue de correction",
- "Name[gl]": "Revisor de parches",
- "Name[it]": "Revisione patch",
- "Name[nb]": "Lappegjennomgang",
- "Name[nl]": "Patchoverzicht",
- "Name[pl]": "Przeglądanie poprawek",
- "Name[pt]": "Revisão da Modificação",
- "Name[pt_BR]": "Revisão da modificação",
- "Name[ru]": "Рецензирование патчей",
- "Name[sk]": "Zhodnotenie záplaty",
- "Name[sl]": "Pregled popravkov",
- "Name[sv]": "Granska programfixar",
- "Name[uk]": "Рецензування латки",
- "Name[x-test]": "xxPatch Reviewxx",
- "Name[zh_CN]": "补丁审阅",
+ ],
+ "Category": "Utilities",
+ "Description": "This plugin allows reviewing patches directly in the editor.",
+ "Description[ca@valencia]": "Este connector permet revisar pedaços directament en l'editor.",
+ "Description[ca]": "Aquest connector permet revisar pedaços directament en l'editor.",
+ "Description[de]": "Dieses Modul ermöglicht es, Patches direkt im Editor durchzusehen.",
+ "Description[es]": "Este complemento permite la revisión de parches directamente en el editor.",
+ "Description[et]": "See plugin võimaldab paiku üle vaadata otse redaktoris.",
+ "Description[fi]": "Tämä liitännäinen salli korjausten katselmoinnin suoraan editorissa.",
+ "Description[fr]": "Ce module permet de passer en revue des correctifs directement dans l'éditeur.",
+ "Description[gl]": "Este complemento permite revisar parches directamente no editor.",
+ "Description[it]": "Questa estensione permette di rivedere le patch direttamente nell'editor.",
+ "Description[nl]": "Deze plugin laat patches herzien direct in de editor.",
+ "Description[pl]": "Ta wtyczka pozwala na przeglądanie poprawek bezpośrednio w edytorze.",
+ "Description[pt]": "Este 'plugin' permite a revisão das modificações directamente no editor.",
+ "Description[pt_BR]": "Este plugin permite obter as modificações diretamente no editor.",
+ "Description[sk]": "Tento plugin umožňuje zhodnotenie záplat priamo v editore.",
+ "Description[sl]": "Vstavek omogoča pregled popravkov neposredno v urejevalniku.",
+ "Description[sv]": "Insticksprogrammet gör det möjligt att direkt granska programfixar i editorn.",
+ "Description[uk]": "За допомогою цього додатка ви зможете рецензувати латки безпосередньо у редакторі.",
+ "Description[x-test]": "xxThis plugin allows reviewing patches directly in the editor.xx",
+ "Description[zh_CN]": "此插件允许在编辑器中直接审阅补丁。",
+ "Icon": "applications-engineering",
+ "Id": "kdevpatchreview",
+ "License": "GPL",
+ "Name": "Patch Review",
+ "Name[ca@valencia]": "Revisió del pedaç",
+ "Name[ca]": "Revisió del pedaç",
+ "Name[de]": "Patch-Durchsicht",
+ "Name[es]": "Revisión de parches",
+ "Name[et]": "Paikade läbivaatus",
+ "Name[fi]": "Korjauksen katselmointi",
+ "Name[fr]": "Revue de correction",
+ "Name[gl]": "Revisor de parches",
+ "Name[it]": "Revisione patch",
+ "Name[nb]": "Lappegjennomgang",
+ "Name[nl]": "Patchoverzicht",
+ "Name[pl]": "Przeglądanie poprawek",
+ "Name[pt]": "Revisão da Modificação",
+ "Name[pt_BR]": "Revisão da modificação",
+ "Name[ru]": "Рецензирование патчей",
+ "Name[sk]": "Zhodnotenie záplaty",
+ "Name[sl]": "Pregled popravkov",
+ "Name[sv]": "Granska programfixar",
+ "Name[uk]": "Рецензування латки",
+ "Name[x-test]": "xxPatch Reviewxx",
+ "Name[zh_CN]": "补丁审阅",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
+ },
"X-KDevelop-Interfaces": [
- "org.kdevelop.IPatchReview",
+ "org.kdevelop.IPatchReview",
"ILanguageSupport"
- ],
+ ],
"X-KDevelop-Languages": [
"Diff"
- ],
- "X-KDevelop-Mode": "GUI",
+ ],
+ "X-KDevelop-Mode": "GUI",
"X-KDevelop-SupportedMimeTypes": [
- "text/x-diff",
+ "text/x-diff",
"text/x-patch"
]
}
diff -Nru kdevplatform-5.1.0/plugins/patchreview/localpatchwidget.ui kdevplatform-5.1.1/plugins/patchreview/localpatchwidget.ui
--- kdevplatform-5.1.0/plugins/patchreview/localpatchwidget.ui 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/patchreview/localpatchwidget.ui 2017-05-13 10:12:21.000000000 +0000
@@ -11,6 +11,18 @@
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
diff -Nru kdevplatform-5.1.0/plugins/patchreview/patchreview.cpp kdevplatform-5.1.1/plugins/patchreview/patchreview.cpp
--- kdevplatform-5.1.0/plugins/patchreview/patchreview.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/patchreview/patchreview.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -249,7 +249,7 @@
patchFile = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
bool ret = KIO::copy(m_patch->file(), QUrl::fromLocalFile(patchFile), KIO::HideProgressInfo)->exec();
if( !ret ) {
- qWarning() << "Problem while downloading: " << m_patch->file() << "to" << patchFile;
+ qCWarning(PLUGIN_PATCHREVIEW) << "Problem while downloading: " << m_patch->file() << "to" << patchFile;
patchFile.clear();
}
}
diff -Nru kdevplatform-5.1.0/plugins/perforce/kdevperforce.json kdevplatform-5.1.1/plugins/perforce/kdevperforce.json
--- kdevplatform-5.1.0/plugins/perforce/kdevperforce.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/perforce/kdevperforce.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,45 +2,54 @@
"KPlugin": {
"Authors": [
{
- "Name": "Morten Danielsen Volden",
+ "Name": "Morten Danielsen Volden",
"Name[x-test]": "xxMorten Danielsen Voldenxx"
}
- ],
- "Category": "Version Control",
- "Description": "Provides Integration with Perforce Version Control System",
- "Description[ca@valencia]": "Proporciona integració amb el sistema de control de versions Perforce",
- "Description[ca]": "Proporciona integració amb el sistema de control de versions Perforce",
- "Description[cs]": "Poskytuje integraci Perforce Version Control System",
- "Description[es]": "Proporciona integración con el sistema de control de versiones Perforce",
- "Description[it]": "Fornisce l'integrazione con il sistema di controllo versione Perforce",
- "Description[nl]": "Biedt ondersteuning voor Perforce versiecontrolesysteem",
- "Description[pt]": "Oferece a Integração com o Sistema de Controlo de Versões Perforce",
- "Description[sv]": "Tillhandahåller integrering med Perforce versionskontrollsystem",
- "Description[uk]": "Забезпечує інтеграцію з системою керування версіями Perforce",
- "Description[x-test]": "xxProvides Integration with Perforce Version Control Systemxx",
- "Icon": "kdevelop",
- "Id": "kdevperforce",
- "License": "GPL",
- "Name": "Perforce Support",
- "Name[ca@valencia]": "Implementació del Perforce",
- "Name[ca]": "Implementació del Perforce",
- "Name[cs]": "Podpora Perforce",
- "Name[de]": "Perforce-Unterstützung",
- "Name[es]": "Implementación de Perforce",
- "Name[it]": "Supporto per Perforce",
- "Name[nl]": "Ondersteuning van Perforce",
- "Name[pt]": "Suporte para o Perforce",
- "Name[sv]": "Stöd för Perforce",
- "Name[uk]": "Підтримка Perforce",
- "Name[x-test]": "xxPerforce Supportxx",
+ ],
+ "Category": "Version Control",
+ "Description": "Provides Integration with Perforce Version Control System",
+ "Description[ca@valencia]": "Proporciona integració amb el sistema de control de versions Perforce",
+ "Description[ca]": "Proporciona integració amb el sistema de control de versions Perforce",
+ "Description[cs]": "Poskytuje integraci Perforce Version Control System",
+ "Description[de]": "Bietet Integration mit der Perforce-Versionsverwaltung",
+ "Description[es]": "Proporciona integración con el sistema de control de versiones Perforce",
+ "Description[fr]": "Fournit une intégration avec le système de contrôle de version Perforce",
+ "Description[it]": "Fornisce l'integrazione con il sistema di controllo versione Perforce",
+ "Description[nl]": "Biedt ondersteuning voor Perforce versiecontrolesysteem",
+ "Description[pl]": "Dostarcza integrację z systemem kontroli wersji Perforce",
+ "Description[pt]": "Oferece a Integração com o Sistema de Controlo de Versões Perforce",
+ "Description[sk]": "Poskytuje integráciu s verzionovacím systémom Perforce",
+ "Description[sl]": "Ponuja vgradnjo sistema za nadzor različic Perforce",
+ "Description[sv]": "Tillhandahåller integrering med Perforce versionskontrollsystem",
+ "Description[uk]": "Забезпечує інтеграцію з системою керування версіями Perforce",
+ "Description[x-test]": "xxProvides Integration with Perforce Version Control Systemxx",
+ "Icon": "kdevelop",
+ "Id": "kdevperforce",
+ "License": "GPL",
+ "Name": "Perforce Support",
+ "Name[ca@valencia]": "Implementació del Perforce",
+ "Name[ca]": "Implementació del Perforce",
+ "Name[cs]": "Podpora Perforce",
+ "Name[de]": "Perforce-Unterstützung",
+ "Name[es]": "Implementación de Perforce",
+ "Name[fr]": "Prise en charge de Perforce",
+ "Name[it]": "Supporto per Perforce",
+ "Name[nl]": "Ondersteuning van Perforce",
+ "Name[pl]": "Obsługa Perforce",
+ "Name[pt]": "Suporte para o Perforce",
+ "Name[sk]": "Podpora Perforce",
+ "Name[sl]": "Podpora za Perforce",
+ "Name[sv]": "Stöd för Perforce",
+ "Name[uk]": "Підтримка Perforce",
+ "Name[x-test]": "xxPerforce Supportxx",
"ServiceTypes": [
"KDevelop/Plugin"
- ],
+ ],
"Version": "5.0"
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-IRequired": [
"org.kdevelop.IExecutePlugin"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/problemreporter/kdevproblemreporter.json kdevplatform-5.1.1/plugins/problemreporter/kdevproblemreporter.json
--- kdevplatform-5.1.0/plugins/problemreporter/kdevproblemreporter.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/problemreporter/kdevproblemreporter.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,60 +2,60 @@
"KPlugin": {
"Authors": [
{
- "Name": "Hamish Rodda",
+ "Name": "Hamish Rodda",
"Name[x-test]": "xxHamish Roddaxx"
}
- ],
- "Category": "Utilities",
- "Description": "This plugin shows errors in source code.",
- "Description[ca@valencia]": "Este connector permet mostrar errors en el codi font.",
- "Description[ca]": "Aquest connector permet mostrar errors en el codi font.",
- "Description[de]": "Dieses Modul zeigt Fehler im Quelltext an.",
- "Description[es]": "Este complemento muestra errores en el código fuente.",
- "Description[et]": "See plugin näitab vigu lähtekoodis.",
- "Description[fi]": "Tämä liitännäinen näyttää virheet lähdekoodissa.",
- "Description[fr]": "Ce module affiche les erreurs dans le code source.",
- "Description[gl]": "Esta extensión mostra erros no código fonte.",
- "Description[it]": "Questa estensione mostra gli errori nel codice sorgente.",
- "Description[nl]": "Deze plugin toont fouten in broncode",
- "Description[pl]": "Ta wtyczka pokazuje błędy w kodzie źródłowym.",
- "Description[pt]": "Este 'plugin' mostra os erros no código-fonte.",
- "Description[pt_BR]": "Este plugin apresenta os erros no código-fonte.",
- "Description[sk]": "Tento plugin ukáže chyby v zdrojovom kóde.",
- "Description[sl]": "Vstavek prikazuje napake v izvorni kodi.",
- "Description[sv]": "Insticksprogrammet visar fel i källkod.",
- "Description[uk]": "За допомогою цього додатка можна переглянути повідомлення про помилки у коді.",
- "Description[x-test]": "xxThis plugin shows errors in source code.xx",
- "Description[zh_CN]": "此插件显示源代码中的错误。",
- "Icon": "emblem-important",
- "Id": "kdevproblemreporter",
- "License": "LGPL",
- "Name": "Problem Reporter View",
- "Name[ca@valencia]": "Vista del notificador de problemes",
- "Name[ca]": "Vista del notificador de problemes",
- "Name[de]": "Ansicht für Fehlerberichte",
- "Name[es]": "Vista del notificador de problemas",
- "Name[et]": "Probleemide teavitaja vaade",
- "Name[fi]": "Ongelmailmoitinnäkymä",
- "Name[fr]": "Vue rapporteur de problème",
- "Name[gl]": "Vista do relator de problemas",
- "Name[it]": "Vista segnalazione problemi",
- "Name[nb]": "Problemmeldervisning",
- "Name[nl]": "Probleemrapporteuroverzicht",
- "Name[pl]": "Widok raportów o problemach",
- "Name[pt]": "Área de Relatórios de Erros",
- "Name[pt_BR]": "Área do relatórios de erros",
- "Name[ru]": "Панель диагностики проблем",
- "Name[sk]": "Pohľad na zadávač problémov",
- "Name[sl]": "Prikaz poročevalca o težavah",
- "Name[sv]": "Problemrapporteringsvisning",
- "Name[uk]": "Перегляд інструмента звітування про проблеми",
- "Name[x-test]": "xxProblem Reporter Viewxx",
- "Name[zh_CN]": "错误汇报视图",
+ ],
+ "Category": "Utilities",
+ "Description": "This plugin shows errors in source code.",
+ "Description[ca@valencia]": "Este connector permet mostrar errors en el codi font.",
+ "Description[ca]": "Aquest connector permet mostrar errors en el codi font.",
+ "Description[de]": "Dieses Modul zeigt Fehler im Quelltext an.",
+ "Description[es]": "Este complemento muestra errores en el código fuente.",
+ "Description[et]": "See plugin näitab vigu lähtekoodis.",
+ "Description[fi]": "Tämä liitännäinen näyttää virheet lähdekoodissa.",
+ "Description[fr]": "Ce module affiche les erreurs dans le code source.",
+ "Description[gl]": "Esta extensión mostra erros no código fonte.",
+ "Description[it]": "Questa estensione mostra gli errori nel codice sorgente.",
+ "Description[nl]": "Deze plugin toont fouten in broncode",
+ "Description[pl]": "Ta wtyczka pokazuje błędy w kodzie źródłowym.",
+ "Description[pt]": "Este 'plugin' mostra os erros no código-fonte.",
+ "Description[pt_BR]": "Este plugin apresenta os erros no código-fonte.",
+ "Description[sk]": "Tento plugin ukáže chyby v zdrojovom kóde.",
+ "Description[sl]": "Vstavek prikazuje napake v izvorni kodi.",
+ "Description[sv]": "Insticksprogrammet visar fel i källkod.",
+ "Description[uk]": "За допомогою цього додатка можна переглянути повідомлення про помилки у коді.",
+ "Description[x-test]": "xxThis plugin shows errors in source code.xx",
+ "Description[zh_CN]": "此插件显示源代码中的错误。",
+ "Icon": "emblem-important",
+ "Id": "kdevproblemreporter",
+ "License": "LGPL",
+ "Name": "Problem Reporter View",
+ "Name[ca@valencia]": "Vista del notificador de problemes",
+ "Name[ca]": "Vista del notificador de problemes",
+ "Name[de]": "Ansicht für Fehlerberichte",
+ "Name[es]": "Vista del notificador de problemas",
+ "Name[et]": "Probleemide teavitaja vaade",
+ "Name[fi]": "Ongelmailmoitinnäkymä",
+ "Name[fr]": "Vue rapporteur de problème",
+ "Name[gl]": "Vista do relator de problemas",
+ "Name[it]": "Vista segnalazione problemi",
+ "Name[nb]": "Problemmeldervisning",
+ "Name[nl]": "Probleemrapporteuroverzicht",
+ "Name[pl]": "Widok raportów o problemach",
+ "Name[pt]": "Área de Relatórios de Erros",
+ "Name[pt_BR]": "Área do relatórios de erros",
+ "Name[ru]": "Панель диагностики проблем",
+ "Name[sk]": "Pohľad na zadávač problémov",
+ "Name[sl]": "Prikaz poročevalca o težavah",
+ "Name[sv]": "Problemrapporteringsvisning",
+ "Name[uk]": "Перегляд інструмента звітування про проблеми",
+ "Name[x-test]": "xxProblem Reporter Viewxx",
+ "Name[zh_CN]": "错误汇报视图",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/problemreporter/problemhighlighter.h kdevplatform-5.1.1/plugins/problemreporter/problemhighlighter.h
--- kdevplatform-5.1.0/plugins/problemreporter/problemhighlighter.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/problemreporter/problemhighlighter.h 2017-05-13 10:12:21.000000000 +0000
@@ -20,8 +20,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_PLUGIN_PROBLEM_HIGHLIGHT_H
-#define KDEVPLATFORM_PLUGIN_PROBLEM_HIGHLIGHT_H
+#ifndef KDEVPLATFORM_PLUGIN_PROBLEMHIGHLIGHTER_H
+#define KDEVPLATFORM_PLUGIN_PROBLEMHIGHLIGHTER_H
#include
#include
@@ -50,4 +50,4 @@
void settingsChanged();
};
-#endif // KDEVPLATFORM_PLUGIN_PROBLEM_HIGHLIGHT_H
+#endif // KDEVPLATFORM_PLUGIN_PROBLEMHIGHLIGHTER_H
diff -Nru kdevplatform-5.1.0/plugins/problemreporter/problemtreeview.h kdevplatform-5.1.1/plugins/problemreporter/problemtreeview.h
--- kdevplatform-5.1.0/plugins/problemreporter/problemtreeview.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/problemreporter/problemtreeview.h 2017-05-13 10:12:21.000000000 +0000
@@ -19,8 +19,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_PLUGIN_PROBLEMWIDGET_H
-#define KDEVPLATFORM_PLUGIN_PROBLEMWIDGET_H
+#ifndef KDEVPLATFORM_PLUGIN_PROBLEMTREEVIEW_H
+#define KDEVPLATFORM_PLUGIN_PROBLEMTREEVIEW_H
#include
diff -Nru kdevplatform-5.1.0/plugins/projectfilter/kdevprojectfilter.json kdevplatform-5.1.1/plugins/projectfilter/kdevprojectfilter.json
--- kdevplatform-5.1.0/plugins/projectfilter/kdevprojectfilter.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/projectfilter/kdevprojectfilter.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,64 +2,64 @@
"KPlugin": {
"Authors": [
{
- "Name": "Milian Wolff",
+ "Name": "Milian Wolff",
"Name[x-test]": "xxMilian Wolffxx"
}
- ],
- "Category": "Project Management",
- "Description": "Configure which files and folders inside the project folder should be included or excluded.",
- "Description[ca@valencia]": "Configura quins fitxers i carpetes dins de la carpeta del projecte s'han d'incloure o excloure.",
- "Description[ca]": "Configura quins fitxers i carpetes dins de la carpeta del projecte s'han d'incloure o excloure.",
- "Description[de]": "Legt fest, welche Dateien und Ordner innerhalb des Projektordners ein- oder ausgeschlossen werden sollen.",
- "Description[es]": "Configurar los archivos y carpetas que pertenecen a la carpeta del proyecto y que deben ser incluidos o excluidos.",
- "Description[et]": "Määramine, millised projektikataloogi failid ja kataloogid kaasata või välja jätta.",
- "Description[fi]": "Valitse, mitkä projektikansiossa olevat tiedostot ja kansiot pitäisi ottaa mukaan ja mitkä pitäisi jättää pois.",
- "Description[fr]": "Configurer quels fichiers et dossiers à l'intérieur du dossier projet doivent être inclus ou exclus.",
- "Description[gl]": "Configurar cales ficheiros e cartafoles dentro do cartafol do proxecto deben incluírse ou excluírse.",
- "Description[it]": "Configura quali file e cartelle nella cartella del progetto devono essere incluse o escluse.",
- "Description[nl]": "Stel in welke bestanden en mappen in de projectmap meegenomen of uitgesloten moeten worden.",
- "Description[pl]": "Ustaw jakie pliki i katalogi wewnątrz katalogu projektu mają być uwzględniane albo wykluczane.",
- "Description[pt]": "Configurar os ficheiros ou pastas, dentro da pasta do projecto, que deverão ser incluídos ou excluídos.",
- "Description[pt_BR]": "Configura os arquivos e pastas, dentro da pasta do projeto, que devem ser incluídos ou excluídos.",
- "Description[sk]": "Nastaviť, ktoré súbory a priečinky v priečinku projektu majú byť zahrnuté alebo vylúčené.",
- "Description[sl]": "Nastavi katere datoteke in mape znotraj mape projekta naj bodo vključene ali izključene.",
- "Description[sv]": "Anpassa vilka filer och kataloger inne i projektkatalogen som ska inkluderas eller exkluderas.",
- "Description[uk]": "За допомогою цього модуля можна визначити, які файли і теки у теці проекту має бути включено або виключено з його складу.",
- "Description[x-test]": "xxConfigure which files and folders inside the project folder should be included or excluded.xx",
- "Description[zh_CN]": "配置项目文件中哪些文件被加入或排除。",
- "Icon": "view-filter",
- "Id": "KDevProjectFilter",
- "Name": "Project Filter",
- "Name[ca@valencia]": "Filtre de projecte",
- "Name[ca]": "Filtre de projecte",
- "Name[cs]": "Filtr projektů",
- "Name[de]": "Projektfilter",
- "Name[es]": "Filtro del proyecto",
- "Name[et]": "Projektifilter",
- "Name[fi]": "Projektisuodatin",
- "Name[fr]": "Filtre de projet",
- "Name[gl]": "Filtro do proxecto",
- "Name[it]": "Filtro progetto",
- "Name[nb]": "Prosjektfilter",
- "Name[nl]": "Projectfilter",
- "Name[pl]": "Filtr projektu",
- "Name[pt]": "Filtro de Projectos",
- "Name[pt_BR]": "Filtro de projetos",
- "Name[ru]": "Фильтр проекта",
- "Name[sk]": "Filter projektu",
- "Name[sl]": "Filter projektov",
- "Name[sv]": "Projektfilter",
- "Name[uk]": "Фільтр проекту",
- "Name[x-test]": "xxProject Filterxx",
- "Name[zh_CN]": "项目过滤器",
+ ],
+ "Category": "Project Management",
+ "Description": "Configure which files and folders inside the project folder should be included or excluded.",
+ "Description[ca@valencia]": "Configura quins fitxers i carpetes dins de la carpeta del projecte s'han d'incloure o excloure.",
+ "Description[ca]": "Configura quins fitxers i carpetes dins de la carpeta del projecte s'han d'incloure o excloure.",
+ "Description[de]": "Legt fest, welche Dateien und Ordner innerhalb des Projektordners ein- oder ausgeschlossen werden sollen.",
+ "Description[es]": "Configurar los archivos y carpetas que pertenecen a la carpeta del proyecto y que deben ser incluidos o excluidos.",
+ "Description[et]": "Määramine, millised projektikataloogi failid ja kataloogid kaasata või välja jätta.",
+ "Description[fi]": "Valitse, mitkä projektikansiossa olevat tiedostot ja kansiot pitäisi ottaa mukaan ja mitkä pitäisi jättää pois.",
+ "Description[fr]": "Configurer quels fichiers et dossiers à l'intérieur du dossier projet doivent être inclus ou exclus.",
+ "Description[gl]": "Configurar cales ficheiros e cartafoles dentro do cartafol do proxecto deben incluírse ou excluírse.",
+ "Description[it]": "Configura quali file e cartelle nella cartella del progetto devono essere incluse o escluse.",
+ "Description[nl]": "Stel in welke bestanden en mappen in de projectmap meegenomen of uitgesloten moeten worden.",
+ "Description[pl]": "Ustaw jakie pliki i katalogi wewnątrz katalogu projektu mają być uwzględniane albo wykluczane.",
+ "Description[pt]": "Configurar os ficheiros ou pastas, dentro da pasta do projecto, que deverão ser incluídos ou excluídos.",
+ "Description[pt_BR]": "Configura os arquivos e pastas, dentro da pasta do projeto, que devem ser incluídos ou excluídos.",
+ "Description[sk]": "Nastaviť, ktoré súbory a priečinky v priečinku projektu majú byť zahrnuté alebo vylúčené.",
+ "Description[sl]": "Nastavi katere datoteke in mape znotraj mape projekta naj bodo vključene ali izključene.",
+ "Description[sv]": "Anpassa vilka filer och kataloger inne i projektkatalogen som ska inkluderas eller exkluderas.",
+ "Description[uk]": "За допомогою цього модуля можна визначити, які файли і теки у теці проекту має бути включено або виключено з його складу.",
+ "Description[x-test]": "xxConfigure which files and folders inside the project folder should be included or excluded.xx",
+ "Description[zh_CN]": "配置项目文件中哪些文件被加入或排除。",
+ "Icon": "view-filter",
+ "Id": "KDevProjectFilter",
+ "Name": "Project Filter",
+ "Name[ca@valencia]": "Filtre de projecte",
+ "Name[ca]": "Filtre de projecte",
+ "Name[cs]": "Filtr projektů",
+ "Name[de]": "Projektfilter",
+ "Name[es]": "Filtro del proyecto",
+ "Name[et]": "Projektifilter",
+ "Name[fi]": "Projektisuodatin",
+ "Name[fr]": "Filtre de projet",
+ "Name[gl]": "Filtro do proxecto",
+ "Name[it]": "Filtro progetto",
+ "Name[nb]": "Prosjektfilter",
+ "Name[nl]": "Projectfilter",
+ "Name[pl]": "Filtr projektu",
+ "Name[pt]": "Filtro de Projectos",
+ "Name[pt_BR]": "Filtro de projetos",
+ "Name[ru]": "Фильтр проекта",
+ "Name[sk]": "Filter projektu",
+ "Name[sl]": "Filter projektov",
+ "Name[sv]": "Projektfilter",
+ "Name[uk]": "Фільтр проекту",
+ "Name[x-test]": "xxProject Filterxx",
+ "Name[zh_CN]": "项目过滤器",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Project",
+ },
+ "X-KDevelop-Category": "Project",
"X-KDevelop-Interfaces": [
"org.kdevelop.IProjectFilter"
- ],
- "X-KDevelop-LoadMode": "AlwaysOn",
+ ],
+ "X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/projectmanagerview/kdevprojectmanagerview.json kdevplatform-5.1.1/plugins/projectmanagerview/kdevprojectmanagerview.json
--- kdevplatform-5.1.0/plugins/projectmanagerview/kdevprojectmanagerview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/projectmanagerview/kdevprojectmanagerview.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,60 +2,60 @@
"KPlugin": {
"Authors": [
{
- "Name": "Roberto Raggi",
+ "Name": "Roberto Raggi",
"Name[x-test]": "xxRoberto Raggixx"
}
- ],
- "Category": "Core",
- "Description": "Lets you manage the project contents.",
- "Description[ca@valencia]": "Vos permet gestionar els continguts del projecte.",
- "Description[ca]": "Us permet gestionar els continguts del projecte.",
- "Description[de]": "Lässt Sie den Inhalt Ihres Projekts verwalten.",
- "Description[es]": "Le permite gestionar el contenido del proyecto.",
- "Description[et]": "Projektide sisu haldamine.",
- "Description[fi]": "Mahdollistaa projektien sisällön hallinnan.",
- "Description[fr]": "Vous laisse gérer le contenu du projet.",
- "Description[gl]": "Permítelle xestionar os contidos do proxecto.",
- "Description[it]": "Consente di gestire il contenuto del progetto.",
- "Description[nl]": "Laat u de projectinhoud beheren.",
- "Description[pl]": "Pozwala tobie na zarządzanie zawartością projektu.",
- "Description[pt]": "Permite-lhe gerir o conteúdo do projecto.",
- "Description[pt_BR]": "Permite-lhe gerenciar o conteúdo do projeto.",
- "Description[sk]": "Umožní vám spravovať obsah projektu.",
- "Description[sl]": "Pomaga vam upravljati z vsebino projekta.",
- "Description[sv]": "Låter dig hantera projektets innehåll.",
- "Description[uk]": "Надає вам змогу керувати вмістом проектів.",
- "Description[x-test]": "xxLets you manage the project contents.xx",
- "Description[zh_CN]": "让您管理项目内容。",
- "Icon": "kdevelop",
- "Id": "KDevProjectManagerView",
- "License": "LGPL",
- "Name": "Project Manager View",
- "Name[ca@valencia]": "Vista del gestor de projectes",
- "Name[ca]": "Vista del gestor de projectes",
- "Name[de]": "Ansicht für Projektverwaltung",
- "Name[es]": "Vista del gestor de proyectos",
- "Name[et]": "Projektihalduri vaade",
- "Name[fi]": "Projektinhallintanäkymä",
- "Name[fr]": "Vue gestionnaire de projet",
- "Name[gl]": "Vista do xestor de proxectos",
- "Name[it]": "Vista gestore progetto",
- "Name[nb]": "Prosjektbehandlervisning",
- "Name[nl]": "Projectbeheerder-overzicht",
- "Name[pl]": "Widok zarządzania projektem",
- "Name[pt]": "Área do Gestor de Projectos",
- "Name[pt_BR]": "Visualizador do gerenciador de projeto",
- "Name[ru]": "Панель управления проектами",
- "Name[sk]": "Pohľad na správcu projektu",
- "Name[sl]": "Prikaz upravljalnika projektov",
- "Name[sv]": "Projekthanteringsvisning",
- "Name[uk]": "Перегляд керування проектами",
- "Name[x-test]": "xxProject Manager Viewxx",
- "Name[zh_CN]": "工程管理器视图",
+ ],
+ "Category": "Core",
+ "Description": "Lets you manage the project contents.",
+ "Description[ca@valencia]": "Vos permet gestionar els continguts del projecte.",
+ "Description[ca]": "Us permet gestionar els continguts del projecte.",
+ "Description[de]": "Lässt Sie den Inhalt Ihres Projekts verwalten.",
+ "Description[es]": "Le permite gestionar el contenido del proyecto.",
+ "Description[et]": "Projektide sisu haldamine.",
+ "Description[fi]": "Mahdollistaa projektien sisällön hallinnan.",
+ "Description[fr]": "Vous laisse gérer le contenu du projet.",
+ "Description[gl]": "Permítelle xestionar os contidos do proxecto.",
+ "Description[it]": "Consente di gestire il contenuto del progetto.",
+ "Description[nl]": "Laat u de projectinhoud beheren.",
+ "Description[pl]": "Pozwala tobie na zarządzanie zawartością projektu.",
+ "Description[pt]": "Permite-lhe gerir o conteúdo do projecto.",
+ "Description[pt_BR]": "Permite-lhe gerenciar o conteúdo do projeto.",
+ "Description[sk]": "Umožní vám spravovať obsah projektu.",
+ "Description[sl]": "Pomaga vam upravljati z vsebino projekta.",
+ "Description[sv]": "Låter dig hantera projektets innehåll.",
+ "Description[uk]": "Надає вам змогу керувати вмістом проектів.",
+ "Description[x-test]": "xxLets you manage the project contents.xx",
+ "Description[zh_CN]": "让您管理项目内容。",
+ "Icon": "kdevelop",
+ "Id": "KDevProjectManagerView",
+ "License": "LGPL",
+ "Name": "Project Manager View",
+ "Name[ca@valencia]": "Vista del gestor de projectes",
+ "Name[ca]": "Vista del gestor de projectes",
+ "Name[de]": "Ansicht für Projektverwaltung",
+ "Name[es]": "Vista del gestor de proyectos",
+ "Name[et]": "Projektihalduri vaade",
+ "Name[fi]": "Projektinhallintanäkymä",
+ "Name[fr]": "Vue gestionnaire de projet",
+ "Name[gl]": "Vista do xestor de proxectos",
+ "Name[it]": "Vista gestore progetto",
+ "Name[nb]": "Prosjektbehandlervisning",
+ "Name[nl]": "Projectbeheerder-overzicht",
+ "Name[pl]": "Widok zarządzania projektem",
+ "Name[pt]": "Área do Gestor de Projectos",
+ "Name[pt_BR]": "Visualizador do gerenciador de projeto",
+ "Name[ru]": "Панель управления проектами",
+ "Name[sk]": "Pohľad na správcu projektu",
+ "Name[sl]": "Prikaz upravljalnika projektov",
+ "Name[sv]": "Projekthanteringsvisning",
+ "Name[uk]": "Перегляд керування проектами",
+ "Name[x-test]": "xxProject Manager Viewxx",
+ "Name[zh_CN]": "工程管理器视图",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/projectmanagerview/projectmanagerviewplugin.cpp kdevplatform-5.1.1/plugins/projectmanagerview/projectmanagerviewplugin.cpp
--- kdevplatform-5.1.0/plugins/projectmanagerview/projectmanagerviewplugin.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/projectmanagerview/projectmanagerviewplugin.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -241,61 +241,61 @@
}
if ( needsCreateFile ) {
- QAction* action = new QAction( i18n( "Create File..." ), this );
+ QAction* action = new QAction( i18n( "Create &File..." ), this );
action->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::createFileFromContextMenu );
menuExt.addAction( ContextMenuExtension::FileGroup, action );
}
if ( needsCreateFolder ) {
- QAction* action = new QAction( i18n( "Create Folder..." ), this );
+ QAction* action = new QAction( i18n( "Create F&older..." ), this );
action->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::createFolderFromContextMenu );
menuExt.addAction( ContextMenuExtension::FileGroup, action );
}
if ( needsBuildItems ) {
- QAction* action = new QAction( i18nc( "@action", "Build" ), this );
+ QAction* action = new QAction( i18nc( "@action", "&Build" ), this );
action->setIcon(QIcon::fromTheme(QStringLiteral("run-build")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::buildItemsFromContextMenu );
menuExt.addAction( ContextMenuExtension::BuildGroup, action );
- action = new QAction( i18nc( "@action", "Install" ), this );
- action->setIcon(QIcon::fromTheme(QStringLiteral("run-install")));
+ action = new QAction( i18nc( "@action", "&Install" ), this );
+ action->setIcon(QIcon::fromTheme(QStringLiteral("run-build-install")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::installItemsFromContextMenu );
menuExt.addAction( ContextMenuExtension::BuildGroup, action );
- action = new QAction( i18nc( "@action", "Clean" ), this );
- action->setIcon(QIcon::fromTheme(QStringLiteral("run-clean")));
+ action = new QAction( i18nc( "@action", "&Clean" ), this );
+ action->setIcon(QIcon::fromTheme(QStringLiteral("run-build-clean")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::cleanItemsFromContextMenu );
menuExt.addAction( ContextMenuExtension::BuildGroup, action );
- action = new QAction( i18n( "Add to Build Set" ), this );
+ action = new QAction( i18n( "&Add to Build Set" ), this );
action->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::addItemsFromContextMenuToBuildset );
menuExt.addAction( ContextMenuExtension::BuildGroup, action );
}
if ( needsCloseProjects ) {
- QAction* close = new QAction( i18np( "Close Project", "Close Projects", items.count() ), this );
+ QAction* close = new QAction( i18np( "C&lose Project", "Close Projects", items.count() ), this );
close->setIcon(QIcon::fromTheme(QStringLiteral("project-development-close")));
connect( close, &QAction::triggered, this, &ProjectManagerViewPlugin::closeProjects );
menuExt.addAction( ContextMenuExtension::ProjectGroup, close );
}
if ( needsFolderItems ) {
- QAction* action = new QAction( i18n( "Reload" ), this );
+ QAction* action = new QAction( i18n( "&Reload" ), this );
action->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
connect( action, &QAction::triggered, this, &ProjectManagerViewPlugin::reloadFromContextMenu );
menuExt.addAction( ContextMenuExtension::FileGroup, action );
}
if ( needsRemoveAndRename ) {
- QAction* remove = new QAction( i18n( "Remove" ), this );
+ QAction* remove = new QAction( i18n( "Remo&ve" ), this );
remove->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
connect( remove, &QAction::triggered, this, &ProjectManagerViewPlugin::removeFromContextMenu );
menuExt.addAction( ContextMenuExtension::FileGroup, remove );
- QAction* rename = new QAction( i18n( "Rename..." ), this );
+ QAction* rename = new QAction( i18n( "Re&name..." ), this );
rename->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
connect( rename, &QAction::triggered, this, &ProjectManagerViewPlugin::renameItemFromContextMenu );
menuExt.addAction( ContextMenuExtension::FileGroup, rename );
}
if ( needsRemoveTargetFiles ) {
- QAction* remove = new QAction( i18n( "Remove From Target" ), this );
+ QAction* remove = new QAction( i18n( "Remove From &Target" ), this );
remove->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
connect( remove, &QAction::triggered, this, &ProjectManagerViewPlugin::removeTargetFilesFromContextMenu );
menuExt.addAction( ContextMenuExtension::FileGroup, remove );
diff -Nru kdevplatform-5.1.0/plugins/quickopen/actionsquickopenprovider.h kdevplatform-5.1.1/plugins/quickopen/actionsquickopenprovider.h
--- kdevplatform-5.1.0/plugins/quickopen/actionsquickopenprovider.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/quickopen/actionsquickopenprovider.h 2017-05-13 10:12:21.000000000 +0000
@@ -19,8 +19,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_PLUGIN_ACTIONSPROVIDER_H
-#define KDEVPLATFORM_PLUGIN_ACTIONSPROVIDER_H
+#ifndef KDEVPLATFORM_PLUGIN_ACTIONSQUICKOPENPROVIDER_H
+#define KDEVPLATFORM_PLUGIN_ACTIONSQUICKOPENPROVIDER_H
#include
#include
@@ -41,4 +41,4 @@
QVector m_results;
};
-#endif // KDEVPLATFORM_PLUGIN_ACTIONSPROVIDER_H
+#endif // KDEVPLATFORM_PLUGIN_ACTIONSQUICKOPENPROVIDER_H
diff -Nru kdevplatform-5.1.0/plugins/quickopen/expandingtree/expandingdelegate.cpp kdevplatform-5.1.1/plugins/quickopen/expandingtree/expandingdelegate.cpp
--- kdevplatform-5.1.0/plugins/quickopen/expandingtree/expandingdelegate.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/quickopen/expandingtree/expandingdelegate.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -325,7 +325,7 @@
for (int i = 0; i + 2 < customHighlights.count(); i += 3) {
if (!customHighlights[i].canConvert(QVariant::Int) || !customHighlights[i+1].canConvert(QVariant::Int) || !customHighlights[i+2].canConvert()) {
- qWarning() << "Unable to convert triple to custom formatting.";
+ qCWarning(PLUGIN_QUICKOPEN) << "Unable to convert triple to custom formatting.";
continue;
}
@@ -335,7 +335,7 @@
format.format = customHighlights[i+2].value().toCharFormat();
if(!format.format.isValid())
- qWarning() << "Format is not valid";
+ qCWarning(PLUGIN_QUICKOPEN) << "Format is not valid";
ret << format;
}
diff -Nru kdevplatform-5.1.0/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp kdevplatform-5.1.1/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
--- kdevplatform-5.1.0/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -468,7 +468,7 @@
for(int a = 0; a < 2; a++) {
++testIt;
if(testIt == right.constEnd()) {
- qWarning() << "Length of input is not multiple of 3";
+ qCWarning(PLUGIN_QUICKOPEN) << "Length of input is not multiple of 3";
break;
}
}
@@ -491,17 +491,17 @@
QList mergeCustomHighlighting( QStringList strings, QList highlights, int grapBetweenStrings )
{
if(strings.isEmpty()) {
- qWarning() << "List of strings is empty";
+ qCWarning(PLUGIN_QUICKOPEN) << "List of strings is empty";
return QList();
}
if(highlights.isEmpty()) {
- qWarning() << "List of highlightings is empty";
+ qCWarning(PLUGIN_QUICKOPEN) << "List of highlightings is empty";
return QList();
}
if(strings.count() != highlights.count()) {
- qWarning() << "Length of string-list is " << strings.count() << " while count of highlightings is " << highlights.count() << ", should be same";
+ qCWarning(PLUGIN_QUICKOPEN) << "Length of string-list is " << strings.count() << " while count of highlightings is " << highlights.count() << ", should be same";
return QList();
}
diff -Nru kdevplatform-5.1.0/plugins/quickopen/kdevquickopen.json kdevplatform-5.1.1/plugins/quickopen/kdevquickopen.json
--- kdevplatform-5.1.0/plugins/quickopen/kdevquickopen.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/quickopen/kdevquickopen.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,64 +2,64 @@
"KPlugin": {
"Authors": [
{
- "Name": "David Nolden",
+ "Name": "David Nolden",
"Name[x-test]": "xxDavid Noldenxx"
}
- ],
- "Category": "Core",
- "Description": "This plugin allows quick access to project files and language-items like classes/functions.",
- "Description[ca@valencia]": "Este connector permet un ràpid accés als fitxers del projecte i a elements del llenguatge com classes/funcions.",
- "Description[ca]": "Aquest connector permet un ràpid accés als fitxers del projecte i a elements del llenguatge com classes/funcions.",
- "Description[de]": "Dieses Modul bietet schnellen Zugriff auf Projektdateien und Sprachelemente wie Klassen und Funktionen.",
- "Description[es]": "Este complemento permite acceder rápidamente a los archivos del proyecto y a elementos del lenguaje, como clases y funciones.",
- "Description[et]": "See plugin pakub kiiret ligipääsu projekti failidele ja keele elementidele, näiteks klassidele ja funktsioonidele.",
- "Description[fi]": "Tämä liitännäinen mahdollistaa projektitiedostojen nopean haun ja kielialkiot kuten luokat/funktiot.",
- "Description[fr]": "Ce module permet un accès rapide aux fichiers du projet et aux éléments de langage comme les classes / fonctions.",
- "Description[gl]": "Este complemento permite acceder rapidamente a ficheiros de proxecto e elementos da linguaxe como clases e funcións.",
- "Description[it]": "Questa estensione permette di accedere rapidamente ai file di progetto e agli elementi del linguaggio come le classi/funzioni.",
- "Description[nl]": "Deze plugin biedt snel toegamg tot projectbestanden en taal-items zoals classes/functies.",
- "Description[pl]": "Ta wtyczka pozwala na szybki dostęp do plików projektu i elementów języka takich jak klasy i funkcje.",
- "Description[pt]": "Este 'plugin' permite o acesso rápido aos ficheiros dos projectos e aos itens das linguagens, como as classes ou funções.",
- "Description[pt_BR]": "Este plugin permite o rápido acesso a arquivos de projeto e itens da linguagem como classes/funções.",
- "Description[sk]": "Tento plugin umožňuje rýchly prístup k súborom projektu a položiek jazyka ako triedy/funkcie.",
- "Description[sl]": "Vstavek omogoča hiter dostop do projektnih datotek in predmetov kot so razredi in funkcije.",
- "Description[sv]": "Insticksprogrammet ger snabb åtkomst av projektfiler och språkobjekt som klasser och funktioner.",
- "Description[uk]": "За допомогою цього додатка можна пришвидшити доступ до файлів проектів і елементів мови на зразок класів або функцій.",
- "Description[x-test]": "xxThis plugin allows quick access to project files and language-items like classes/functions.xx",
- "Description[zh_CN]": "此插件允许快速访问工程文件和诸如类/函数的语言项目。",
- "Icon": "quickopen",
- "Id": "kdevquickopen",
- "License": "GPL",
- "Name": "Quick Open",
- "Name[ca@valencia]": "Obertura ràpida",
- "Name[ca]": "Obertura ràpida",
- "Name[cs]": "Rychle otevřít",
- "Name[de]": "Schnellöffner",
- "Name[es]": "Apertura rápida",
- "Name[et]": "Kiiravamine",
- "Name[fi]": "Pika-avaus",
- "Name[fr]": "Ouverture rapide",
- "Name[gl]": "Apertura rápida",
- "Name[it]": "Apertura veloce",
- "Name[nb]": "Hurtigåpne",
- "Name[nl]": "Snel openen",
- "Name[pl]": "Szybkie otwarcie",
- "Name[pt]": "Abertura Rápida",
- "Name[pt_BR]": "Abertura rápida",
- "Name[ru]": "Быстрый переход",
- "Name[sk]": "Rýchlo otvoriť",
- "Name[sl]": "Hitro odpiranje",
- "Name[sv]": "Snabböppna",
- "Name[uk]": "Швидке відкриття",
- "Name[x-test]": "xxQuick Openxx",
- "Name[zh_CN]": "快速打开",
+ ],
+ "Category": "Core",
+ "Description": "This plugin allows quick access to project files and language-items like classes/functions.",
+ "Description[ca@valencia]": "Este connector permet un ràpid accés als fitxers del projecte i a elements del llenguatge com classes/funcions.",
+ "Description[ca]": "Aquest connector permet un ràpid accés als fitxers del projecte i a elements del llenguatge com classes/funcions.",
+ "Description[de]": "Dieses Modul bietet schnellen Zugriff auf Projektdateien und Sprachelemente wie Klassen und Funktionen.",
+ "Description[es]": "Este complemento permite acceder rápidamente a los archivos del proyecto y a elementos del lenguaje, como clases y funciones.",
+ "Description[et]": "See plugin pakub kiiret ligipääsu projekti failidele ja keele elementidele, näiteks klassidele ja funktsioonidele.",
+ "Description[fi]": "Tämä liitännäinen mahdollistaa projektitiedostojen nopean haun ja kielialkiot kuten luokat/funktiot.",
+ "Description[fr]": "Ce module permet un accès rapide aux fichiers du projet et aux éléments de langage comme les classes / fonctions.",
+ "Description[gl]": "Este complemento permite acceder rapidamente a ficheiros de proxecto e elementos da linguaxe como clases e funcións.",
+ "Description[it]": "Questa estensione permette di accedere rapidamente ai file di progetto e agli elementi del linguaggio come le classi/funzioni.",
+ "Description[nl]": "Deze plugin biedt snel toegamg tot projectbestanden en taal-items zoals classes/functies.",
+ "Description[pl]": "Ta wtyczka pozwala na szybki dostęp do plików projektu i elementów języka takich jak klasy i funkcje.",
+ "Description[pt]": "Este 'plugin' permite o acesso rápido aos ficheiros dos projectos e aos itens das linguagens, como as classes ou funções.",
+ "Description[pt_BR]": "Este plugin permite o rápido acesso a arquivos de projeto e itens da linguagem como classes/funções.",
+ "Description[sk]": "Tento plugin umožňuje rýchly prístup k súborom projektu a položiek jazyka ako triedy/funkcie.",
+ "Description[sl]": "Vstavek omogoča hiter dostop do projektnih datotek in predmetov kot so razredi in funkcije.",
+ "Description[sv]": "Insticksprogrammet ger snabb åtkomst av projektfiler och språkobjekt som klasser och funktioner.",
+ "Description[uk]": "За допомогою цього додатка можна пришвидшити доступ до файлів проектів і елементів мови на зразок класів або функцій.",
+ "Description[x-test]": "xxThis plugin allows quick access to project files and language-items like classes/functions.xx",
+ "Description[zh_CN]": "此插件允许快速访问工程文件和诸如类/函数的语言项目。",
+ "Icon": "quickopen",
+ "Id": "kdevquickopen",
+ "License": "GPL",
+ "Name": "Quick Open",
+ "Name[ca@valencia]": "Obertura ràpida",
+ "Name[ca]": "Obertura ràpida",
+ "Name[cs]": "Rychle otevřít",
+ "Name[de]": "Schnellöffner",
+ "Name[es]": "Apertura rápida",
+ "Name[et]": "Kiiravamine",
+ "Name[fi]": "Pika-avaus",
+ "Name[fr]": "Ouverture rapide",
+ "Name[gl]": "Apertura rápida",
+ "Name[it]": "Apertura veloce",
+ "Name[nb]": "Hurtigåpne",
+ "Name[nl]": "Snel openen",
+ "Name[pl]": "Szybkie otwarcie",
+ "Name[pt]": "Abertura Rápida",
+ "Name[pt_BR]": "Abertura rápida",
+ "Name[ru]": "Быстрый переход",
+ "Name[sk]": "Rýchlo otvoriť",
+ "Name[sl]": "Hitro odpiranje",
+ "Name[sv]": "Snabböppna",
+ "Name[uk]": "Швидке відкриття",
+ "Name[x-test]": "xxQuick Openxx",
+ "Name[zh_CN]": "快速打开",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Interfaces": [
"org.kdevelop.IQuickOpen"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/quickopen/quickopenmodel.cpp kdevplatform-5.1.1/plugins/quickopen/quickopenmodel.cpp
--- kdevplatform-5.1.0/plugins/quickopen/quickopenmodel.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/quickopen/quickopenmodel.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -434,7 +434,7 @@
{
qCDebug(PLUGIN_QUICKOPEN) << "executing model";
if( !index.isValid() ) {
- qWarning() << "Invalid index executed";
+ qCWarning(PLUGIN_QUICKOPEN) << "Invalid index executed";
return false;
}
@@ -443,7 +443,7 @@
if( item ) {
return item->execute( filterText );
}else{
- qWarning() << "Got no item for row " << index.row() << " ";
+ qCWarning(PLUGIN_QUICKOPEN) << "Got no item for row " << index.row() << " ";
}
return false;
diff -Nru kdevplatform-5.1.0/plugins/standardoutputview/kdevstandardoutputview.json kdevplatform-5.1.1/plugins/standardoutputview/kdevstandardoutputview.json
--- kdevplatform-5.1.0/plugins/standardoutputview/kdevstandardoutputview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/standardoutputview/kdevstandardoutputview.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,57 +1,57 @@
{
"KPlugin": {
- "Category": "Core",
- "Description": "Provides a text output toolview for other plugins to use, to show things like compiler messages.",
- "Description[ca@valencia]": "Proporciona una vista d'eina d'eixida de text per a utilitzar en altres connectors, per a visualitzar missatges del compilador, per exemple.",
- "Description[ca]": "Proporciona una vista d'eina de sortida de text per a utilitzar en altres connectors, per a visualitzar missatges del compilador, per exemple.",
- "Description[de]": "Stellt eine Textausgabe für andere Module zur Verfügung, um Dinge wie Compiler-Nachrichten anzuzeigen.",
- "Description[es]": "Proporciona un visor de salida de texto para que otros complementos muestren cosas como mensajes del compilador, por ejemplo.",
- "Description[et]": "Teistele pluginatele kättesaadav tekstiväljundi tööriistavaade, mis näitab kompilaatori teateid ja muud.",
- "Description[fi]": "Tarjoaa tekstitulostetyökalunäkymän muille liitännäisille käytettäväksi, näyttää asiat kuin kääntäjäviestit.",
- "Description[fr]": "Fournit un outil d'affichage de la sortie texte pour utilisation par d'autres modules, pour afficher des choses comme des messages de compilateur.",
- "Description[gl]": "Fornece unha ferramenta de saída de texto a outros complementos, para mostrar cousas como mensaxes do compilador.",
- "Description[it]": "Fornisce una vista strumenti testuale per le estensioni da usare, per mostrare le cose come i messaggi del compilatore.",
- "Description[nl]": "Levert tekstuitvoer van hulpmiddelen voor andere te gebruiken plugins, om zaken te tonen zoals berichten van compilers.",
- "Description[pl]": "Zapewnia widok narzędzia wyjścia tekstu dla wykorzystania w innych wtyczkach, aby pokazać rzeczy takie jak komunikaty kompilatora.",
- "Description[pt]": "Oferece uma área de texto para os outros 'plugins' usarem, para apresentar algumas coisas, como as mensagens do compilador.",
- "Description[pt_BR]": "Oferece uma área de resultados de texto para os outros plugins usarem, de modo a mostrar coisas como as mensagens do compilador.",
- "Description[sk]": "Poskytuje textový výstup pohľadu nástrojov pre iné pluginy na použitie, na zobrazenie napríklad správy prekladača.",
- "Description[sl]": "Drugim vstavkom ponuja okno za prikaz besedilnega izhoda, na primer za sporočila izgrajevalnika.",
- "Description[sv]": "Tillhandahåller en verktygsvy för textutmatning som andra insticksprogram kan använda för att visa saker som kompilatormeddelanden.",
- "Description[uk]": "Забезпечує роботу панелі показу текстових даних інших додатків, зокрема попереджень компілятора.",
- "Description[x-test]": "xxProvides a text output toolview for other plugins to use, to show things like compiler messages.xx",
- "Description[zh_CN]": "提供让其它插件使用的文本输出工具视图,以便显示诸如编译器消息的信息。",
- "Icon": "kdevelop",
- "Id": "KDevStandardOutputView",
- "Name": "Output View",
- "Name[ca@valencia]": "Vista de l'eixida",
- "Name[ca]": "Vista de la sortida",
- "Name[cs]": "Pohled na výstup",
- "Name[de]": "Ansicht für Ausgaben",
- "Name[es]": "Vista de la salida",
- "Name[et]": "Väljundivaade",
- "Name[fi]": "Tulostenäkymä",
- "Name[fr]": "Vue sortie",
- "Name[gl]": "Vista da saída",
- "Name[it]": "Vista output",
- "Name[nb]": "Utdata-visning",
- "Name[nl]": "Uitvoerweergave",
- "Name[pl]": "Widok wyjścia",
- "Name[pt]": "Área de Resultados",
- "Name[pt_BR]": "Área de resultados",
- "Name[ru]": "Панель вывода",
- "Name[sk]": "Pohľad na výstup",
- "Name[sl]": "Prikaz izhoda",
- "Name[sv]": "Utmatningsvisning",
- "Name[uk]": "Перегляд виводу",
- "Name[x-test]": "xxOutput Viewxx",
- "Name[zh_CN]": "输出视图",
+ "Category": "Core",
+ "Description": "Provides a text output toolview for other plugins to use, to show things like compiler messages.",
+ "Description[ca@valencia]": "Proporciona una vista d'eina d'eixida de text per a utilitzar en altres connectors, per a visualitzar missatges del compilador, per exemple.",
+ "Description[ca]": "Proporciona una vista d'eina de sortida de text per a utilitzar en altres connectors, per a visualitzar missatges del compilador, per exemple.",
+ "Description[de]": "Stellt eine Textausgabe für andere Module zur Verfügung, um Dinge wie Compiler-Nachrichten anzuzeigen.",
+ "Description[es]": "Proporciona un visor de salida de texto para que otros complementos muestren cosas como mensajes del compilador, por ejemplo.",
+ "Description[et]": "Teistele pluginatele kättesaadav tekstiväljundi tööriistavaade, mis näitab kompilaatori teateid ja muud.",
+ "Description[fi]": "Tarjoaa tekstitulostetyökalunäkymän muille liitännäisille käytettäväksi, näyttää asiat kuin kääntäjäviestit.",
+ "Description[fr]": "Fournit un outil d'affichage de la sortie texte pour utilisation par d'autres modules, pour afficher des choses comme des messages de compilateur.",
+ "Description[gl]": "Fornece unha ferramenta de saída de texto a outros complementos, para mostrar cousas como mensaxes do compilador.",
+ "Description[it]": "Fornisce una vista strumenti testuale per le estensioni da usare, per mostrare le cose come i messaggi del compilatore.",
+ "Description[nl]": "Levert tekstuitvoer van hulpmiddelen voor andere te gebruiken plugins, om zaken te tonen zoals berichten van compilers.",
+ "Description[pl]": "Zapewnia widok narzędzia wyjścia tekstu dla wykorzystania w innych wtyczkach, aby pokazać rzeczy takie jak komunikaty kompilatora.",
+ "Description[pt]": "Oferece uma área de texto para os outros 'plugins' usarem, para apresentar algumas coisas, como as mensagens do compilador.",
+ "Description[pt_BR]": "Oferece uma área de resultados de texto para os outros plugins usarem, de modo a mostrar coisas como as mensagens do compilador.",
+ "Description[sk]": "Poskytuje textový výstup pohľadu nástrojov pre iné pluginy na použitie, na zobrazenie napríklad správy prekladača.",
+ "Description[sl]": "Drugim vstavkom ponuja okno za prikaz besedilnega izhoda, na primer za sporočila izgrajevalnika.",
+ "Description[sv]": "Tillhandahåller en verktygsvy för textutmatning som andra insticksprogram kan använda för att visa saker som kompilatormeddelanden.",
+ "Description[uk]": "Забезпечує роботу панелі показу текстових даних інших додатків, зокрема попереджень компілятора.",
+ "Description[x-test]": "xxProvides a text output toolview for other plugins to use, to show things like compiler messages.xx",
+ "Description[zh_CN]": "提供让其它插件使用的文本输出工具视图,以便显示诸如编译器消息的信息。",
+ "Icon": "kdevelop",
+ "Id": "KDevStandardOutputView",
+ "Name": "Output View",
+ "Name[ca@valencia]": "Vista de l'eixida",
+ "Name[ca]": "Vista de la sortida",
+ "Name[cs]": "Pohled na výstup",
+ "Name[de]": "Ansicht für Ausgaben",
+ "Name[es]": "Vista de la salida",
+ "Name[et]": "Väljundivaade",
+ "Name[fi]": "Tulostenäkymä",
+ "Name[fr]": "Vue sortie",
+ "Name[gl]": "Vista da saída",
+ "Name[it]": "Vista output",
+ "Name[nb]": "Utdata-visning",
+ "Name[nl]": "Uitvoerweergave",
+ "Name[pl]": "Widok wyjścia",
+ "Name[pt]": "Área de Resultados",
+ "Name[pt_BR]": "Área de resultados",
+ "Name[ru]": "Панель вывода",
+ "Name[sk]": "Pohľad na výstup",
+ "Name[sl]": "Prikaz izhoda",
+ "Name[sv]": "Utmatningsvisning",
+ "Name[uk]": "Перегляд виводу",
+ "Name[x-test]": "xxOutput Viewxx",
+ "Name[zh_CN]": "输出视图",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
+ },
"X-KDevelop-Interfaces": [
"org.kdevelop.IOutputView"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/subversion/kdevsubversion.json kdevplatform-5.1.1/plugins/subversion/kdevsubversion.json
--- kdevplatform-5.1.0/plugins/subversion/kdevsubversion.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/kdevsubversion.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,58 +2,62 @@
"KPlugin": {
"Authors": [
{
- "Name": "Dukju Ahn",
+ "Name": "Dukju Ahn",
"Name[x-test]": "xxDukju Ahnxx"
}
- ],
- "Category": "Version Control",
- "Description": "This plugin integrates Subversion to KDevelop.",
- "Description[ca@valencia]": "Este connector integra el Subversion en el KDevelop.",
- "Description[ca]": "Aquest connector integra el Subversion en el KDevelop.",
- "Description[cs]": "Tento modul integruje podporu pro subversion v KDevelop",
- "Description[de]": "Dieses Modul integriert Subversion in KDevelop.",
- "Description[es]": "Este complemento integra Subversion en KDevelop.",
- "Description[it]": "Questa estensione integra Subversion in KDevelop.",
- "Description[nl]": "Deze plugin integreert Subversion in KDevelop.",
- "Description[pt]": "Este 'plugin' integra o Subversion no KDevelop.",
- "Description[sv]": "Insticksprogrammet integrerar Subversion i KDevelop.",
- "Description[uk]": "Цей додаток інтегрує Subversion із KDevelop.",
- "Description[x-test]": "xxThis plugin integrates Subversion to KDevelop.xx",
- "Icon": "subversion",
- "Id": "kdevsubversion",
- "License": "GPL",
- "Name": "Subversion Support",
- "Name[ca@valencia]": "Implementació del Subversion",
- "Name[ca]": "Implementació del Subversion",
- "Name[cs]": "Podpora subversion",
- "Name[de]": "Subversion-Unterstützung",
- "Name[es]": "Implementación de Subversion",
- "Name[et]": "Subversioni toetus",
- "Name[fi]": "Subversion-tuki",
- "Name[fr]": "Prise en charge de Subversion",
- "Name[gl]": "Soporte de Subversion",
- "Name[it]": "Supporto Subversion",
- "Name[nb]": "Støtte for subversion",
- "Name[nl]": "Ondersteuning van subversion",
- "Name[pl]": "Obsługa Subversion",
- "Name[pt]": "Suporte para o Subversion",
- "Name[pt_BR]": "Suporte a Subversion",
- "Name[ru]": "Поддержка Subversion",
- "Name[sk]": "Podpora subversion",
- "Name[sl]": "Podpora za Subversion",
- "Name[sv]": "Stöd för Subversion",
- "Name[uk]": "Підтримка Subversion",
- "Name[x-test]": "xxSubversion Supportxx",
- "Name[zh_CN]": "Subversion 支持",
+ ],
+ "Category": "Version Control",
+ "Description": "This plugin integrates Subversion to KDevelop.",
+ "Description[ca@valencia]": "Este connector integra el Subversion en el KDevelop.",
+ "Description[ca]": "Aquest connector integra el Subversion en el KDevelop.",
+ "Description[cs]": "Tento modul integruje podporu pro subversion v KDevelop",
+ "Description[de]": "Dieses Modul integriert Subversion in KDevelop.",
+ "Description[es]": "Este complemento integra Subversion en KDevelop.",
+ "Description[fr]": "Ce module intègre Subversion dans KDevelop.",
+ "Description[it]": "Questa estensione integra Subversion in KDevelop.",
+ "Description[nl]": "Deze plugin integreert Subversion in KDevelop.",
+ "Description[pl]": "Ta wtyczka integruje Subversion z KDevelop.",
+ "Description[pt]": "Este 'plugin' integra o Subversion no KDevelop.",
+ "Description[sk]": "Tento plugin integruje subversion do KDevelop.",
+ "Description[sl]": "Vstavek v KDevelop vgradi Subversion.",
+ "Description[sv]": "Insticksprogrammet integrerar Subversion i KDevelop.",
+ "Description[uk]": "Цей додаток інтегрує Subversion із KDevelop.",
+ "Description[x-test]": "xxThis plugin integrates Subversion to KDevelop.xx",
+ "Icon": "subversion",
+ "Id": "kdevsubversion",
+ "License": "GPL",
+ "Name": "Subversion Support",
+ "Name[ca@valencia]": "Implementació del Subversion",
+ "Name[ca]": "Implementació del Subversion",
+ "Name[cs]": "Podpora subversion",
+ "Name[de]": "Subversion-Unterstützung",
+ "Name[es]": "Implementación de Subversion",
+ "Name[et]": "Subversioni toetus",
+ "Name[fi]": "Subversion-tuki",
+ "Name[fr]": "Prise en charge de Subversion",
+ "Name[gl]": "Soporte de Subversion",
+ "Name[it]": "Supporto Subversion",
+ "Name[nb]": "Støtte for subversion",
+ "Name[nl]": "Ondersteuning van subversion",
+ "Name[pl]": "Obsługa Subversion",
+ "Name[pt]": "Suporte para o Subversion",
+ "Name[pt_BR]": "Suporte a Subversion",
+ "Name[ru]": "Поддержка Subversion",
+ "Name[sk]": "Podpora subversion",
+ "Name[sl]": "Podpora za Subversion",
+ "Name[sv]": "Stöd för Subversion",
+ "Name[uk]": "Підтримка Subversion",
+ "Name[x-test]": "xxSubversion Supportxx",
+ "Name[zh_CN]": "Subversion 支持",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
+ },
"X-KDevelop-IRequired": [
"org.kdevelop.IOutputView"
- ],
+ ],
"X-KDevelop-Interfaces": [
"org.kdevelop.IBasicVersionControl"
- ],
+ ],
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/CMakeLists.txt kdevplatform-5.1.1/plugins/subversion/tests/CMakeLists.txt
--- kdevplatform-5.1.0/plugins/subversion/tests/CMakeLists.txt 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/CMakeLists.txt 2017-05-13 10:12:21.000000000 +0000
@@ -1,9 +1,9 @@
-ecm_add_test(svnrecursiveadd.cpp LINK_LIBRARIES
+ecm_add_test(test_svnrecursiveadd.cpp LINK_LIBRARIES
Qt5::Test Qt5::Gui
KDev::Tests KDev::Util KDev::Vcs
)
-ecm_add_test(svnimport.cpp LINK_LIBRARIES
+ecm_add_test(test_svnimport.cpp LINK_LIBRARIES
Qt5::Test Qt5::Gui
KDev::Tests KDev::Util KDev::Vcs
)
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/svnimport.cpp kdevplatform-5.1.1/plugins/subversion/tests/svnimport.cpp
--- kdevplatform-5.1.0/plugins/subversion/tests/svnimport.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/svnimport.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-/***************************************************************************
-* This file is part of KDevelop *
-* Copyright 2009 Fabian Wiesel *
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU Library General Public License as *
-* published by the Free Software Foundation; either version 2 of the *
-* License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU Library General Public *
-* License along with this program; if not, write to the *
-* Free Software Foundation, Inc., *
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-***************************************************************************/
-
-#include "svnimport.h"
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define VERBOSE
-#if defined(VERBOSE)
-#define TRACE(X) qDebug() << X
-#else
-#define TRACE(X) { line = line; }
-#endif
-
-using namespace KDevelop;
-
-void validatingExecJob(VcsJob* j, VcsJob::JobStatus status = VcsJob::JobSucceeded)
-{
- QVERIFY(j);
-
- if (!j->exec()) {
- qDebug() << j->errorString();
- // On error, wait for key in order to allow manual state inspection
- }
- QCOMPARE(j->status(), status);
-}
-
-void setupLocalRepository( const QString& name, VcsLocation & reposLoc )
-{
- KProcess cmd;
- cmd.setWorkingDirectory(name);
- cmd << QStringLiteral("svnadmin") << QStringLiteral("create") << name;
- QCOMPARE(cmd.execute(10000), 0);
-
- reposLoc.setRepositoryServer("file://" + name );
-}
-
-void setupSampleProject( const QString& name, const QString& content )
-{
- QFile sampleFile( name + "/sample.file" );
- sampleFile.open( QIODevice::WriteOnly );
- sampleFile.write( content.toUtf8() );
- sampleFile.close();
-}
-
-void SvnImport::initTestCase()
-{
- QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false\ndefault.debug=true\nkdevplatform.plugins.svn.debug=true\n"));
- AutoTestShell::init({QStringLiteral("kdevsubversion")});
- TestCore::initialize();
-
- QList plugins = Core::self()->pluginController()->allPluginsForExtension(QStringLiteral("org.kdevelop.IBasicVersionControl"));
- foreach(IPlugin* p, plugins) {
- qDebug() << "checking plugin" << p;
- ICentralizedVersionControl* icentr = p->extension();
- if (!icentr)
- continue;
- if (icentr->name() == QLatin1String("Subversion")) {
- vcs = icentr;
- break;
- }
- }
- qDebug() << "ok, got vcs" << vcs;
- QVERIFY(vcs);
-}
-
-void SvnImport::cleanupTestCase()
-{
- TestCore::shutdown();
-}
-
-void SvnImport::testBasic()
-{
- QTemporaryDir reposDir;
- VcsLocation reposLoc;
- setupLocalRepository( reposDir.path(), reposLoc );
-
- QTemporaryDir projectDir;
- QString origcontent = QStringLiteral("This is a Test");
- setupSampleProject( projectDir.path(), origcontent );
-
- VcsJob* job = vcs->import( QStringLiteral("import test"), QUrl::fromLocalFile( projectDir.path() ), reposLoc );
- validatingExecJob(job);
-
- QTemporaryDir checkoutDir;
- validateImport( reposLoc.repositoryServer(), checkoutDir, origcontent );
-}
-
-void SvnImport::testImportWithMissingDirs()
-{
- QTemporaryDir reposDir;
- VcsLocation reposLoc;
- setupLocalRepository( reposDir.path(), reposLoc );
-
- QTemporaryDir projectDir;
- QString origcontent = QStringLiteral("This is a Test");
- setupSampleProject( projectDir.path(), origcontent );
-
- reposLoc.setRepositoryServer( reposLoc.repositoryServer() + "/foobar/" + QDir( projectDir.path() ).dirName() );
- VcsJob* job = vcs->import( QStringLiteral("import test"), QUrl::fromLocalFile( projectDir.path() ), reposLoc );
- validatingExecJob(job);
-
- QTemporaryDir checkoutDir;
- validateImport( reposLoc.repositoryServer(), checkoutDir, origcontent );
-}
-
-void SvnImport::testImportIntoDir()
-{
- QTemporaryDir reposDir;
- VcsLocation reposLoc;
- setupLocalRepository( reposDir.path(), reposLoc );
-
- QTemporaryDir projectDir;
- QString origcontent = QStringLiteral("This is a Test");
- setupSampleProject( projectDir.path(), origcontent );
-
- reposLoc.setRepositoryServer( reposLoc.repositoryServer() + '/' + QDir( projectDir.path() ).dirName() );
- VcsJob* job = vcs->import( QStringLiteral("import test"), QUrl::fromLocalFile( projectDir.path() ), reposLoc );
- validatingExecJob(job);
-
- QTemporaryDir checkoutDir;
- validateImport( reposLoc.repositoryServer(), checkoutDir, origcontent );
-}
-
-void SvnImport::validateImport( const QString& repourl, QTemporaryDir& checkoutdir, const QString& origcontent )
-{
- VcsLocation reposLoc;
- reposLoc.setRepositoryServer( repourl );
- VcsJob* job = vcs->createWorkingCopy( reposLoc, QUrl::fromLocalFile(checkoutdir.path()) );
- validatingExecJob(job);
-
- QFile newfile( checkoutdir.path() + "/sample.file" );
- QVERIFY(newfile.exists());
- QVERIFY(newfile.open(QIODevice::ReadOnly));
- QCOMPARE(QString::fromUtf8( newfile.readAll() ), origcontent);
-}
-
-QTEST_MAIN(SvnImport)
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/svnimport.h kdevplatform-5.1.1/plugins/subversion/tests/svnimport.h
--- kdevplatform-5.1.0/plugins/subversion/tests/svnimport.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/svnimport.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/***************************************************************************
-* This file is part of KDevelop *
-* Copyright 2009 Fabian Wiesel *
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU Library General Public License as *
-* published by the Free Software Foundation; either version 2 of the *
-* License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU Library General Public *
-* License along with this program; if not, write to the *
-* Free Software Foundation, Inc., *
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-***************************************************************************/
-#ifndef KDEVPLATFORM_PLUGIN_SVNIMPORT_H
-#define KDEVPLATFORM_PLUGIN_SVNIMPORT_H
-#include
-
-class QTemporaryDir;
-namespace KDevelop
-{
-class TestCore;
-class ICentralizedVersionControl;
-}
-
-class SvnImport
- : public QObject
-{
- Q_OBJECT
-private slots:
- void initTestCase();
- void cleanupTestCase();
- void testBasic();
- void testImportIntoDir();
- void testImportWithMissingDirs();
-private:
- void validateImport( const QString& repo, QTemporaryDir& checkout, const QString& origcontent );
- KDevelop::ICentralizedVersionControl* vcs = nullptr;
-};
-
-#endif // KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/svnrecursiveadd.cpp kdevplatform-5.1.1/plugins/subversion/tests/svnrecursiveadd.cpp
--- kdevplatform-5.1.0/plugins/subversion/tests/svnrecursiveadd.cpp 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/svnrecursiveadd.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-/***************************************************************************
-* This file is part of KDevelop *
-* Copyright 2009 Fabian Wiesel *
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU Library General Public License as *
-* published by the Free Software Foundation; either version 2 of the *
-* License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU Library General Public *
-* License along with this program; if not, write to the *
-* Free Software Foundation, Inc., *
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-***************************************************************************/
-
-#include "svnrecursiveadd.h"
-
-#include
-#include
-#include
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-
-#define PATHETIC // A little motivator to make things work right :)
-#if defined(PATHETIC)
-inline QString vcsTestDir0() { return QStringLiteral("testdir0"); }
-inline QString vcsTestDir1() { return QStringLiteral("testdir1"); }
-inline QString vcsTest_FileName0() { return QStringLiteral("foo"); }
-inline QString vcsTest_FileName1() { return QStringLiteral("bar"); }
-inline QString keywordText() { return QStringLiteral("text"); }
-#else
-inline QString vcsTestDir0() { return QStringLiteral("dvcs\t testdir"); } // Directory containing whitespaces
-inline QString vcsTestDir1() { return QStringLiteral("--help"); } // Starting with hyphen for command-line tools
-inline QString vcsTest_FileName0() { return QStringLiteral("foo\t bar"); }
-inline QString vcsTest_FileName1() { return QStringLiteral("--help"); }
-inline QString keywordText() { return QStringLiteral("Author:\nDate:\nCommit:\n------------------------------------------------------------------------\nr999999 | ehrman | 1989-11-09 18:53:00 +0100 (Thu, 09 Nov 1989) | 1 lines\nthe line\n"); } // Text containing keywords of the various vcs-programs
-#endif
-
-inline QString simpleText() { return QStringLiteral("It's foo!\n"); }
-inline QString simpleAltText() { return QStringLiteral("No, foo()! It's bar()!\n"); }
-
-#define VERBOSE
-#if defined(VERBOSE)
-#define TRACE(X) qDebug() << X
-#else
-#define TRACE(X) { line = line; }
-#endif
-
-using namespace KDevelop;
-
-void validatingExecJob(VcsJob* j, VcsJob::JobStatus status = VcsJob::JobSucceeded)
-{
- QVERIFY(j);
- // Print the commands in full, for easier bug location
-#if 0
- if (QLatin1String(j->metaObject()->className()) == "DVcsJob") {
- qDebug() << "Command: \"" << ((DVcsJob*)j)->getChildproc()->program() << ((DVcsJob*)j)->getChildproc()->workingDirectory();
- qDebug() << "Output: \"" << ((DVcsJob*)j)->output();
- }
-#endif
-
- if (!j->exec()) {
- qDebug() << "ooops, no exec";
- qDebug() << j->errorString();
- // On error, wait for key in order to allow manual state inspection
-#if 0
- char c;
- std::cin.read(&c, 1);
-#endif
- }
-
- QCOMPARE(j->status(), status);
-}
-
-void verifiedWrite(QUrl const & url, QString const & contents)
-{
- QFile f(url.path());
- QVERIFY(f.open(QIODevice::WriteOnly));
- QTextStream filecontents(&f);
- filecontents << contents;
- filecontents.flush();
- f.flush();
-}
-
-
-void fillWorkingDirectory(QString const & dirname)
-{
- QDir dir(dirname);
- //we start it after repoInit, so we still have empty dvcs repo
- QVERIFY(dir.mkdir(vcsTestDir0()));
- QVERIFY(dir.cd(vcsTestDir0()));
- QUrl file0 = QUrl::fromLocalFile(dir.absoluteFilePath(vcsTest_FileName0()));
- QVERIFY(dir.mkdir(vcsTestDir1()));
- QVERIFY(dir.cd(vcsTestDir1()));
- QUrl file1 = QUrl::fromLocalFile(dir.absoluteFilePath(vcsTest_FileName1()));
- verifiedWrite(file0, simpleText());
- verifiedWrite(file1, keywordText());
-}
-
-void SvnRecursiveAdd::initTestCase()
-{
- AutoTestShell::init();
- TestCore::initialize();
-}
-
-void SvnRecursiveAdd::cleanupTestCase()
-{
- TestCore::shutdown();
-}
-
-void SvnRecursiveAdd::test()
-{
- QTemporaryDir reposDir;
- KProcess cmd;
- cmd.setWorkingDirectory(reposDir.path());
- cmd << QStringLiteral("svnadmin") << QStringLiteral("create") << reposDir.path();
- QCOMPARE(cmd.execute(10000), 0);
- QList plugins = Core::self()->pluginController()->allPluginsForExtension(QStringLiteral("org.kdevelop.IBasicVersionControl"));
- IBasicVersionControl* vcs = nullptr;
- foreach(IPlugin* p, plugins) {
- qDebug() << "checking plugin" << p;
- ICentralizedVersionControl* icentr = p->extension();
- if (!icentr)
- continue;
- if (icentr->name() == QLatin1String("Subversion")) {
- vcs = icentr;
- break;
- }
- }
- qDebug() << "ok, got vcs" << vcs;
- QVERIFY(vcs);
- VcsLocation reposLoc;
- reposLoc.setRepositoryServer("file://" + reposDir.path());
- QTemporaryDir checkoutDir;
- QUrl checkoutLoc = QUrl::fromLocalFile(checkoutDir.path());
- qDebug() << "Checking out from " << reposLoc.repositoryServer() << " to " << checkoutLoc;
- qDebug() << "creating job";
- VcsJob* job = vcs->createWorkingCopy( reposLoc, checkoutLoc );
- validatingExecJob(job);
- qDebug() << "filling wc";
- fillWorkingDirectory(checkoutDir.path());
- QUrl addUrl = QUrl::fromLocalFile( checkoutDir.path() + '/' + vcsTestDir0() );
- qDebug() << "Recursively adding files at " << addUrl;
- validatingExecJob(vcs->add({addUrl}, IBasicVersionControl::Recursive));
- qDebug() << "Recursively reverting changes at " << addUrl;
- validatingExecJob(vcs->revert({addUrl}, IBasicVersionControl::Recursive));
-}
-
-QTEST_MAIN(SvnRecursiveAdd)
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/svnrecursiveadd.h kdevplatform-5.1.1/plugins/subversion/tests/svnrecursiveadd.h
--- kdevplatform-5.1.0/plugins/subversion/tests/svnrecursiveadd.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/svnrecursiveadd.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/***************************************************************************
-* This file is part of KDevelop *
-* Copyright 2009 Fabian Wiesel *
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU Library General Public License as *
-* published by the Free Software Foundation; either version 2 of the *
-* License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU Library General Public *
-* License along with this program; if not, write to the *
-* Free Software Foundation, Inc., *
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-***************************************************************************/
-#ifndef KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
-#define KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
-#include
-
-class SvnRecursiveAdd
- : public QObject
-{
- Q_OBJECT
-private slots:
- void initTestCase();
- void cleanupTestCase();
-
- void test();
-};
-
-#endif // KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/test_svnimport.cpp kdevplatform-5.1.1/plugins/subversion/tests/test_svnimport.cpp
--- kdevplatform-5.1.0/plugins/subversion/tests/test_svnimport.cpp 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/test_svnimport.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,165 @@
+/***************************************************************************
+* This file is part of KDevelop *
+* Copyright 2009 Fabian Wiesel *
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU Library General Public License as *
+* published by the Free Software Foundation; either version 2 of the *
+* License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU Library General Public *
+* License along with this program; if not, write to the *
+* Free Software Foundation, Inc., *
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+***************************************************************************/
+
+#include "test_svnimport.h"
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define VERBOSE
+#if defined(VERBOSE)
+#define TRACE(X) qDebug() << X
+#else
+#define TRACE(X) { line = line; }
+#endif
+
+using namespace KDevelop;
+
+void validatingExecJob(VcsJob* j, VcsJob::JobStatus status = VcsJob::JobSucceeded)
+{
+ QVERIFY(j);
+
+ if (!j->exec()) {
+ qDebug() << j->errorString();
+ // On error, wait for key in order to allow manual state inspection
+ }
+ QCOMPARE(j->status(), status);
+}
+
+void setupLocalRepository( const QString& name, VcsLocation & reposLoc )
+{
+ KProcess cmd;
+ cmd.setWorkingDirectory(name);
+ cmd << QStringLiteral("svnadmin") << QStringLiteral("create") << name;
+ QCOMPARE(cmd.execute(10000), 0);
+
+ reposLoc.setRepositoryServer("file://" + name );
+}
+
+void setupSampleProject( const QString& name, const QString& content )
+{
+ QFile sampleFile( name + "/sample.file" );
+ sampleFile.open( QIODevice::WriteOnly );
+ sampleFile.write( content.toUtf8() );
+ sampleFile.close();
+}
+
+void TestSvnImport::initTestCase()
+{
+ QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false\ndefault.debug=true\nkdevplatform.plugins.svn.debug=true\n"));
+ AutoTestShell::init({QStringLiteral("kdevsubversion")});
+ TestCore::initialize();
+
+ QList plugins = Core::self()->pluginController()->allPluginsForExtension(QStringLiteral("org.kdevelop.IBasicVersionControl"));
+ foreach(IPlugin* p, plugins) {
+ qDebug() << "checking plugin" << p;
+ ICentralizedVersionControl* icentr = p->extension();
+ if (!icentr)
+ continue;
+ if (icentr->name() == QLatin1String("Subversion")) {
+ vcs = icentr;
+ break;
+ }
+ }
+ qDebug() << "ok, got vcs" << vcs;
+ QVERIFY(vcs);
+}
+
+void TestSvnImport::cleanupTestCase()
+{
+ TestCore::shutdown();
+}
+
+void TestSvnImport::testBasic()
+{
+ QTemporaryDir reposDir;
+ VcsLocation reposLoc;
+ setupLocalRepository( reposDir.path(), reposLoc );
+
+ QTemporaryDir projectDir;
+ QString origcontent = QStringLiteral("This is a Test");
+ setupSampleProject( projectDir.path(), origcontent );
+
+ VcsJob* job = vcs->import( QStringLiteral("import test"), QUrl::fromLocalFile( projectDir.path() ), reposLoc );
+ validatingExecJob(job);
+
+ QTemporaryDir checkoutDir;
+ validateImport( reposLoc.repositoryServer(), checkoutDir, origcontent );
+}
+
+void TestSvnImport::testImportWithMissingDirs()
+{
+ QTemporaryDir reposDir;
+ VcsLocation reposLoc;
+ setupLocalRepository( reposDir.path(), reposLoc );
+
+ QTemporaryDir projectDir;
+ QString origcontent = QStringLiteral("This is a Test");
+ setupSampleProject( projectDir.path(), origcontent );
+
+ reposLoc.setRepositoryServer( reposLoc.repositoryServer() + "/foobar/" + QDir( projectDir.path() ).dirName() );
+ VcsJob* job = vcs->import( QStringLiteral("import test"), QUrl::fromLocalFile( projectDir.path() ), reposLoc );
+ validatingExecJob(job);
+
+ QTemporaryDir checkoutDir;
+ validateImport( reposLoc.repositoryServer(), checkoutDir, origcontent );
+}
+
+void TestSvnImport::testImportIntoDir()
+{
+ QTemporaryDir reposDir;
+ VcsLocation reposLoc;
+ setupLocalRepository( reposDir.path(), reposLoc );
+
+ QTemporaryDir projectDir;
+ QString origcontent = QStringLiteral("This is a Test");
+ setupSampleProject( projectDir.path(), origcontent );
+
+ reposLoc.setRepositoryServer( reposLoc.repositoryServer() + '/' + QDir( projectDir.path() ).dirName() );
+ VcsJob* job = vcs->import( QStringLiteral("import test"), QUrl::fromLocalFile( projectDir.path() ), reposLoc );
+ validatingExecJob(job);
+
+ QTemporaryDir checkoutDir;
+ validateImport( reposLoc.repositoryServer(), checkoutDir, origcontent );
+}
+
+void TestSvnImport::validateImport( const QString& repourl, QTemporaryDir& checkoutdir, const QString& origcontent )
+{
+ VcsLocation reposLoc;
+ reposLoc.setRepositoryServer( repourl );
+ VcsJob* job = vcs->createWorkingCopy( reposLoc, QUrl::fromLocalFile(checkoutdir.path()) );
+ validatingExecJob(job);
+
+ QFile newfile( checkoutdir.path() + "/sample.file" );
+ QVERIFY(newfile.exists());
+ QVERIFY(newfile.open(QIODevice::ReadOnly));
+ QCOMPARE(QString::fromUtf8( newfile.readAll() ), origcontent);
+}
+
+QTEST_MAIN(TestSvnImport)
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/test_svnimport.h kdevplatform-5.1.1/plugins/subversion/tests/test_svnimport.h
--- kdevplatform-5.1.0/plugins/subversion/tests/test_svnimport.h 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/test_svnimport.h 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,47 @@
+/***************************************************************************
+* This file is part of KDevelop *
+* Copyright 2009 Fabian Wiesel *
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU Library General Public License as *
+* published by the Free Software Foundation; either version 2 of the *
+* License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU Library General Public *
+* License along with this program; if not, write to the *
+* Free Software Foundation, Inc., *
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+***************************************************************************/
+#ifndef KDEVPLATFORM_PLUGIN_SVNIMPORT_H
+#define KDEVPLATFORM_PLUGIN_SVNIMPORT_H
+
+#include
+
+class QTemporaryDir;
+namespace KDevelop
+{
+class TestCore;
+class ICentralizedVersionControl;
+}
+
+class TestSvnImport
+ : public QObject
+{
+ Q_OBJECT
+private slots:
+ void initTestCase();
+ void cleanupTestCase();
+ void testBasic();
+ void testImportIntoDir();
+ void testImportWithMissingDirs();
+private:
+ void validateImport( const QString& repo, QTemporaryDir& checkout, const QString& origcontent );
+ KDevelop::ICentralizedVersionControl* vcs = nullptr;
+};
+
+#endif // KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/test_svnrecursiveadd.cpp kdevplatform-5.1.1/plugins/subversion/tests/test_svnrecursiveadd.cpp
--- kdevplatform-5.1.0/plugins/subversion/tests/test_svnrecursiveadd.cpp 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/test_svnrecursiveadd.cpp 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,160 @@
+/***************************************************************************
+* This file is part of KDevelop *
+* Copyright 2009 Fabian Wiesel *
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU Library General Public License as *
+* published by the Free Software Foundation; either version 2 of the *
+* License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU Library General Public *
+* License along with this program; if not, write to the *
+* Free Software Foundation, Inc., *
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+***************************************************************************/
+
+#include "test_svnrecursiveadd.h"
+
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#define PATHETIC // A little motivator to make things work right :)
+#if defined(PATHETIC)
+inline QString vcsTestDir0() { return QStringLiteral("testdir0"); }
+inline QString vcsTestDir1() { return QStringLiteral("testdir1"); }
+inline QString vcsTest_FileName0() { return QStringLiteral("foo"); }
+inline QString vcsTest_FileName1() { return QStringLiteral("bar"); }
+inline QString keywordText() { return QStringLiteral("text"); }
+#else
+inline QString vcsTestDir0() { return QStringLiteral("dvcs\t testdir"); } // Directory containing whitespaces
+inline QString vcsTestDir1() { return QStringLiteral("--help"); } // Starting with hyphen for command-line tools
+inline QString vcsTest_FileName0() { return QStringLiteral("foo\t bar"); }
+inline QString vcsTest_FileName1() { return QStringLiteral("--help"); }
+inline QString keywordText() { return QStringLiteral("Author:\nDate:\nCommit:\n------------------------------------------------------------------------\nr999999 | ehrman | 1989-11-09 18:53:00 +0100 (Thu, 09 Nov 1989) | 1 lines\nthe line\n"); } // Text containing keywords of the various vcs-programs
+#endif
+
+inline QString simpleText() { return QStringLiteral("It's foo!\n"); }
+inline QString simpleAltText() { return QStringLiteral("No, foo()! It's bar()!\n"); }
+
+#define VERBOSE
+#if defined(VERBOSE)
+#define TRACE(X) qDebug() << X
+#else
+#define TRACE(X) { line = line; }
+#endif
+
+using namespace KDevelop;
+
+void validatingExecJob(VcsJob* j, VcsJob::JobStatus status = VcsJob::JobSucceeded)
+{
+ QVERIFY(j);
+ // Print the commands in full, for easier bug location
+#if 0
+ if (QLatin1String(j->metaObject()->className()) == "DVcsJob") {
+ qDebug() << "Command: \"" << ((DVcsJob*)j)->getChildproc()->program() << ((DVcsJob*)j)->getChildproc()->workingDirectory();
+ qDebug() << "Output: \"" << ((DVcsJob*)j)->output();
+ }
+#endif
+
+ if (!j->exec()) {
+ qDebug() << "ooops, no exec";
+ qDebug() << j->errorString();
+ // On error, wait for key in order to allow manual state inspection
+#if 0
+ char c;
+ std::cin.read(&c, 1);
+#endif
+ }
+
+ QCOMPARE(j->status(), status);
+}
+
+void verifiedWrite(QUrl const & url, QString const & contents)
+{
+ QFile f(url.path());
+ QVERIFY(f.open(QIODevice::WriteOnly));
+ QTextStream filecontents(&f);
+ filecontents << contents;
+ filecontents.flush();
+ f.flush();
+}
+
+
+void fillWorkingDirectory(QString const & dirname)
+{
+ QDir dir(dirname);
+ //we start it after repoInit, so we still have empty dvcs repo
+ QVERIFY(dir.mkdir(vcsTestDir0()));
+ QVERIFY(dir.cd(vcsTestDir0()));
+ QUrl file0 = QUrl::fromLocalFile(dir.absoluteFilePath(vcsTest_FileName0()));
+ QVERIFY(dir.mkdir(vcsTestDir1()));
+ QVERIFY(dir.cd(vcsTestDir1()));
+ QUrl file1 = QUrl::fromLocalFile(dir.absoluteFilePath(vcsTest_FileName1()));
+ verifiedWrite(file0, simpleText());
+ verifiedWrite(file1, keywordText());
+}
+
+void TestSvnRecursiveAdd::initTestCase()
+{
+ AutoTestShell::init({"kdevsubversion"});
+ TestCore::initialize();
+}
+
+void TestSvnRecursiveAdd::cleanupTestCase()
+{
+ TestCore::shutdown();
+}
+
+void TestSvnRecursiveAdd::test()
+{
+ QTemporaryDir reposDir;
+ KProcess cmd;
+ cmd.setWorkingDirectory(reposDir.path());
+ cmd << QStringLiteral("svnadmin") << QStringLiteral("create") << reposDir.path();
+ QCOMPARE(cmd.execute(10000), 0);
+ QList plugins = Core::self()->pluginController()->allPluginsForExtension(QStringLiteral("org.kdevelop.IBasicVersionControl"));
+ IBasicVersionControl* vcs = nullptr;
+ foreach(IPlugin* p, plugins) {
+ qDebug() << "checking plugin" << p;
+ ICentralizedVersionControl* icentr = p->extension();
+ if (!icentr)
+ continue;
+ if (icentr->name() == QLatin1String("Subversion")) {
+ vcs = icentr;
+ break;
+ }
+ }
+ qDebug() << "ok, got vcs" << vcs;
+ QVERIFY(vcs);
+ VcsLocation reposLoc;
+ reposLoc.setRepositoryServer("file://" + reposDir.path());
+ QTemporaryDir checkoutDir;
+ QUrl checkoutLoc = QUrl::fromLocalFile(checkoutDir.path());
+ qDebug() << "Checking out from " << reposLoc.repositoryServer() << " to " << checkoutLoc;
+ qDebug() << "creating job";
+ VcsJob* job = vcs->createWorkingCopy( reposLoc, checkoutLoc );
+ validatingExecJob(job);
+ qDebug() << "filling wc";
+ fillWorkingDirectory(checkoutDir.path());
+ QUrl addUrl = QUrl::fromLocalFile( checkoutDir.path() + '/' + vcsTestDir0() );
+ qDebug() << "Recursively adding files at " << addUrl;
+ validatingExecJob(vcs->add({addUrl}, IBasicVersionControl::Recursive));
+ qDebug() << "Recursively reverting changes at " << addUrl;
+ validatingExecJob(vcs->revert({addUrl}, IBasicVersionControl::Recursive));
+}
+
+QTEST_MAIN(TestSvnRecursiveAdd)
diff -Nru kdevplatform-5.1.0/plugins/subversion/tests/test_svnrecursiveadd.h kdevplatform-5.1.1/plugins/subversion/tests/test_svnrecursiveadd.h
--- kdevplatform-5.1.0/plugins/subversion/tests/test_svnrecursiveadd.h 1970-01-01 00:00:00.000000000 +0000
+++ kdevplatform-5.1.1/plugins/subversion/tests/test_svnrecursiveadd.h 2017-05-13 10:12:21.000000000 +0000
@@ -0,0 +1,36 @@
+/***************************************************************************
+* This file is part of KDevelop *
+* Copyright 2009 Fabian Wiesel *
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU Library General Public License as *
+* published by the Free Software Foundation; either version 2 of the *
+* License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU Library General Public *
+* License along with this program; if not, write to the *
+* Free Software Foundation, Inc., *
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+***************************************************************************/
+#ifndef KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
+#define KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
+
+#include
+
+class TestSvnRecursiveAdd
+ : public QObject
+{
+ Q_OBJECT
+private slots:
+ void initTestCase();
+ void cleanupTestCase();
+
+ void test();
+};
+
+#endif // KDEVPLATFORM_PLUGIN_SVNRECURSIVEADD_H
diff -Nru kdevplatform-5.1.0/plugins/switchtobuddy/kdevswitchtobuddy.json kdevplatform-5.1.1/plugins/switchtobuddy/kdevswitchtobuddy.json
--- kdevplatform-5.1.0/plugins/switchtobuddy/kdevswitchtobuddy.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/switchtobuddy/kdevswitchtobuddy.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,54 +1,54 @@
{
"KPlugin": {
- "Category": "Utilities",
- "Description": "Allows switching between buddy documents like implementation and header file.",
- "Description[ca@valencia]": "Permet commutar entre documents associats com fitxers d'implementacions i de capçaleres.",
- "Description[ca]": "Permet commutar entre documents associats com fitxers d'implementacions i de capçaleres.",
- "Description[de]": "Ermöglicht das Umschalten zwischen verwandten Dokumenten wie Implementations- und Header-Dateien.",
- "Description[es]": "Permite cambiar entre documentos complementarios, como la implementación y el archivo de cabecera.",
- "Description[et]": "Võimaldab lülituda sõltlasdokumentide, näiteks teostus- ja päisefaili vahel.",
- "Description[fi]": "Mahdollistaa vaihtamisen yhteen kuuluvien tiedostojen, kuten toteutus- ja otsikkotiedoston, välillä.",
- "Description[fr]": "Permet de basculer entre des documents amis comme l'implémentation et le fichier d'en-tête.",
- "Description[gl]": "Permite trocar entre documentos tipo buddy como implementación e ficheiro de cabeceira.",
- "Description[it]": "Consente il passaggio tra i documenti associati come implementazioni e header file.",
- "Description[nl]": "Biedt omschakelen tussen buddy-documenten zoals implementatie en header-bestand.",
- "Description[pl]": "Pozwala na przełączanie pomiędzy stowarzyszonymi dokumentami takimi jak pliki implementacji i nagłówków.",
- "Description[pt]": "Permite a alternância entre os documentos associados, como o ficheiro de implementação ou o de inclusão.",
- "Description[pt_BR]": "Permite a mudança de documentos associados, como os arquivos de implementação e de inclusão.",
- "Description[sk]": "Umožňuje prepínanie medzi dokumentmi priateľov ako súbor implementácie a hlavičky.",
- "Description[sl]": "Omogoča preklapljanje med prijateljskimi dokumenti kot na primer izvedbo in datoteko glave.",
- "Description[sv]": "Tillåter byte mellan samhörande dokument som implementerings- och deklarationsfiler.",
- "Description[uk]": "Надає змогу перемикатися на споріднені документи, зокрема файли з реалізацією та файли заголовків.",
- "Description[x-test]": "xxAllows switching between buddy documents like implementation and header file.xx",
- "Description[zh_CN]": "允许在伙伴文件中切换,如实现与头文件",
- "Icon": "document-multiple",
- "Id": "kdevswitchtobuddy",
- "Name": "Switch to Buddy",
- "Name[ca@valencia]": "Commuta a associat",
- "Name[ca]": "Commuta a associat",
- "Name[de]": "Zu verwandtem Element wechseln",
- "Name[es]": "Cambiar a relacionado",
- "Name[et]": "Lülitumine sõltlasele",
- "Name[fi]": "Vaihda yhteen kuuluvaan tiedostoon",
- "Name[fr]": "Basculer au fichier ami",
- "Name[gl]": "Pasar a Buddy",
- "Name[it]": "Passa al file associato",
- "Name[nb]": "Bytt til kamerat",
- "Name[nl]": "Naar Buddy omschakelen",
- "Name[pl]": "Przełącz do stowarzyszonego",
- "Name[pt]": "Mudar para o Ficheiro Associado",
- "Name[pt_BR]": "Mudar para o arquivo associado",
- "Name[ru]": "Переход к связанному",
- "Name[sk]": "Prepnúť na Buddy",
- "Name[sl]": "Preklopi na prijatelja",
- "Name[sv]": "Byt till samhörande",
- "Name[uk]": "Перемикання на споріднений",
- "Name[x-test]": "xxSwitch to Buddyxx",
- "Name[zh_CN]": "切换至伙伴文件",
+ "Category": "Utilities",
+ "Description": "Allows switching between buddy documents like implementation and header file.",
+ "Description[ca@valencia]": "Permet commutar entre documents associats com fitxers d'implementacions i de capçaleres.",
+ "Description[ca]": "Permet commutar entre documents associats com fitxers d'implementacions i de capçaleres.",
+ "Description[de]": "Ermöglicht das Umschalten zwischen verwandten Dokumenten wie Implementations- und Header-Dateien.",
+ "Description[es]": "Permite cambiar entre documentos complementarios, como la implementación y el archivo de cabecera.",
+ "Description[et]": "Võimaldab lülituda sõltlasdokumentide, näiteks teostus- ja päisefaili vahel.",
+ "Description[fi]": "Mahdollistaa vaihtamisen yhteen kuuluvien tiedostojen, kuten toteutus- ja otsikkotiedoston, välillä.",
+ "Description[fr]": "Permet de basculer entre des documents amis comme l'implémentation et le fichier d'en-tête.",
+ "Description[gl]": "Permite trocar entre documentos tipo buddy como implementación e ficheiro de cabeceira.",
+ "Description[it]": "Consente il passaggio tra i documenti associati come implementazioni e header file.",
+ "Description[nl]": "Biedt omschakelen tussen buddy-documenten zoals implementatie en header-bestand.",
+ "Description[pl]": "Pozwala na przełączanie pomiędzy stowarzyszonymi dokumentami takimi jak pliki implementacji i nagłówków.",
+ "Description[pt]": "Permite a alternância entre os documentos associados, como o ficheiro de implementação ou o de inclusão.",
+ "Description[pt_BR]": "Permite a mudança de documentos associados, como os arquivos de implementação e de inclusão.",
+ "Description[sk]": "Umožňuje prepínanie medzi dokumentmi priateľov ako súbor implementácie a hlavičky.",
+ "Description[sl]": "Omogoča preklapljanje med prijateljskimi dokumenti kot na primer izvedbo in datoteko glave.",
+ "Description[sv]": "Tillåter byte mellan samhörande dokument som implementerings- och deklarationsfiler.",
+ "Description[uk]": "Надає змогу перемикатися на споріднені документи, зокрема файли з реалізацією та файли заголовків.",
+ "Description[x-test]": "xxAllows switching between buddy documents like implementation and header file.xx",
+ "Description[zh_CN]": "允许在伙伴文件中切换,如实现与头文件",
+ "Icon": "document-multiple",
+ "Id": "kdevswitchtobuddy",
+ "Name": "Switch to Buddy",
+ "Name[ca@valencia]": "Commuta a associat",
+ "Name[ca]": "Commuta a associat",
+ "Name[de]": "Zu verwandtem Element wechseln",
+ "Name[es]": "Cambiar a relacionado",
+ "Name[et]": "Lülitumine sõltlasele",
+ "Name[fi]": "Vaihda yhteen kuuluvaan tiedostoon",
+ "Name[fr]": "Basculer au fichier ami",
+ "Name[gl]": "Pasar a Buddy",
+ "Name[it]": "Passa al file associato",
+ "Name[nb]": "Bytt til kamerat",
+ "Name[nl]": "Naar Buddy omschakelen",
+ "Name[pl]": "Przełącz do stowarzyszonego",
+ "Name[pt]": "Mudar para o Ficheiro Associado",
+ "Name[pt_BR]": "Mudar para o arquivo associado",
+ "Name[ru]": "Переход к связанному",
+ "Name[sk]": "Prepnúť na Buddy",
+ "Name[sl]": "Preklopi na prijatelja",
+ "Name[sv]": "Byt till samhörande",
+ "Name[uk]": "Перемикання на споріднений",
+ "Name[x-test]": "xxSwitch to Buddyxx",
+ "Name[zh_CN]": "切换至伙伴文件",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/switchtobuddy/switchtobuddyplugin.h kdevplatform-5.1.1/plugins/switchtobuddy/switchtobuddyplugin.h
--- kdevplatform-5.1.0/plugins/switchtobuddy/switchtobuddyplugin.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/switchtobuddy/switchtobuddyplugin.h 2017-05-13 10:12:21.000000000 +0000
@@ -18,8 +18,8 @@
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_PLUGIN_SWITCHTOBUDDY_H
-#define KDEVPLATFORM_PLUGIN_SWITCHTOBUDDY_H
+#ifndef KDEVPLATFORM_PLUGIN_SWITCHTOBUDDYPLUGIN_H
+#define KDEVPLATFORM_PLUGIN_SWITCHTOBUDDYPLUGIN_H
#include
#include
@@ -83,4 +83,4 @@
};
-#endif // KDEVPLATFORM_PLUGIN_SWITCHTOBUDDY_H
+#endif // KDEVPLATFORM_PLUGIN_SWITCHTOBUDDYPLUGIN_H
diff -Nru kdevplatform-5.1.0/plugins/testview/kdevtestview.json kdevplatform-5.1.1/plugins/testview/kdevtestview.json
--- kdevplatform-5.1.0/plugins/testview/kdevtestview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/testview/kdevtestview.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,60 +2,60 @@
"KPlugin": {
"Authors": [
{
- "Name": "Miha Čančula",
+ "Name": "Miha Čančula",
"Name[x-test]": "xxMiha Čančulaxx"
}
- ],
- "Category": "Testing",
- "Description": "Lets you see and run unit tests.",
- "Description[ca@valencia]": "Vos permet veure i executar proves unitàries.",
- "Description[ca]": "Us permet veure i executar proves unitàries.",
- "Description[de]": "Unit-Tests anzeigen und ausführen.",
- "Description[es]": "Le permite ver y ejecutar pruebas unitarias.",
- "Description[et]": "Ühiktestide näitamine ja käivitamine.",
- "Description[fi]": "Mahdollistaa yksikkötestien tarkastelemisen ja suorittamisen.",
- "Description[fr]": "Vous permet de voir et exécuter des tests unitaires.",
- "Description[gl]": "Permite ver e executar probas unitarias.",
- "Description[it]": "Consente di vedere ed eseguire i test d'unità.",
- "Description[nl]": "Laat u testen van eenheden zien en uitvoeren.",
- "Description[pl]": "Pozwala tobie na obejrzenie i uruchomienie testów jednostkowych.",
- "Description[pt]": "Permite-lhe ver e executar testes unitários.",
- "Description[pt_BR]": "Permite-lhe ver e executar testes unitários.",
- "Description[sk]": "Umožní vám vidieť a spustiť unit testy.",
- "Description[sl]": "Omogoča ogled in zagon preizkusov enot.",
- "Description[sv]": "Låter dig titta på och köra enhetstester.",
- "Description[uk]": "Надає вам змогу переглядати і виконувати перевірки модулів.",
- "Description[x-test]": "xxLets you see and run unit tests.xx",
- "Description[zh_CN]": "让您查看并运行单元测试。",
- "Icon": "preflight-verifier",
- "Id": "kdevtestview",
- "License": "GPL",
- "Name": "Unit Test View",
- "Name[ca@valencia]": "Vista de proves unitàries",
- "Name[ca]": "Vista de proves unitàries",
- "Name[de]": "Unittest-Ansicht",
- "Name[es]": "Vista de la prueba unitaria",
- "Name[et]": "Ühiktestide vaade",
- "Name[fi]": "Yksikkötestinäkymä",
- "Name[fr]": "Vue test unitaire",
- "Name[gl]": "Vista de probas unitarias",
- "Name[it]": "Vista test d'unità",
- "Name[nb]": "Enhetstest-visning",
- "Name[nl]": "Weergave van test van eenheid",
- "Name[pl]": "Widok jednostkowego testu",
- "Name[pt]": "Área de Testes Unitários",
- "Name[pt_BR]": "Exibição de testes unitários",
- "Name[ru]": "Панель модульных тестов",
- "Name[sk]": "Pohľad unit testov",
- "Name[sl]": "Prikaz preizkusov enot",
- "Name[sv]": "Visning av enhetstester",
- "Name[uk]": "Перегляд перевірок модулів",
- "Name[x-test]": "xxUnit Test Viewxx",
- "Name[zh_CN]": "单元测试视图",
+ ],
+ "Category": "Testing",
+ "Description": "Lets you see and run unit tests.",
+ "Description[ca@valencia]": "Vos permet veure i executar proves unitàries.",
+ "Description[ca]": "Us permet veure i executar proves unitàries.",
+ "Description[de]": "Unit-Tests anzeigen und ausführen.",
+ "Description[es]": "Le permite ver y ejecutar pruebas unitarias.",
+ "Description[et]": "Ühiktestide näitamine ja käivitamine.",
+ "Description[fi]": "Mahdollistaa yksikkötestien tarkastelemisen ja suorittamisen.",
+ "Description[fr]": "Vous permet de voir et exécuter des tests unitaires.",
+ "Description[gl]": "Permite ver e executar probas unitarias.",
+ "Description[it]": "Consente di vedere ed eseguire i test d'unità.",
+ "Description[nl]": "Laat u testen van eenheden zien en uitvoeren.",
+ "Description[pl]": "Pozwala tobie na obejrzenie i uruchomienie testów jednostkowych.",
+ "Description[pt]": "Permite-lhe ver e executar testes unitários.",
+ "Description[pt_BR]": "Permite-lhe ver e executar testes unitários.",
+ "Description[sk]": "Umožní vám vidieť a spustiť unit testy.",
+ "Description[sl]": "Omogoča ogled in zagon preizkusov enot.",
+ "Description[sv]": "Låter dig titta på och köra enhetstester.",
+ "Description[uk]": "Надає вам змогу переглядати і виконувати перевірки модулів.",
+ "Description[x-test]": "xxLets you see and run unit tests.xx",
+ "Description[zh_CN]": "让您查看并运行单元测试。",
+ "Icon": "preflight-verifier",
+ "Id": "kdevtestview",
+ "License": "GPL",
+ "Name": "Unit Test View",
+ "Name[ca@valencia]": "Vista de proves unitàries",
+ "Name[ca]": "Vista de proves unitàries",
+ "Name[de]": "Unittest-Ansicht",
+ "Name[es]": "Vista de la prueba unitaria",
+ "Name[et]": "Ühiktestide vaade",
+ "Name[fi]": "Yksikkötestinäkymä",
+ "Name[fr]": "Vue test unitaire",
+ "Name[gl]": "Vista de probas unitarias",
+ "Name[it]": "Vista test d'unità",
+ "Name[nb]": "Enhetstest-visning",
+ "Name[nl]": "Weergave van test van eenheid",
+ "Name[pl]": "Widok jednostkowego testu",
+ "Name[pt]": "Área de Testes Unitários",
+ "Name[pt_BR]": "Exibição de testes unitários",
+ "Name[ru]": "Панель модульных тестов",
+ "Name[sk]": "Pohľad unit testov",
+ "Name[sl]": "Prikaz preizkusov enot",
+ "Name[sv]": "Visning av enhetstester",
+ "Name[uk]": "Перегляд перевірок модулів",
+ "Name[x-test]": "xxUnit Test Viewxx",
+ "Name[zh_CN]": "单元测试视图",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/vcschangesview/kdevvcschangesview.json kdevplatform-5.1.1/plugins/vcschangesview/kdevvcschangesview.json
--- kdevplatform-5.1.0/plugins/vcschangesview/kdevvcschangesview.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/vcschangesview/kdevvcschangesview.json 2017-05-13 10:12:21.000000000 +0000
@@ -2,61 +2,61 @@
"KPlugin": {
"Authors": [
{
- "Email": "aleixpol@kde.org",
- "Name": "Aleix Pol",
+ "Email": "aleixpol@kde.org",
+ "Name": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx"
}
- ],
- "Category": "Version Control",
- "Description": "This plugin provides integration between the projects and their VCS infrastructure",
- "Description[ca@valencia]": "Este connector proporciona la integració entre els projectes i la seua infraestructura de VCS",
- "Description[ca]": "Aquest connector proporciona la integració entre els projectes i la seva infraestructura de VCS",
- "Description[de]": "Dieses Modul stellt eine Integration zwischen Projekten und ihrer VCS-Infrastruktur her.",
- "Description[es]": "Este complemento proporciona integración entre los proyectos y su infraestructura VCS",
- "Description[et]": "See plugin võimaldab lõimida projektid ja nende versioonihalduse infrastruktuuri",
- "Description[fi]": "Tämä liitännäinen tarjoaa projektien ja niiden versionhallintajärjestelmien välisen integraation",
- "Description[fr]": "Ce module fournit une intégration entre les projets et leur infrastructure de contrôle de version",
- "Description[gl]": "Este complemento fornece integración entre os proxectos e a súa infraestrutura VCS",
- "Description[it]": "Questa estensione fornisce integrazione tra i progetti e la loro infrastruttura VCS",
- "Description[nl]": "Deze plugin geeft integratie tussen de projecten en hun VCS-infrastructuur",
- "Description[pl]": "Wtyczka ta zapewnia integracje pomiędzy projektami i ich infrastrukturą systemu kontroli wersji (VCS)",
- "Description[pt]": "Este 'plugin' oferece a integração entre os projectos e a sua infra-estrutura de controlo de versões",
- "Description[pt_BR]": "Este plugin fornece a integração entre os projetos e sua infraestrutura de VCS",
- "Description[sk]": "Tento plugin poskytuje integráciu medzi projektami a ich VCS infraštruktúrou",
- "Description[sl]": "Ta vstavek ponuja most med projekti in njihovo infrastrukturo nadzora različic",
- "Description[sv]": "Det här insticksprogrammet tillhandahåller integrering mellan projekten och deras VCS infrastruktur",
- "Description[uk]": "За допомогою цього додатка забезпечується інтеграція між проектами та інфраструктурою системи керування версіями (VCS)",
- "Description[x-test]": "xxThis plugin provides integration between the projects and their VCS infrastructurexx",
- "Description[zh_CN]": "此插件提供工程和它们的代码管理系统的集成",
- "Icon": "git",
- "Id": "kdevvcschangesviewplugin",
- "License": "GPL",
- "Name": "VCS Integration",
- "Name[ca@valencia]": "Integració de VCS",
- "Name[ca]": "Integració de VCS",
- "Name[de]": "VCS-Integration",
- "Name[es]": "Integración VCS",
- "Name[et]": "Versioonihalduse lõimimine",
- "Name[fi]": "VCS-integraatio",
- "Name[fr]": "Intégration avec le système de contrôle de version",
- "Name[gl]": "Integración con VCS",
- "Name[it]": "Integrazione VCS",
- "Name[nb]": "VCS-integrering",
- "Name[nl]": "VCS-integratie",
- "Name[pl]": "Integracja VCS",
- "Name[pt]": "Integração com o SCV",
- "Name[pt_BR]": "Integração com o VCS",
- "Name[ru]": "Интеграция VCS",
- "Name[sk]": "Integrácia VCS",
- "Name[sl]": "Vgradnja nadzora različic",
- "Name[sv]": "Integrering av VCS",
- "Name[uk]": "Інтеграція з системами керування версіями",
- "Name[x-test]": "xxVCS Integrationxx",
- "Name[zh_CN]": "VCS 工程集成",
+ ],
+ "Category": "Version Control",
+ "Description": "This plugin provides integration between the projects and their VCS infrastructure",
+ "Description[ca@valencia]": "Este connector proporciona la integració entre els projectes i la seua infraestructura de VCS",
+ "Description[ca]": "Aquest connector proporciona la integració entre els projectes i la seva infraestructura de VCS",
+ "Description[de]": "Dieses Modul stellt eine Integration zwischen Projekten und ihrer VCS-Infrastruktur her.",
+ "Description[es]": "Este complemento proporciona integración entre los proyectos y su infraestructura VCS",
+ "Description[et]": "See plugin võimaldab lõimida projektid ja nende versioonihalduse infrastruktuuri",
+ "Description[fi]": "Tämä liitännäinen tarjoaa projektien ja niiden versionhallintajärjestelmien välisen integraation",
+ "Description[fr]": "Ce module fournit une intégration entre les projets et leur infrastructure de contrôle de version",
+ "Description[gl]": "Este complemento fornece integración entre os proxectos e a súa infraestrutura VCS",
+ "Description[it]": "Questa estensione fornisce integrazione tra i progetti e la loro infrastruttura VCS",
+ "Description[nl]": "Deze plugin geeft integratie tussen de projecten en hun VCS-infrastructuur",
+ "Description[pl]": "Wtyczka ta zapewnia integracje pomiędzy projektami i ich infrastrukturą systemu kontroli wersji (VCS)",
+ "Description[pt]": "Este 'plugin' oferece a integração entre os projectos e a sua infra-estrutura de controlo de versões",
+ "Description[pt_BR]": "Este plugin fornece a integração entre os projetos e sua infraestrutura de VCS",
+ "Description[sk]": "Tento plugin poskytuje integráciu medzi projektami a ich VCS infraštruktúrou",
+ "Description[sl]": "Ta vstavek ponuja most med projekti in njihovo infrastrukturo nadzora različic",
+ "Description[sv]": "Det här insticksprogrammet tillhandahåller integrering mellan projekten och deras VCS infrastruktur",
+ "Description[uk]": "За допомогою цього додатка забезпечується інтеграція між проектами та інфраструктурою системи керування версіями (VCS)",
+ "Description[x-test]": "xxThis plugin provides integration between the projects and their VCS infrastructurexx",
+ "Description[zh_CN]": "此插件提供工程和它们的代码管理系统的集成",
+ "Icon": "git",
+ "Id": "kdevvcschangesviewplugin",
+ "License": "GPL",
+ "Name": "VCS Integration",
+ "Name[ca@valencia]": "Integració de VCS",
+ "Name[ca]": "Integració de VCS",
+ "Name[de]": "VCS-Integration",
+ "Name[es]": "Integración VCS",
+ "Name[et]": "Versioonihalduse lõimimine",
+ "Name[fi]": "VCS-integraatio",
+ "Name[fr]": "Intégration avec le système de contrôle de version",
+ "Name[gl]": "Integración con VCS",
+ "Name[it]": "Integrazione VCS",
+ "Name[nb]": "VCS-integrering",
+ "Name[nl]": "VCS-integratie",
+ "Name[pl]": "Integracja VCS",
+ "Name[pt]": "Integração com o SCV",
+ "Name[pt_BR]": "Integração com o VCS",
+ "Name[ru]": "Интеграция VCS",
+ "Name[sk]": "Integrácia VCS",
+ "Name[sl]": "Vgradnja nadzora različic",
+ "Name[sv]": "Integrering av VCS",
+ "Name[uk]": "Інтеграція з системами керування версіями",
+ "Name[x-test]": "xxVCS Integrationxx",
+ "Name[zh_CN]": "VCS 工程集成",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
- "X-KDevelop-Category": "Global",
+ },
+ "X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/welcomepage/kdevwelcomepage.json kdevplatform-5.1.1/plugins/welcomepage/kdevwelcomepage.json
--- kdevplatform-5.1.0/plugins/welcomepage/kdevwelcomepage.json 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/welcomepage/kdevwelcomepage.json 2017-05-13 10:12:21.000000000 +0000
@@ -1,41 +1,44 @@
{
"KPlugin": {
- "Description": "Provides the welcome page visible in an empty session",
- "Description[ca@valencia]": "Proporciona la visibilitat de la pàgina de benvinguda en una sessió buida",
- "Description[ca]": "Proporciona la visibilitat de la pàgina de benvinguda en una sessió buida",
- "Description[es]": "Proporciona la página de bienvenida visible en una sesión vacía",
- "Description[it]": "Fornisce la pagina di benvenuto visibile in una sessione vuota",
- "Description[nl]": "Biedt de welkomst pagina zichtbaar in een lege sessie",
- "Description[pt]": "Oferece a página de boas-vindas que fica visível numa sessão vazia",
- "Description[sv]": "Tillhandahåller välkomstsidan synlig i en tom session",
- "Description[uk]": "Забезпечує роботу сторінки вітання, яку програма показує, якщо сеанс порожній",
- "Description[x-test]": "xxProvides the welcome page visible in an empty sessionxx",
- "Icon": "kdevelop",
- "Id": "KDevWelcomePage",
- "Name": "KDevelop Welcome Page",
- "Name[ca@valencia]": "Pàgina de benvinguda del KDevelop",
- "Name[ca]": "Pàgina de benvinguda del KDevelop",
- "Name[cs]": "Uvítací stránka KDevelop",
- "Name[de]": "KDevelop-Startseite",
- "Name[es]": "Página de bienvenida de KDevelop",
- "Name[et]": "KDevelopi tervituslehekülg",
- "Name[fi]": "KDevelopin tervetulosivu",
- "Name[fr]": "Page d'accueil de KDevelop",
- "Name[gl]": "Páxina de benvida de KDevelop",
- "Name[it]": "Pagina di benvenuto di KDevelop",
- "Name[nl]": "Welkomstpagina van KDevelop",
- "Name[pl]": "Strona powitalna KDevelop",
- "Name[pt]": "Página de Boas-Vindas do KDevelop",
- "Name[pt_BR]": "Página de boas-vindas do KDevelop",
- "Name[sk]": "Uvítacia stránka KDevelop",
- "Name[sl]": "Pozdravna stran za KDevelop",
- "Name[sv]": "KDevelop välkomstsida",
- "Name[uk]": "Сторінка вітання KDevelop",
- "Name[x-test]": "xxKDevelop Welcome Pagexx",
- "Name[zh_CN]": "KDevelop 欢迎页面",
+ "Description": "Provides the welcome page visible in an empty session",
+ "Description[ca@valencia]": "Proporciona la visibilitat de la pàgina de benvinguda en una sessió buida",
+ "Description[ca]": "Proporciona la visibilitat de la pàgina de benvinguda en una sessió buida",
+ "Description[es]": "Proporciona la página de bienvenida visible en una sesión vacía",
+ "Description[it]": "Fornisce la pagina di benvenuto visibile in una sessione vuota",
+ "Description[nl]": "Biedt de welkomst pagina zichtbaar in een lege sessie",
+ "Description[pl]": "Dostarcza stronę powitania widoczną przy pustych sesjach",
+ "Description[pt]": "Oferece a página de boas-vindas que fica visível numa sessão vazia",
+ "Description[sk]": "Poskytuje uvítaciu stránku viditeľnú v prázdnom sedení",
+ "Description[sl]": "Ponuja pozdravni zaslon, ki je viden v prazni seji",
+ "Description[sv]": "Tillhandahåller välkomstsidan synlig i en tom session",
+ "Description[uk]": "Забезпечує роботу сторінки вітання, яку програма показує, якщо сеанс порожній",
+ "Description[x-test]": "xxProvides the welcome page visible in an empty sessionxx",
+ "Icon": "kdevelop",
+ "Id": "KDevWelcomePage",
+ "Name": "KDevelop Welcome Page",
+ "Name[ca@valencia]": "Pàgina de benvinguda del KDevelop",
+ "Name[ca]": "Pàgina de benvinguda del KDevelop",
+ "Name[cs]": "Uvítací stránka KDevelop",
+ "Name[de]": "KDevelop-Startseite",
+ "Name[es]": "Página de bienvenida de KDevelop",
+ "Name[et]": "KDevelopi tervituslehekülg",
+ "Name[fi]": "KDevelopin tervetulosivu",
+ "Name[fr]": "Page d'accueil de KDevelop",
+ "Name[gl]": "Páxina de benvida de KDevelop",
+ "Name[it]": "Pagina di benvenuto di KDevelop",
+ "Name[nl]": "Welkomstpagina van KDevelop",
+ "Name[pl]": "Strona powitalna KDevelop",
+ "Name[pt]": "Página de Boas-Vindas do KDevelop",
+ "Name[pt_BR]": "Página de boas-vindas do KDevelop",
+ "Name[sk]": "Uvítacia stránka KDevelop",
+ "Name[sl]": "Pozdravna stran za KDevelop",
+ "Name[sv]": "KDevelop välkomstsida",
+ "Name[uk]": "Сторінка вітання KDevelop",
+ "Name[x-test]": "xxKDevelop Welcome Pagexx",
+ "Name[zh_CN]": "KDevelop 欢迎页面",
"ServiceTypes": [
"KDevelop/Plugin"
]
- },
+ },
"X-KDevelop-Mode": "GUI"
}
diff -Nru kdevplatform-5.1.0/plugins/welcomepage/qml/main.qml kdevplatform-5.1.1/plugins/welcomepage/qml/main.qml
--- kdevplatform-5.1.0/plugins/welcomepage/qml/main.qml 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/welcomepage/qml/main.qml 2017-05-13 10:12:21.000000000 +0000
@@ -34,7 +34,9 @@
anchors.fill: parent
- source: "qrc:/qml/area_"+area+".qml"
+ // non-code areas are broken ATM, so just go blank for them
+ // old: source: "qrc:///qml/area_"+area+".qml"
+ source: area === "code" ? "qrc:///qml/area_code.qml" : ""
asynchronous: true
opacity: status === Loader.Ready
diff -Nru kdevplatform-5.1.0/plugins/welcomepage/welcomepageplugin.h kdevplatform-5.1.1/plugins/welcomepage/welcomepageplugin.h
--- kdevplatform-5.1.0/plugins/welcomepage/welcomepageplugin.h 2017-03-13 19:04:46.000000000 +0000
+++ kdevplatform-5.1.1/plugins/welcomepage/welcomepageplugin.h 2017-05-13 10:12:21.000000000 +0000
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KDEVPLATFORM_PLUGIN_KDEVPROJECTDASHBOARD_H
-#define KDEVPLATFORM_PLUGIN_KDEVPROJECTDASHBOARD_H
+#ifndef KDEVPLATFORM_PLUGIN_KDEVWELCOMEPAGEPLUGIN_H
+#define KDEVPLATFORM_PLUGIN_KDEVWELCOMEPAGEPLUGIN_H
#include
diff -Nru kdevplatform-5.1.0/po/ast/kdevappwizard.po kdevplatform-5.1.1/po/ast/kdevappwizard.po
--- kdevplatform-5.1.0/po/ast/kdevappwizard.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ast/kdevappwizard.po 2017-05-13 10:12:29.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-08-10 23:42+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -53,62 +53,62 @@
"Esto anicia l'aplicación d'encontu pa KDevelop. Ayúdate a xenerar una "
"cadarma pa la to aplicación dende un conxuntu de plantíes."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Nun pudo crease'l proyeutu dende la plantía\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Fallu al crear el proyeutu"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Fallu del sistema de control de versiones"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Nun pudo aniciase'l repositoriu DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Nun pudieron amestase los ficheros al repositoriu DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Nun pudo importase'l proyeutu a %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Nun pudo importase'l proyeutu"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr ""
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Nun pudo crease'l proyeutu nuevu"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Nun pue crease'l ficheru %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Plantíes de proyeutos"
@@ -120,57 +120,57 @@
msgid "Project"
msgstr "Proyeutu"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Estaya"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Triba de proyeutu"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Consiguir más plantíes"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Cargar plantía dende ficheru"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Allugamientu non válidu"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nome de proyeutu baleru"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nome de proyeutu non válidu"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Nun puen crease los sodireutorios, falten los permisos en: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Plantía de proyeutu non válida, por favor escueyi un elementu de fueya"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "Yá esiste'l camín y contién ficheros. Ábrilu como un proyeutu."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -196,7 +196,7 @@
msgid "Location:"
msgstr "Allugamientu:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/ast/kdevgrepview.po kdevplatform-5.1.1/po/ast/kdevgrepview.po
--- kdevplatform-5.1.0/po/ast/kdevgrepview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ast/kdevgrepview.po 2017-05-13 10:12:29.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2015-04-06 02:20+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -101,39 +101,39 @@
msgid "Grep: %1"
msgstr ""
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, fuzzy, kde-format
msgid "Line %1: "
msgstr "Llinia %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] ""
msgstr[1] ""
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] ""
msgstr[1] ""
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
Отваря се помощникът на KDevelop. Той ви помага да "
"създадете скелета на вашата програма според колекция от шаблони.
"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Не може да се създаде проект от шаблон\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Грешка при създаването на проект"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, fuzzy, kde-format
#| msgid "Version Control System:"
msgid "Version Control System Error"
msgstr "Система за управление на версии:"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Грешка при генериране на DVCS хранилище"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Файловете не могат да се добавят към DVCS хранилището"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Грешка при зареждане на проект в %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Грешка при зареждане на проект"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Зареденият проект не може да се провери"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Не може да се създаде нов проект"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Грешка при създаване на файл %1"
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Шаблони за проект"
@@ -124,60 +124,60 @@
msgid "Project"
msgstr "Проект"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr ""
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, fuzzy, kde-format
#| msgid "Project Templates"
msgid "Project Type"
msgstr "Шаблони за проект"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, fuzzy, kde-format
#| msgid "Project Templates"
msgid "Get More Templates"
msgstr "Шаблони за проект"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr ""
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Неправилно местоположение"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Напишете име на проекта"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Неправилно име на проект"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Грешка при създаване на каталози, липсват правомощия в: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Неправилен шаблон на проект, изберете запис от списъка"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
#| msgid "Path already exists and contains files"
msgid "Path already exists and contains files. Open it as a project."
msgstr "Пътят вече съществува и съдържа файлове"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -204,7 +204,7 @@
msgid "Location:"
msgstr "Местоположение:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/bg/kdevplatform.po kdevplatform-5.1.1/po/bg/kdevplatform.po
--- kdevplatform-5.1.0/po/bg/kdevplatform.po 2017-03-13 19:05:01.000000000 +0000
+++ kdevplatform-5.1.1/po/bg/kdevplatform.po 2017-05-13 10:12:29.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2011-07-26 10:51+0300\n"
"Last-Translator: Yasen Pramatarov \n"
"Language-Team: Bulgarian \n"
@@ -348,8 +348,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Изтриване"
@@ -474,7 +474,7 @@
msgstr ""
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Премахване на всички"
@@ -617,6 +617,15 @@
msgid "Failed to apply changes: %1"
msgstr ""
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, fuzzy, kde-format
+#| msgid "Filename"
+msgid "Rename"
+msgstr "Име на файл"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -744,14 +753,6 @@
msgid "Applying changes failed: %1"
msgstr ""
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, fuzzy, kde-format
-#| msgid "Filename"
-msgid "Rename"
-msgstr "Име на файл"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, fuzzy, kde-format
@@ -1590,28 +1591,28 @@
msgid "Various items"
msgstr ""
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr ""
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr ""
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, fuzzy, kde-format
#| msgid "Branch \"%1\" already exists."
msgid "The file %1 already exists."
msgstr "Клонът \"%1\" вече съществува."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr ""
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr ""
@@ -1789,20 +1790,20 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, fuzzy, kde-format
#| msgid "Configure %1"
msgid "Configure"
msgstr "Настройки на %1"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
msgstr ""
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr ""
@@ -2896,154 +2897,154 @@
msgid "Show detailed progress window"
msgstr "Показване на подробен прозорец за напредъка"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Зареждане на проект %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, fuzzy, kde-format
#| msgid "Loading %1"
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Зареждане на %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
"session."
msgstr ""
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Грешка при получаване файла на проекта: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
"interface."
msgstr ""
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Грешка при отваряне на проект"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
"Attention: The project settings you changed will be lost."
msgstr ""
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Настройки на проект %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Неправилно местоположение: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Проектът вече е отворен"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr ""
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr ""
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
"Continue to open the project and use the just provided project configuration."
msgstr ""
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Отваряне на съществуващ файл"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
"Continue to open the project but use the existing project configuration."
msgstr ""
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, fuzzy, kde-format
#| msgid "Cancel and do not open the project."
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Отмяна без отваряне на проект"
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
"Do you want to override it or open the existing file?"
msgstr ""
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr ""
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Грешка при създаване на файл с настройки %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr ""
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, fuzzy, kde-format
#| msgid "Open recent project"
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Отваряне на последния проект"
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, fuzzy, kde-format
#| msgid "Open recent project"
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Отваряне на последния проект"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3054,21 +3055,21 @@
"created."
msgstr ""
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, fuzzy, kde-format
#| msgid "Fetch Project..."
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Изтегляне на проект..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, fuzzy, kde-format
#| msgid "Fetch Project"
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Изтегляне на проект"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3076,82 +3077,82 @@
"4."
msgstr ""
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, fuzzy, kde-format
#| msgid "Close Project(s)"
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Затваряне на проект(и)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, fuzzy, kde-format
#| msgid "Closes all currently selected projects"
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Затваряне на всички избрани проекти"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Отваряне на конфигурация..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Подаване на текущия проект..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Изпращане..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, fuzzy, kde-format
#| msgid "Open recent project"
msgid "Open Recent Project"
msgstr "Отваряне на последния проект"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, fuzzy, kde-format
#| msgid "Open recent project"
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Отваряне на последния проект"
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr ""
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr ""
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Няма активен документ"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, fuzzy, kde-format
#| msgid "Project already being opened"
msgid "Project Already Open"
msgstr "Проектът вече е отворен"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
"session. What do you want to do?"
msgstr ""
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr ""
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, fuzzy, kde-format
#| msgid "Rename Session"
msgid "Open session %1"
@@ -3618,19 +3619,19 @@
msgid "Create New Session"
msgstr "Започване на нова сесия"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr ""
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr ""
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3638,20 +3639,20 @@
"is hanging."
msgstr ""
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
"Failed to lock the session %1, already locked by %2 on %3 (PID %4)."
msgstr ""
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
msgstr ""
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3659,27 +3660,27 @@
"session to launch.
"
msgstr ""
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, fuzzy, kde-format
#| msgid "&Restart"
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Пре&зареждане"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, fuzzy, kde-format
#| msgid "Close Other Files"
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Затваряне на другите файлове"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr ""
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3788,20 +3789,20 @@
msgid "Configure Environment Variables"
msgstr "настройки на променливите на обкръжението"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, fuzzy, kde-format
#| msgid "&Remove all"
msgid "Enter variable ..."
msgstr "&Премахване на всички"
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr ""
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, fuzzy, kde-format
#| msgid "%1 (%2)"
msgctxt "a copy of the existing environment was created"
@@ -4351,7 +4352,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Нов"
@@ -4636,67 +4637,67 @@
msgid "Select Tool View to Add"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Документи:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Добавяне на всички"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
"working set."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
"active working set."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Зареждане"
@@ -5127,25 +5128,25 @@
msgid "There are no committed differences."
msgstr "Няма разлики."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Поддръжка на VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5153,25 +5154,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Изтегляне"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr ""
@@ -5327,81 +5328,81 @@
msgid "Source Revision"
msgstr ""
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Обновяване"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Добавяне"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Показване на разликите..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Връщане"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "История..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Бележка..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Показване на разлики..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, fuzzy, kde-format
#| msgid "Show Diff..."
msgid "Show Diff (all files)..."
msgstr "Показване на разлики..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr ""
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr ""
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Няма разлики."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr ""
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr ""
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
"AnnotationInterface for the editor."
msgstr ""
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5409,7 +5410,7 @@
"%1"
msgstr ""
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, fuzzy, kde-format
#| msgid "Copy revision"
msgid "Copy Revision"
@@ -5439,41 +5440,41 @@
msgid "Recursive"
msgstr "Рекурсивно"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Съобщение при изпращане:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Стари съобщения"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Files to commit"
msgid "Unable to commit"
msgstr "Файлове за изпращане"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Commit Message"
msgid "Commit unsuccessful"
msgstr "Съобщение при изпращане"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, fuzzy, kde-format
#| msgid "Commit"
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Изпращане"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5482,12 +5483,12 @@
"
%2
"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr ""
@@ -5498,7 +5499,7 @@
msgstr "Разлики между ревизии %1 и %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Разлики между ревизии"
diff -Nru kdevplatform-5.1.0/po/bg/kdevprojectmanagerview.po kdevplatform-5.1.1/po/bg/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/bg/kdevprojectmanagerview.po 2017-03-13 19:05:01.000000000 +0000
+++ kdevplatform-5.1.1/po/bg/kdevprojectmanagerview.po 2017-05-13 10:12:29.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2011-07-20 16:05+0300\n"
"Last-Translator: Yasen Pramatarov \n"
"Language-Team: Bulgarian \n"
@@ -201,67 +201,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Създаване на файл"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Създаване на папка"
#: projectmanagerviewplugin.cpp:257
#, fuzzy, kde-format
#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Компилиране"
#: projectmanagerviewplugin.cpp:261
#, fuzzy, kde-format
#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Инсталиране"
#: projectmanagerviewplugin.cpp:265
#, fuzzy, kde-format
#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Изчистване"
#: projectmanagerviewplugin.cpp:269
#, fuzzy, kde-format
#| msgid "Add to Buildset"
-msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Добавяне към поредицата за комилиране"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Затваряне на проект"
msgstr[1] "Затваряне на проекти"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Презареждане"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Премахване"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Преименуване..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Премахване от схемата за компилиране"
#: projectmanagerviewplugin.cpp:493
@@ -286,6 +292,11 @@
msgid "Delete Files"
msgstr "Изтриване на файлове"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Преименуване..."
+
#: projectmanagerviewplugin.cpp:602
#, fuzzy, kde-format
#| msgid "New name for '%1'"
diff -Nru kdevplatform-5.1.0/po/bs/kdevappwizard.po kdevplatform-5.1.1/po/bs/kdevappwizard.po
--- kdevplatform-5.1.0/po/bs/kdevappwizard.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/bs/kdevappwizard.po 2017-05-13 10:12:30.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2014-01-10 10:34+0000\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -56,62 +56,62 @@
"Ovo počinje čarobnjak aplikacija za KDevelop.. To vam pomaže da generišete "
"kostur za vašu aplikaciju sa skupom šablona."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Ne mogu generisati novi projekt iz preloška\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Neuspjelo kreiranje projekta"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, fuzzy, kde-format
msgid "Version Control System Error"
msgstr "Sistem za kontrolu verzija:"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Ne mogu inicijalizirati DVCS repozitorij"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Ne mogu dodati datoteke u DVCS repozitorij"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Ne mogu uvesti projekt u %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Ne mogu uvesti projekt"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Ne mogu izvdojiti uvezeni projekt"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Ne mogu kreirati novi projekt"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Datoteka %1 ne može biti stvorena."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Projektni šabloni"
@@ -123,58 +123,58 @@
msgid "Project"
msgstr "Projekt"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Kategorija"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Vrsta projekta"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Dobavi još predložaka"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Učitaj predložak iz datoteke"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Pogrešna lokacija"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Prazno ime projekta"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nevažeće ime projekta"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Ne mogu kreirati poddirektorije, nedostaju prava na: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr ""
"Pogrešan predložak projekta, odaberite objekt koji je na listovima stabla"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "Staza već postoji i sadrži datoteke"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -201,7 +201,7 @@
msgid "Location:"
msgstr "Lokacija:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/bs/kdevgrepview.po kdevplatform-5.1.1/po/bs/kdevgrepview.po
--- kdevplatform-5.1.0/po/bs/kdevgrepview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/bs/kdevgrepview.po 2017-05-13 10:12:30.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2014-02-10 00:17+0100\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -108,12 +108,12 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Linija %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
@@ -121,7 +121,7 @@
msgstr[1] "%1 poklapanja"
msgstr[2] "%1 poklapanja"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
@@ -129,13 +129,13 @@
msgstr[1] "%1 datoteke"
msgstr[2] "%1 datoteka"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 u %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
@@ -143,7 +143,7 @@
msgstr[1] "%2 (%1 slaganja)"
msgstr[2] "%2 (%1 slaganja)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/bs/kdevpatchreview.po kdevplatform-5.1.1/po/bs/kdevpatchreview.po
--- kdevplatform-5.1.0/po/bs/kdevpatchreview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/bs/kdevpatchreview.po 2017-05-13 10:12:30.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2014-02-10 00:14+0100\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -26,55 +26,55 @@
msgstr "Vlasitta zakrpa"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Zakrpa"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Osnova:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Baza zakrpa"
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Iz datoteke"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Lokacija zakrpe..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Iz komande"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Izlaz komande..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Zakrpa je već primijenjena na lokalnu verziju"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Već primjenjena"
diff -Nru kdevplatform-5.1.0/po/bs/kdevplatform.po kdevplatform-5.1.1/po/bs/kdevplatform.po
--- kdevplatform-5.1.0/po/bs/kdevplatform.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/bs/kdevplatform.po 2017-05-13 10:12:30.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2014-02-12 23:48+0100\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -360,8 +360,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Obriši"
@@ -492,7 +492,7 @@
msgstr "Nedavni izrazi"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Ukloni sve"
@@ -639,6 +639,14 @@
msgid "Failed to apply changes: %1"
msgstr "Neuspjelo zaključavanje sesije %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Promijeni ime"
+
#: language/assistant/renamefileaction.cpp:56
#, fuzzy, kde-format
#| msgid "Renaming \"%1\" to \"%2\""
@@ -767,13 +775,6 @@
msgid "Applying changes failed: %1"
msgstr "Primjena promjena nije uspjela: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Promijeni ime"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1617,27 +1618,27 @@
msgid "Various items"
msgstr "Razni objekti"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Ne mogu ukloniti direktorij %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Ne mogu ukloniti datoteku%1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Datoteka %1 vec postoji."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Ne mogu kreirati datoteku %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Ne mogu kreirati direktorij %1."
@@ -1817,21 +1818,21 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, fuzzy, kde-format
#| msgctxt "@info:status"
#| msgid "configure"
msgid "Configure"
msgstr "konfiguriraj"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
msgstr ""
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr ""
@@ -2943,18 +2944,18 @@
msgid "Show detailed progress window"
msgstr "Prikaži detaljni prozor napretka"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Učitavam projekt %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Učitavam %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2962,29 +2963,29 @@
msgstr ""
"Ne mogu učitati datoteku projekta %1. Projekt je uklonjen iz sesije."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Ne mogu da kreiram skriveni direktorij (%1) za razvojnu datoteku"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Ne mogu da dobavim projektnu datoteku: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr "Ne mogu učitati %1, projekt s istim imenom '%2' je već otvoren."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2993,12 +2994,12 @@
"dodatak za upravljanje projektima (%1) ne podržava IProjectFileManager "
"interfejs."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Ne mogu otvoriti projekt"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -3008,32 +3009,32 @@
"osoblje.\n"
"Pažnja: Projektne postavke koje ste izmijenili mogu biti izgubljene."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Konfiguriši projekt %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Pogrešna lokacija: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projekt je već u toku otvaranja"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Već otvaram %1, ne otvara se ponovo"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Potiskivanje"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3042,12 +3043,12 @@
"Nastavite da biste otvorili projekat i koristite samo navedenu konfiguraciju "
"projekta."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Otvori postojeću datoteku"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3056,13 +3057,13 @@
"Nastavite da biste otvorili projekat ali koristite postojeću konfiguraciju "
"projekta."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Otkaži i ne otvaraj projekat."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3071,34 +3072,34 @@
"Već postoji projektna konfiguracijska datoteka u%1.\n"
"Da li želite da je zamijenite ili otvorite postojeću datoteku?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Zamijeni postojeću projektnu konfiguraciju"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Ne mogu kreirati konfiguracijsku datoteku %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Ponovo otvori trenutni projekt?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Otvori / uvezi projekt..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Otvori ili unesi projekt"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, fuzzy, kde-format
#| msgctxt "@info:whatsthis"
#| msgid ""
@@ -3121,19 +3122,19 @@
"postojeci direktorij koji jos nema KDevelop 4 projek datoteka, datoteka ce "
"biti kreirana."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Dobavi projekt..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Dobavi projekat"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3141,65 +3142,65 @@
"4."
msgstr "Vodi korisnika kroz projekt donesi, a zatim uvezi ga u kdevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Zatvori projekt(e)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Zatvara sve ternutno odabrane projekte"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Otvori konfiguraciju...."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Potvrdi trenutni projekt..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Upis..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Otvori trenutni projekt"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "otvoreni nedavni otvoren projekt."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Otvori projekt za trenutnu datoteku"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Projekt već otvoren: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Nema aktivnih dokumenta"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "projekt je vec otvoren"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3208,12 +3209,12 @@
"Projekt pokusavate da ga otvorite je vec otvoren u jednoj drugoj sesiji. "
"Sta zelite da uradite?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Dodaj projekt u trenutnu sesiju"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Otvori sesiju %1"
@@ -3668,19 +3669,19 @@
msgid "Create New Session"
msgstr "Kreiraj novu sesiju"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "učinjeno da je pokrenuta %1 instanca (PID: %2) vidljiva"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "pokernuta %1 instanca (PID: %2) visi"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3690,7 +3691,7 @@
"Ova aplikacija nije odgovorila na DBUS poziv, možda je krahirala ili je "
"zaglavljena."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3699,7 +3700,7 @@
"Neuspjelo zaključavanje sesije %1, već ju je zaključao %2 na %3 "
"(PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3707,7 +3708,7 @@
"Neuspjelo zaključavanje sesije %1 (nedostupna datoteka "
"zaključavanja)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3717,25 +3718,25 @@
"
Molim, zatvorite kritičnu kopiju aplikacije il odaberite novu sesiju za "
"pokretanje
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Ponovi pokretanje"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Odaberi drugu sesiju"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Neuspjelo zaključavanje sesije %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3849,19 +3850,19 @@
msgid "Configure Environment Variables"
msgstr "konfiguracija okolnih varijabli"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Unesite varijablu..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr ""
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, fuzzy, kde-format
#| msgctxt "project name (branch name)"
#| msgid "%1 (%2)"
@@ -4441,7 +4442,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Novi"
@@ -4723,32 +4724,32 @@
msgid "Select Tool View to Add"
msgstr "Odaberi pogled alata za dodati"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Aktiviraj rad"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "radni skup"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr "Ukloni ovaj radni skup. Sadržani dokumenti nisu izmijenjeni"
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Dockumenti:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Dodaj sve"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4757,7 +4758,7 @@
"Dodaj sve dokumente koji su dio ovog radnog skupa na trenutno aktivni radni "
"skup."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4766,28 +4767,28 @@
"Ukloni sve dokumente koji su dio ovog radnog skupa sa trenutno aktivnog "
"radnog skupa."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Klikni da otvoriš i aktiviraš ovaj dokument"
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Ukloni ovu datoteku iz trenutnog radnog skupa."
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Dodaj ovu datoteku u trenutni radni skup."
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Učitaj"
@@ -5223,25 +5224,25 @@
msgid "There are no committed differences."
msgstr "Nema razlika"
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "VCS podrška"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Kreira nove grane bazirano na odabranoj grani"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Isto kao as git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5249,25 +5250,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Izdvoji u odabranu granu"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Izdvajanje"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr ""
@@ -5423,73 +5424,73 @@
msgid "Source Revision"
msgstr "Revizija izvora"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Ažuriraj"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Dodaj"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Prikaži razlike..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Vrati"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historija..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotacija..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Prikaži razlike..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Prikaži razlike (sve datoteke)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Gurni"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Povuci"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Nema razlika"
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Ne mogu dobaviti razliku"
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2 Historija (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5498,7 +5499,7 @@
"Ne mogu prikazati pribilješke, nedostaje interfejs KTextEditor::"
"AnnotationInterface za editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5509,7 +5510,7 @@
"tekstualni dokument\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Kopiraj reviziju"
@@ -5538,39 +5539,39 @@
msgid "Recursive"
msgstr "Rekurzivno"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Poruka potvrde:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Stare poruke"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Unable to write to %1"
msgid "Unable to commit"
msgstr "Ne mogu pisati u %1"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Predaj"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5583,12 +5584,12 @@
"Sa porukom:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Spreman za potvrdu u repozitorij"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Ne mogu kreirati zakrpu za trenutnu verziju."
@@ -5599,7 +5600,7 @@
msgstr "Razlika između revizije %1 i %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Razlika između revizija"
diff -Nru kdevplatform-5.1.0/po/bs/kdevprojectmanagerview.po kdevplatform-5.1.1/po/bs/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/bs/kdevprojectmanagerview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/bs/kdevprojectmanagerview.po 2017-05-13 10:12:30.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2014-02-10 00:20+0100\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -198,64 +198,74 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Kreiraj datoteku"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Napravi direktorij"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Izgradi"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Instaliraj"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
-msgstr "Očisti"
+msgid "&Clean"
+msgstr "Počisti"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Dodaj u skup za gradnju"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Zatvori projekt"
msgstr[1] "Zatvori projekte"
msgstr[2] "Zatvori projekt"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Ponovo učitaj"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Ukloni"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Preimenuj..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Ukloni iz odredišta"
#: projectmanagerviewplugin.cpp:493
@@ -281,6 +291,11 @@
msgid "Delete Files"
msgstr "Brisanje datoteka"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Preimenuj..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/ca/kdevappwizard.po kdevplatform-5.1.1/po/ca/kdevappwizard.po
--- kdevplatform-5.1.0/po/ca/kdevappwizard.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca/kdevappwizard.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2017-03-04 09:43+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -58,62 +58,62 @@
"Això inicia l'assistent d'aplicacions del KDevelop. Us ajudarà a generar un "
"esquelet per a la vostra aplicació a partir d'un conjunt de plantilles."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "No s'ha pogut crear el projecte des de plantilla\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Ha fallat en crear el projecte"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Vegeu la vista d'eina del Control de versions"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Error del Sistema de control de versions"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "No s'ha pogut inicialitzar el repositori DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "No s'han pogut afegir fitxers al repositori DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "No s'ha pogut importar el projecte en %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "No s'ha pogut importar el projecte"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "No s'ha pogut baixar el projecte importat"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "No s'ha pogut crear el projecte nou"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "No es pot crear el fitxer %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Plantilles de projecte"
@@ -125,57 +125,57 @@
msgid "Project"
msgstr "Projecte"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoria"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipus de projecte"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obtén més plantilles"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Carrega una plantilla des d'un fitxer"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Ubicació no vàlida"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nom de projecte buit"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nom de projecte no vàlid"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "No s'han pogut crear subdirectoris, falten els permisos a: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Plantilla de projecte no vàlida, si us plau, trieu un element del full"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "El camí ja existeix i conté fitxers. Obriu-lo com un projecte."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -202,7 +202,7 @@
msgid "Location:"
msgstr "Ubicació:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/ca/kdevgrepview.po kdevplatform-5.1.1/po/ca/kdevgrepview.po
--- kdevplatform-5.1.0/po/ca/kdevgrepview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca/kdevgrepview.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-03-04 09:56+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -106,39 +106,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Línia %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 coincidència"
msgstr[1] "%1 coincidències"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 fitxer"
msgstr[1] "%1 fitxers"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 a %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (una coincidència)"
msgstr[1] "%2 (%1 coincidències)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/ca/kdevpatchreview.po kdevplatform-5.1.1/po/ca/kdevpatchreview.po
--- kdevplatform-5.1.0/po/ca/kdevpatchreview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca/kdevpatchreview.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-10 15:34+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
@@ -28,55 +28,55 @@
msgstr "Pedaç personalitzat"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Pedaç"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Base del pedaç..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Des del fitxer"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Ubicació del pedaç..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Des d'una ordre"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Sortida de l'ordre..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Ja s'ha aplicat el pedaç en la versió local"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Ja s'ha aplicat"
diff -Nru kdevplatform-5.1.0/po/ca/kdevplatform.po kdevplatform-5.1.1/po/ca/kdevplatform.po
--- kdevplatform-5.1.0/po/ca/kdevplatform.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca/kdevplatform.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-03-04 10:01+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -354,8 +354,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Elimina"
@@ -485,7 +485,7 @@
msgstr "Expressions recents"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Elimina-ho tot"
@@ -629,6 +629,14 @@
msgid "Failed to apply changes: %1"
msgstr "Ha fallat en aplicar els canvis: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Reanomena"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -752,13 +760,6 @@
msgid "Applying changes failed: %1"
msgstr "Ha fallat en aplicar els canvis: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Reanomena"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1587,27 +1588,27 @@
msgid "Various items"
msgstr "Elements diversos"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "No s'ha pogut eliminar la carpeta %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "No s'ha pogut eliminar el fitxer %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "El fitxer %1 ja existeix."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "No s'ha pogut crear el fitxer %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "No s'ha pogut crear la carpeta %1."
@@ -1789,12 +1790,12 @@
msgid "&Color Theme"
msgstr "Tema de &color"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configura"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1803,7 +1804,7 @@
"L'arranjament del mòdul actual ha canviat.\n"
"Voleu aplicar els canvis o descartar-los?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Aplica l'arranjament"
@@ -2915,18 +2916,18 @@
msgid "Show detailed progress window"
msgstr "Mostra la finestra de progrés detallat"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "S'està carregant el projecte %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "S'està carregant %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2935,24 +2936,24 @@
"No s'ha pogut carregar el fitxer de projecte %1. El projecte ha estat "
"eliminat de la sessió."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"No s'ha pogut crear el directori ocult (%1) pel fitxer del desenvolupador"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "No s'ha pogut obtenir el fitxer de projecte: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"No s'ha pogut carregar %1, ja està obert un projecte amb el mateix nom «%2»."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
@@ -2962,7 +2963,7 @@
" Comproveu que hi ha instal·lats els programes requerits, o vegeu la "
"sortida de la consola per a més informació."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2971,12 +2972,12 @@
"el connector d'importació del projecte (%1) no permet la interfície "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "No s'ha pogut obrir el projecte"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2986,32 +2987,32 @@
"desenvolupador.\n"
"Atenció: els arranjaments del projecte que heu modificat es perdran."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configura el projecte %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Ubicació no vàlida: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "El projecte ja s'està obrint"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Ja s'està obrint %1, no s'obrirà de nou"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Sobreescriu"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3020,12 +3021,12 @@
"Continua obrint el projecte i usa la configuració del projecte que es "
"proporciona."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Obre el fitxer existent"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3033,13 +3034,13 @@
msgstr ""
"Continua obrint el projecte però usa la configuració existent del projecte."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancel·la i no obris el projecte."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3048,34 +3049,34 @@
"Ja existeix un fitxer de configuració del projecte en %1.\n"
"Voleu sobreescriure'l o obrir el fitxer existent?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Sobreescriu la configuració existent del projecte"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "No s'ha pogut crear el fitxer de configuració %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Voleu tornar a obrir el projecte actual?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Obre / importa un projecte..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Obre o importa un projecte"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3091,19 +3092,19 @@
"directori existent que encara no té un fitxer de projecte del KDevelop 4, es "
"crearà el fitxer."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Recupera un projecte..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Recupera un projecte"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3113,65 +3114,65 @@
"Guia a l'usuari fins a recuperar el projecte i després l'importa al KDevelop "
"4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Tanca el/s projecte/s"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Tanca tots els projectes actualment seleccionats"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Obre la configuració..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Publica el projecte actual..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Publica..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Obre un projecte recent"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Obre un projecte que ha estat obert recentment."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Obre el projecte pel fitxer actual"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "El projecte ja és obert: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Cap document actiu"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "El projecte ja és obert"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3180,12 +3181,12 @@
"El projecte que esteu intentant obrint ja és obert en almenys una altra "
"sessió. Què voleu fer?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Afegeix el projecte a la sessió actual"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Obre la sessió %1"
@@ -3641,19 +3642,19 @@
msgid "Create New Session"
msgstr "Crea una sessió nova"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "fa visible la instància %1 en execució (PID: %2)"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "La instància %1 en execució (PID: %2) aparentment està penjada"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3663,7 +3664,7 @@
"L'aplicació indicada no ha contestat a una crida de D-Bus. Pot estar fallant "
"o està penjada."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3672,7 +3673,7 @@
"Ha fallat en bloquejar la sessió %1, ja està bloquejada per %2 en "
"%3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3680,7 +3681,7 @@
"Ha fallat en bloquejar la sessió %1 (fitxer de bloqueig no "
"disponible)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3690,25 +3691,25 @@
"
Tanqueu la instància de l'aplicació no desitjada o seleccioneu una altra "
"sessió a llançar.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Torna a intentar l'inici"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Seleccioneu una altra sessió"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Ha fallat en bloquejar la sessió %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3816,19 +3817,19 @@
msgid "Configure Environment Variables"
msgstr "Configura les variables d'entorn"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Introduïu una variable..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Mode d'edició per lots"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4396,7 +4397,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nou"
@@ -4681,34 +4682,34 @@
msgid "Select Tool View to Add"
msgstr "Seleccioneu la vista d'eina a afegir"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Conjunt de treball actiu"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Conjunt de treball"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Elimina aquest conjunt de treball. Els documents inclosos no es veuran "
"afectats."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documents:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Afegeix-ho tot"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4717,7 +4718,7 @@
"Afegeix tots els documents que són part d'aquest conjunt de treball al "
"conjunt de treball actiu actualment."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4726,28 +4727,28 @@
"Elimina tots els documents que són part d'aquest conjunt de treball del "
"conjunt de treball actiu actualment."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Clic per obrir i activar aquest document."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Elimina aquest fitxer del conjunt de treball actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Afegeix aquest fitxer al conjunt de treball actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Modificació temporal"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Carrega"
@@ -5187,25 +5188,25 @@
msgid "There are no committed differences."
msgstr "No hi ha cap diferència per entregar (commit)."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Implementació VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Crea una nova branca basada en la branca seleccionada"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Igual que la banca git -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5215,25 +5216,25 @@
"buida) i l'última entrega a la branca seleccionada.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Compara amb la branca"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Baixa a la branca seleccionada"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Baixa"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Fusiona"
@@ -5389,73 +5390,73 @@
msgid "Source Revision"
msgstr "Revisió d'origen"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Actualitza"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Afegeix"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostra les diferències..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Reverteix"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historial..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotació..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostra les diferències..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostra les diferències (tots els fitxers)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Afegeix («Push»)"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Extreu («Pull»)"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "No hi ha cap diferència."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "No s'ha pogut obtenir la diferència."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Historial de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5464,7 +5465,7 @@
"No s'han pogut mostrar les anotacions, falta la interfície KTextEditor::"
"AnnotationInterface per l'editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5475,7 +5476,7 @@
"document o no era un document de text:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copia la revisió"
@@ -5503,40 +5504,40 @@
msgid "Recursive"
msgstr "Recursiu"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Missatge de publicació:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Missatges antics"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Per a una informació més detallada, vegeu la vista d'eina del Control de "
"versions"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "No s'ha pogut publicar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Publicació incorrecta"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Publica"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5549,12 +5550,12 @@
"Amb el missatge:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Quant a la publicació al repositori"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "No s'ha pogut crear cap pedaç per a la versió actual."
@@ -5565,7 +5566,7 @@
msgstr "Diferències entre les revisions %1 i %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Diferències entre revisions"
diff -Nru kdevplatform-5.1.0/po/ca/kdevprojectmanagerview.po kdevplatform-5.1.1/po/ca/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/ca/kdevprojectmanagerview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca/kdevprojectmanagerview.po 2017-05-13 10:12:30.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdevprojectmanagerview.po to Catalan
-# Copyright (C) 2009-2016 This_file_is_part_of_KDE
+# Copyright (C) 2009-2017 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
# Manuel Tortosa Moreno , 2009, 2010.
-# Josep Ma. Ferrer , 2010, 2012, 2013, 2014, 2015, 2016.
+# Josep Ma. Ferrer , 2010, 2012, 2013, 2014, 2015, 2016, 2017.
# Antoni Bella Pérez , 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2016-10-12 15:25+0200\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-05-06 10:50+0100\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca\n"
@@ -20,7 +20,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#. i18n: ectx: Menu (project)
#: kdevprojectmanagerview.rc:5
@@ -198,63 +198,63 @@
#: projectmanagerviewplugin.cpp:244
#, kde-format
-msgid "Create File..."
-msgstr "Crea un fitxer..."
+msgid "Create &File..."
+msgstr "Crea un &fitxer..."
#: projectmanagerviewplugin.cpp:250
#, kde-format
-msgid "Create Folder..."
-msgstr "Crea una carpeta..."
+msgid "Create F&older..."
+msgstr "Crea una &carpeta..."
#: projectmanagerviewplugin.cpp:257
#, kde-format
msgctxt "@action"
-msgid "Build"
-msgstr "Construeix"
+msgid "&Build"
+msgstr "&Construeix"
#: projectmanagerviewplugin.cpp:261
#, kde-format
msgctxt "@action"
-msgid "Install"
-msgstr "Instal·la"
+msgid "&Install"
+msgstr "&Instal·la"
#: projectmanagerviewplugin.cpp:265
#, kde-format
msgctxt "@action"
-msgid "Clean"
-msgstr "Neteja"
+msgid "&Clean"
+msgstr "&Neteja"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
-msgstr "Afegeix al conjunt de construcció"
+msgid "&Add to Build Set"
+msgstr "&Afegeix al conjunt de construcció"
#: projectmanagerviewplugin.cpp:276
#, kde-format
-msgid "Close Project"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] "Tanca el projecte"
+msgstr[0] "&Tanca el projecte"
msgstr[1] "Tanca els projectes"
#: projectmanagerviewplugin.cpp:282
#, kde-format
-msgid "Reload"
-msgstr "Actualitza"
+msgid "&Reload"
+msgstr "&Recarrega"
#: projectmanagerviewplugin.cpp:288
#, kde-format
-msgid "Remove"
-msgstr "Elimina"
+msgid "Remo&ve"
+msgstr "&Elimina"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, kde-format
-msgid "Rename..."
-msgstr "Reanomena..."
+msgid "Re&name..."
+msgstr "Rea&nomena..."
#: projectmanagerviewplugin.cpp:298
#, kde-format
-msgid "Remove From Target"
-msgstr "Elimina de l'objectiu"
+msgid "Remove From &Target"
+msgstr "Elimina de l'objec&tiu"
#: projectmanagerviewplugin.cpp:493
#, kde-format
@@ -278,6 +278,11 @@
msgid "Delete Files"
msgstr "Suprimeix els fitxers"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Reanomena..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/ca@valencia/kdevappwizard.po kdevplatform-5.1.1/po/ca@valencia/kdevappwizard.po
--- kdevplatform-5.1.0/po/ca@valencia/kdevappwizard.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca@valencia/kdevappwizard.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2017-03-04 09:43+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -58,62 +58,62 @@
"Això inicia l'assistent d'aplicacions del KDevelop. Vos ajudarà a generar un "
"esquelet per a la vostra aplicació a partir d'un conjunt de plantilles."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "No s'ha pogut crear el projecte des de plantilla\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Ha fallat en crear el projecte"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Vegeu la vista d'eina del Control de versions"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Error del Sistema de control de versions"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "No s'ha pogut inicialitzar el repositori DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "No s'han pogut afegir fitxers al repositori DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "No s'ha pogut importar el projecte en %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "No s'ha pogut importar el projecte"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "No s'ha pogut baixar el projecte importat"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "No s'ha pogut crear el projecte nou"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "No es pot crear el fitxer %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Plantilles de projecte"
@@ -125,57 +125,57 @@
msgid "Project"
msgstr "Projecte"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoria"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipus de projecte"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obtén més plantilles"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Carrega una plantilla des d'un fitxer"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Ubicació no vàlida"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nom de projecte buit"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nom de projecte no vàlid"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "No s'han pogut crear subdirectoris, falten els permisos a: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Plantilla de projecte no vàlida, per favor, trieu un element del full"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "El camí ja existeix i conté fitxers. Obriu-lo com un projecte."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -202,7 +202,7 @@
msgid "Location:"
msgstr "Ubicació:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/ca@valencia/kdevgrepview.po kdevplatform-5.1.1/po/ca@valencia/kdevgrepview.po
--- kdevplatform-5.1.0/po/ca@valencia/kdevgrepview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca@valencia/kdevgrepview.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-03-04 09:56+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -106,39 +106,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Línia %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 coincidència"
msgstr[1] "%1 coincidències"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 fitxer"
msgstr[1] "%1 fitxers"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 a %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (una coincidència)"
msgstr[1] "%2 (%1 coincidències)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/ca@valencia/kdevpatchreview.po kdevplatform-5.1.1/po/ca@valencia/kdevpatchreview.po
--- kdevplatform-5.1.0/po/ca@valencia/kdevpatchreview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca@valencia/kdevpatchreview.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-10 15:34+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
@@ -28,55 +28,55 @@
msgstr "Pedaç personalitzat"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Pedaç"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Base del pedaç..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Des del fitxer"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Ubicació del pedaç..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Des d'una orde"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Eixida de l'orde..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Ja s'ha aplicat el pedaç en la versió local"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Ja s'ha aplicat"
diff -Nru kdevplatform-5.1.0/po/ca@valencia/kdevplatform.po kdevplatform-5.1.1/po/ca@valencia/kdevplatform.po
--- kdevplatform-5.1.0/po/ca@valencia/kdevplatform.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca@valencia/kdevplatform.po 2017-05-13 10:12:30.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-03-04 10:01+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -354,8 +354,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Elimina"
@@ -485,7 +485,7 @@
msgstr "Expressions recents"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Elimina-ho tot"
@@ -629,6 +629,14 @@
msgid "Failed to apply changes: %1"
msgstr "Ha fallat en aplicar els canvis: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Reanomena"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -752,13 +760,6 @@
msgid "Applying changes failed: %1"
msgstr "Ha fallat en aplicar els canvis: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Reanomena"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1587,27 +1588,27 @@
msgid "Various items"
msgstr "Elements diversos"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "No s'ha pogut eliminar la carpeta %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "No s'ha pogut eliminar el fitxer %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "El fitxer %1 ja existeix."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "No s'ha pogut crear el fitxer %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "No s'ha pogut crear la carpeta %1."
@@ -1789,12 +1790,12 @@
msgid "&Color Theme"
msgstr "Tema de &color"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configura"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1803,7 +1804,7 @@
"L'arranjament del mòdul actual ha canviat.\n"
"Voleu aplicar els canvis o descartar-los?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Aplica l'arranjament"
@@ -2915,18 +2916,18 @@
msgid "Show detailed progress window"
msgstr "Mostra la finestra de progrés detallat"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "S'està carregant el projecte %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "S'està carregant %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2935,24 +2936,24 @@
"No s'ha pogut carregar el fitxer de projecte %1. El projecte ha estat "
"eliminat de la sessió."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"No s'ha pogut crear el directori ocult (%1) pel fitxer del desenvolupador"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "No s'ha pogut obtindre el fitxer de projecte: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"No s'ha pogut carregar %1, ja està obert un projecte amb el mateix nom «%2»."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
@@ -2962,7 +2963,7 @@
" Comproveu que hi ha instal·lats els programes requerits, o vegeu "
"l'eixida de la consola per a més informació."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2971,12 +2972,12 @@
"el connector d'importació del projecte (%1) no permet la interfície "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "No s'ha pogut obrir el projecte"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2986,32 +2987,32 @@
"desenvolupador.\n"
"Atenció: els arranjaments del projecte que heu modificat es perdran."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configura el projecte %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Ubicació no vàlida: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "El projecte ja s'està obrint"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Ja s'està obrint %1, no s'obrirà de nou"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Sobreescriu"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3020,12 +3021,12 @@
"Continua obrint el projecte i usa la configuració del projecte que es "
"proporciona."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Obri el fitxer existent"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3033,13 +3034,13 @@
msgstr ""
"Continua obrint el projecte però usa la configuració existent del projecte."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancel·la i no òbrigues el projecte."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3048,34 +3049,34 @@
"Ja existeix un fitxer de configuració del projecte en %1.\n"
"Voleu sobreescriure'l o obrir el fitxer existent?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Sobreescriu la configuració existent del projecte"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "No s'ha pogut crear el fitxer de configuració %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Voleu tornar a obrir el projecte actual?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Obri / importa un projecte..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Obri o importa un projecte"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3091,19 +3092,19 @@
"directori existent que encara no té un fitxer de projecte del KDevelop 4, es "
"crearà el fitxer."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Recupera un projecte..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Recupera un projecte"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3113,65 +3114,65 @@
"Guia a l'usuari fins a recuperar el projecte i després l'importa al KDevelop "
"4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Tanca el/s projecte/s"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Tanca tots els projectes actualment seleccionats"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Obri la configuració..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Publica el projecte actual..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Publica..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Obri un projecte recent"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Obri un projecte que ha estat obert recentment."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Obri el projecte pel fitxer actual"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "El projecte ja és obert: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Cap document actiu"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "El projecte ja és obert"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3180,12 +3181,12 @@
"El projecte que esteu intentant obrint ja és obert en almenys una altra "
"sessió. Què voleu fer?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Afig el projecte a la sessió actual"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Obri la sessió %1"
@@ -3641,19 +3642,19 @@
msgid "Create New Session"
msgstr "Crea una sessió nova"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "fa visible la instància %1 en execució (PID: %2)"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "La instància %1 en execució (PID: %2) aparentment està penjada"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3663,7 +3664,7 @@
"L'aplicació indicada no ha contestat a una crida de D-Bus. Pot estar fallant "
"o està penjada."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3672,7 +3673,7 @@
"Ha fallat en bloquejar la sessió %1, ja està bloquejada per %2 en "
"%3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3680,7 +3681,7 @@
"Ha fallat en bloquejar la sessió %1 (fitxer de bloqueig no "
"disponible)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3690,25 +3691,25 @@
"
Tanqueu la instància de l'aplicació no desitjada o seleccioneu una altra "
"sessió a llançar.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Torna a intentar l'inici"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Seleccioneu una altra sessió"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Ha fallat en bloquejar la sessió %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3816,19 +3817,19 @@
msgid "Configure Environment Variables"
msgstr "Configura les variables d'entorn"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Introduïu una variable..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Mode d'edició per lots"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4396,7 +4397,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nou"
@@ -4681,34 +4682,34 @@
msgid "Select Tool View to Add"
msgstr "Seleccioneu la vista d'eina a afegir"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Conjunt de treball actiu"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Conjunt de treball"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Elimina este conjunt de treball. Els documents inclosos no es veuran "
"afectats."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documents:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Afig-ho tot"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4717,7 +4718,7 @@
"Afig tots els documents que són part d'este conjunt de treball al conjunt de "
"treball actiu actualment."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4726,28 +4727,28 @@
"Elimina tots els documents que són part d'este conjunt de treball del "
"conjunt de treball actiu actualment."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Clic per obrir i activar este document."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Elimina este fitxer del conjunt de treball actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Afig este fitxer al conjunt de treball actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Modificació temporal"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Carrega"
@@ -5187,25 +5188,25 @@
msgid "There are no committed differences."
msgstr "No hi ha cap diferència per entregar (commit)."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Implementació VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Crea una nova branca basada en la branca seleccionada"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Igual que la banca git -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5215,25 +5216,25 @@
"buida) i l'última entrega a la branca seleccionada.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Compara amb la branca"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Baixa a la branca seleccionada"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Baixa"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Fusiona"
@@ -5389,73 +5390,73 @@
msgid "Source Revision"
msgstr "Revisió d'origen"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Actualitza"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Afig"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostra les diferències..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Reverteix"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historial..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotació..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostra les diferències..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostra les diferències (tots els fitxers)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Afig («Push»)"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Extreu («Pull»)"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "No hi ha cap diferència."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "No s'ha pogut obtindre la diferència."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Historial de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5464,7 +5465,7 @@
"No s'han pogut mostrar les anotacions, falta la interfície KTextEditor::"
"AnnotationInterface per l'editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5475,7 +5476,7 @@
"document o no era un document de text:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copia la revisió"
@@ -5503,40 +5504,40 @@
msgid "Recursive"
msgstr "Recursiu"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Missatge de publicació:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Missatges antics"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Per a una informació més detallada, vegeu la vista d'eina del Control de "
"versions"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "No s'ha pogut publicar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Publicació incorrecta"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Publica"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5549,12 +5550,12 @@
"Amb el missatge:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Quant a la publicació al repositori"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "No s'ha pogut crear cap pedaç per a la versió actual."
@@ -5565,7 +5566,7 @@
msgstr "Diferències entre les revisions %1 i %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Diferències entre revisions"
diff -Nru kdevplatform-5.1.0/po/ca@valencia/kdevprojectmanagerview.po kdevplatform-5.1.1/po/ca@valencia/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/ca@valencia/kdevprojectmanagerview.po 2017-03-13 19:05:02.000000000 +0000
+++ kdevplatform-5.1.1/po/ca@valencia/kdevprojectmanagerview.po 2017-05-13 10:12:30.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdevprojectmanagerview.po to Catalan (Valencian)
-# Copyright (C) 2009-2016 This_file_is_part_of_KDE
+# Copyright (C) 2009-2017 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
# Manuel Tortosa Moreno , 2009, 2010.
-# Josep Ma. Ferrer , 2010, 2012, 2013, 2014, 2015, 2016.
+# Josep Ma. Ferrer , 2010, 2012, 2013, 2014, 2015, 2016, 2017.
# Antoni Bella Pérez , 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2016-10-12 15:25+0200\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-05-06 10:50+0100\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
@@ -20,7 +20,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#. i18n: ectx: Menu (project)
#: kdevprojectmanagerview.rc:5
@@ -198,63 +198,63 @@
#: projectmanagerviewplugin.cpp:244
#, kde-format
-msgid "Create File..."
-msgstr "Crea un fitxer..."
+msgid "Create &File..."
+msgstr "Crea un &fitxer..."
#: projectmanagerviewplugin.cpp:250
#, kde-format
-msgid "Create Folder..."
-msgstr "Crea una carpeta..."
+msgid "Create F&older..."
+msgstr "Crea una &carpeta..."
#: projectmanagerviewplugin.cpp:257
#, kde-format
msgctxt "@action"
-msgid "Build"
-msgstr "Construeix"
+msgid "&Build"
+msgstr "&Construeix"
#: projectmanagerviewplugin.cpp:261
#, kde-format
msgctxt "@action"
-msgid "Install"
-msgstr "Instal·la"
+msgid "&Install"
+msgstr "&Instal·la"
#: projectmanagerviewplugin.cpp:265
#, kde-format
msgctxt "@action"
-msgid "Clean"
-msgstr "Neteja"
+msgid "&Clean"
+msgstr "&Neteja"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
-msgstr "Afig al conjunt de construcció"
+msgid "&Add to Build Set"
+msgstr "&Afig al conjunt de construcció"
#: projectmanagerviewplugin.cpp:276
#, kde-format
-msgid "Close Project"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] "Tanca el projecte"
+msgstr[0] "&Tanca el projecte"
msgstr[1] "Tanca els projectes"
#: projectmanagerviewplugin.cpp:282
#, kde-format
-msgid "Reload"
-msgstr "Actualitza"
+msgid "&Reload"
+msgstr "&Recarrega"
#: projectmanagerviewplugin.cpp:288
#, kde-format
-msgid "Remove"
-msgstr "Elimina"
+msgid "Remo&ve"
+msgstr "&Elimina"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, kde-format
-msgid "Rename..."
-msgstr "Reanomena..."
+msgid "Re&name..."
+msgstr "Rea&nomena..."
#: projectmanagerviewplugin.cpp:298
#, kde-format
-msgid "Remove From Target"
-msgstr "Elimina de l'objectiu"
+msgid "Remove From &Target"
+msgstr "Elimina de l'objec&tiu"
#: projectmanagerviewplugin.cpp:493
#, kde-format
@@ -278,6 +278,11 @@
msgid "Delete Files"
msgstr "Suprimeix els fitxers"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Reanomena..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/cs/kdevappwizard.po kdevplatform-5.1.1/po/cs/kdevappwizard.po
--- kdevplatform-5.1.0/po/cs/kdevappwizard.po 2017-03-13 19:05:03.000000000 +0000
+++ kdevplatform-5.1.1/po/cs/kdevappwizard.po 2017-05-13 10:12:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2014-03-07 11:36+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
@@ -51,62 +51,62 @@
"skeleton for your application from a set of templates."
msgstr ""
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Nepovedlo se vytvořit nový projekt ze šablony\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Nepovedlo se vytvořit nový projekt"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Chyba systému pro správu verzí"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr ""
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr ""
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Nepovedlo se importovat projekt do %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Projekt nelze importovat "
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr ""
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Nepovedlo se vytvořit projekt"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Soubor %1 nemohl být vytvořen."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr ""
@@ -118,57 +118,57 @@
msgid "Project"
msgstr "Projekt"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Kategorie"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Typ projektu"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Získat více šablon"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Načíst šablonu ze souboru"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Neplatné umístění"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Prázdný název projektu"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Neplatný název projektu"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr ""
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr ""
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr ""
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -193,7 +193,7 @@
msgid "Location:"
msgstr "Umístění:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/cs/kdevgrepview.po kdevplatform-5.1.1/po/cs/kdevgrepview.po
--- kdevplatform-5.1.0/po/cs/kdevgrepview.po 2017-03-13 19:05:03.000000000 +0000
+++ kdevplatform-5.1.1/po/cs/kdevgrepview.po 2017-05-13 10:12:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-02-21 17:12+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
@@ -103,12 +103,12 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Řádek %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
@@ -116,7 +116,7 @@
msgstr[1] "%1 shody"
msgstr[2] "%1 shod"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
@@ -124,13 +124,13 @@
msgstr[1] "%1 soubory"
msgstr[2] "%1 souborů"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr ""
@@ -5297,7 +5298,7 @@
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr ""
diff -Nru kdevplatform-5.1.0/po/cs/kdevprojectmanagerview.po kdevplatform-5.1.1/po/cs/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/cs/kdevprojectmanagerview.po 2017-03-13 19:05:03.000000000 +0000
+++ kdevplatform-5.1.1/po/cs/kdevprojectmanagerview.po 2017-05-13 10:12:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2016-11-02 12:47+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
@@ -190,64 +190,75 @@
msgstr ""
#: projectmanagerviewplugin.cpp:244
-#, kde-format
-msgid "Create File..."
+#, fuzzy, kde-format
+#| msgid "Create File..."
+msgid "Create &File..."
msgstr "Vytvořit soubor..."
#: projectmanagerviewplugin.cpp:250
-#, kde-format
-msgid "Create Folder..."
+#, fuzzy, kde-format
+#| msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Vytvořit složku..."
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
-msgstr "Sestavení"
+msgid "&Build"
+msgstr "Překlad"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
-msgstr "Nainstalovat"
+msgid "&Install"
+msgstr "Instalovat"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Vyčistit"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr ""
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Zavřít projekt"
msgstr[1] "Zavřít projekty"
msgstr[2] "Zavřít projekty"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Obnovit"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Odstranit"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Přejmenovat..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Odstranit z cíle"
#: projectmanagerviewplugin.cpp:493
@@ -273,6 +284,11 @@
msgid "Delete Files"
msgstr "Smazat soubory"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Přejmenovat..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/da/kdevappwizard.po kdevplatform-5.1.1/po/da/kdevappwizard.po
--- kdevplatform-5.1.0/po/da/kdevappwizard.po 2017-03-13 19:05:08.000000000 +0000
+++ kdevplatform-5.1.1/po/da/kdevappwizard.po 2017-05-13 10:12:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2014-03-09 15:34+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -55,62 +55,62 @@
"Dette starter KDevelops applikationsguide. Den hjælper dig med at generere "
"en grundstruktur til din applikation fra et sæt af skabeloner."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Kunne ikke oprette projektet fra skabelon\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Kunne ikke oprette projekt"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Se værktøjsvisningen til versionsstyring"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Fejl i versionstyringssystem"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Kunne ikke initialisere filer til DVCS-depot"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Kunne ikke tilføje filer til DVCS-depot"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Kunne ikke importere projekt til %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Kunne ikke importere projekt"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Kunne ikke checke det importerede projekt ud"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Kunne ikke oprette et nyt projekt"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Filen %1 kan ikke oprettes."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Projektskabeloner"
@@ -122,58 +122,58 @@
msgid "Project"
msgstr "Projekt"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Kategori"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Projekttype"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Hent flere skabeloner"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Indlæs skabelon fra fil"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Ugyldig placering"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Tomt projektnavn"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Ugyldigt projektnavn"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Kan ikke oprette undermapper, der mangler rettigheder på: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Ugyldig projektskabelon, vælg venligst et leaf-element"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
#| msgid "Path already exists and contains files"
msgid "Path already exists and contains files. Open it as a project."
msgstr "Stien findes allerede og indeholder filer"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -198,7 +198,7 @@
msgid "Location:"
msgstr "Placering:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/da/kdevgrepview.po kdevplatform-5.1.1/po/da/kdevgrepview.po
--- kdevplatform-5.1.0/po/da/kdevgrepview.po 2017-03-13 19:05:08.000000000 +0000
+++ kdevplatform-5.1.1/po/da/kdevgrepview.po 2017-05-13 10:12:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2014-03-05 19:21+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -104,39 +104,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Linje %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 fund"
msgstr[1] "%1 fund"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 fil"
msgstr[1] "%1 filer"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 i %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (ét fund)"
msgstr[1] "%2 (%1 fund)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/da/kdevpatchreview.po kdevplatform-5.1.1/po/da/kdevpatchreview.po
--- kdevplatform-5.1.0/po/da/kdevpatchreview.po 2017-03-13 19:05:08.000000000 +0000
+++ kdevplatform-5.1.1/po/da/kdevpatchreview.po 2017-05-13 10:12:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2014-01-26 17:34+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -25,55 +25,55 @@
msgstr "Tilpasset rettelse"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Rettelse"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Føj rettelse til base..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "fra fil"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Føj rettelse til placering..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Fra kommando"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Kommandoens output..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Rettelsen er allerede anvendt på lokal version"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Allerede anvendt"
diff -Nru kdevplatform-5.1.0/po/da/kdevplatform.po kdevplatform-5.1.1/po/da/kdevplatform.po
--- kdevplatform-5.1.0/po/da/kdevplatform.po 2017-03-13 19:05:08.000000000 +0000
+++ kdevplatform-5.1.1/po/da/kdevplatform.po 2017-05-13 10:12:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2014-08-24 21:50+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -356,8 +356,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Slet"
@@ -486,7 +486,7 @@
msgstr "Nylige udtryk"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Fjern alle"
@@ -630,6 +630,14 @@
msgid "Failed to apply changes: %1"
msgstr "Kunne ikke anvende ændringer: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Omdøb"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -756,13 +764,6 @@
msgid "Applying changes failed: %1"
msgstr "Kunne ikke anvende ændringer: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Omdøb"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1598,27 +1599,27 @@
msgid "Various items"
msgstr "Diverse elementer"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Kan ikke fjerne mappen %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Kan ikke fjerne filen %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Filen %1 findes allerede."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Kan ikke oprette fil %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Kan ikke oprette mappe %1."
@@ -1798,21 +1799,21 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, fuzzy, kde-format
#| msgctxt "@info:status"
#| msgid "configure"
msgid "Configure"
msgstr "konfigurér"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
msgstr ""
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr ""
@@ -2924,18 +2925,18 @@
msgid "Show detailed progress window"
msgstr "Vis detaljeret fremgangsvindue"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Indlæser projekt %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Indlæser %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2944,30 +2945,30 @@
"Kan ikke indlæse projektfilen %1. Projektet er blevet fjernet fra "
"sessionen."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Kunne ikke oprette skjult mappe (%1) for udvikler-fil"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Kunne ikke hente projektfil: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Kunne ikke indlæse %1, et projekt med samme navn \"%2\" er allerede åbent."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2976,12 +2977,12 @@
"plugin til projektimport (%1) understøtter ikke IProjectFileManager-"
"grænsefladen."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Kunne ikke åbne projekt"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2990,32 +2991,32 @@
"Kunne ikke gemme udviklerspecifikke projektindstillinger.\n"
"Bemærk: Projektindstillingerne du ændrede vil blive tabt."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Indstil projekt %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Ugyldig placering: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projektet bliver allerede åbnet"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Åbner allerede %1, åbner ikke igen"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Tilsidesæt"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3023,12 +3024,12 @@
msgstr ""
"Fortsæt med at åbne projekt og brug den netop angivne projektkonfiguration."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Åbn eksisterende fil"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3037,13 +3038,13 @@
"Fortsæt med at åbne projektet, men brug den eksisterende "
"projektkonfiguration."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Annullér og åbn ikke projektet."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3052,34 +3053,34 @@
"Der findes allerede en projektkonfigurationsfil på %1.\n"
"Vil du tilsidesætte den eller åbne den eksisterende fil?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Tilsidesæt eksisterende projektkonfigurationsfil"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Kan ikke oprette indstillingsfil %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Genåbn det nuværende projekt?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Åbn/importér projekt..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Åbn eller importér projekt"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, fuzzy, kde-format
#| msgctxt "@info:whatsthis"
#| msgid ""
@@ -3102,19 +3103,19 @@
"mappe åbnes, som endnu ikke har en KDevelop4-projektfil, vil denne blive "
"oprettet."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Hent projekt..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Hent projekt"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3124,65 +3125,65 @@
"Guider brugeren igennem projekthentningen og importerer det derefter til "
"KDevelop 4"
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Luk projekt(er)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Lukker alle valgte projekter"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Åben indstillinger..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Commit nuværende projekt..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Commit..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Åbn nyligt projekt"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Åbner nyligt åbnet projekt."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Åbn projekt for nuværende fil"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Projekt allerede åbent: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Intet aktivt dokument"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Projektet er allerede åbent"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3191,12 +3192,12 @@
"Det projekt du er ved at åbne, er allerede åbent i mindst én anden session."
" Hvad vil du gøre?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Føj projekt til aktuel session"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Åbn sessionen %1"
@@ -3653,19 +3654,19 @@
msgid "Create New Session"
msgstr "Opret ny session"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "gjorde kørende instans af %1 (PID: %2) synlig"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "kørende instans af %1 (PID: %2) hænger tilsyneladende"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3675,7 +3676,7 @@
"Den givne applikation svarede ikke på et DBus-kald. Den kan være brudt "
"sammen eller hænger."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3683,13 +3684,13 @@
msgstr ""
"Kunne ikke låse sessionen %1, allerede låst af %2 på %3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
msgstr "Kunne ikke låse sessionen %1 (lock-fil ikke tilgængelig)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3699,25 +3700,25 @@
"
Luk den problematiske applikationsinstans eller vælg en anden session at "
"starte.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Prøv opstart igen"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Vælg en anden session"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Kunne ikke låse sessionen %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3831,19 +3832,19 @@
msgid "Configure Environment Variables"
msgstr "indstil miljøvariable"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Angiv variabel..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr ""
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, fuzzy, kde-format
#| msgctxt "project name (branch name)"
#| msgid "%1 (%2)"
@@ -4425,7 +4426,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Ny"
@@ -4709,32 +4710,32 @@
msgid "Select Tool View to Add"
msgstr "Vælg den værktøjsvisning der skal tilføjes"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Aktivt arbejdssæt"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Arbejdssæt"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr "Fjern dette arbejdssæt. Det indeholdte dokument bliver ikke påvirket."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Dokumenter:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Tilføj alle"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4743,7 +4744,7 @@
"Føj alle dokumenter der er en del af dette arbejdssæt til det aktive "
"arbejdssæt."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4752,28 +4753,28 @@
"Fjern alle dokumenter der er en del af dette arbejdssæt fra det aktive "
"arbejdssæt"
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Klik for at åbne og aktivere dette dokument."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Fjern denne fil fra nuværende arbejds sæt"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Føj denne fil til nuværende arbejdssæt"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Stash"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Indlæs"
@@ -5209,25 +5210,25 @@
msgid "There are no committed differences."
msgstr "Der er ingen forskelle."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "VCS understøttelse"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Opretter en ny branch baseret på den valgte branch"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Det samme som git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5235,26 +5236,26 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, fuzzy, kde-format
#| msgid "Compare to Base..."
msgid "Compare to Branch"
msgstr "Sammenlign med Base..."
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Checkout til den valgte branch"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Checkout"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr ""
@@ -5410,73 +5411,73 @@
msgid "Source Revision"
msgstr "Kilde revision"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Opdatér"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Tilføj"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Vis forskelle..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Gå tilbage"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historik..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Annotation..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Vis diff..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Vis diff (alle filer)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Push"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Pull"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Der er ingen forskelle."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Kunne ikke læse forskellen."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2-historik (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5485,7 +5486,7 @@
"Kan ikke vise annotationer, grænsefladen KTextEditor::AnnotationInterface "
"mangler for editoren."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5496,7 +5497,7 @@
"ikke var et tekstdokument:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Kopiér revision"
@@ -5525,39 +5526,39 @@
msgid "Recursive"
msgstr "Rekursivt"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Commit-besked:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Gamle beskeder"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"For mere detaljeret information se værktøjsvisningen til versionsstyring"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Kan ikke committe"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Commit ikke gennemført"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Commit"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5570,12 +5571,12 @@
"med beskeden:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Skal til at committe til depot"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Kunne ikke oprette en rettelse til den aktuelle version."
@@ -5586,7 +5587,7 @@
msgstr "Forskel mellem revision %1 og %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Forskel mellem revisioner"
diff -Nru kdevplatform-5.1.0/po/da/kdevprojectmanagerview.po kdevplatform-5.1.1/po/da/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/da/kdevprojectmanagerview.po 2017-03-13 19:05:08.000000000 +0000
+++ kdevplatform-5.1.1/po/da/kdevprojectmanagerview.po 2017-05-13 10:12:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2014-02-10 20:36+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -194,63 +194,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Opret fil"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Opret mappe"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Byg"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Installér"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Ryd op"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Føj til buildset"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Luk projekt"
msgstr[1] "Luk projekter"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Genindlæs"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Fjern"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Omdøb..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Fjern fra mål"
#: projectmanagerviewplugin.cpp:493
@@ -275,6 +285,11 @@
msgid "Delete Files"
msgstr "Slet filer"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Omdøb..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/de/kdevappwizard.po kdevplatform-5.1.1/po/de/kdevappwizard.po
--- kdevplatform-5.1.0/po/de/kdevappwizard.po 2017-03-13 19:05:04.000000000 +0000
+++ kdevplatform-5.1.1/po/de/kdevappwizard.po 2017-05-13 10:12:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-03-09 21:03+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
@@ -53,62 +53,62 @@
"Der KDevelop-Anwendungsassistent wird gestartet. Er unterstützt Sie bei der "
"Erstellung Ihres Anwendungsgerüstes mit Hilfe von Vorlagen."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Das Projekt kann nicht aus der Vorlage erstellt werden\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Anlegen des Projekt ist fehlgeschlagen"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Überprüfen Sie dies bitte in der Werkzeugansicht Versionsverwaltung."
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Fehler im Versionsverwaltungssystem"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Das DVCS-Archiv kann nicht initialisiert werden."
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Dem DVCS-Archiv können keine Dateien hinzugefügt werden."
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Das Projekt kann nicht nach %1 importiert werden."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Das Projekt kann nicht importiert werden."
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Das importierte Projekt kann nicht ausgecheckt werden."
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Das neue Projekt kann nicht angelegt werden"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Die Datei %1 kann nicht erstellt werden."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Projektvorlagen"
@@ -120,61 +120,61 @@
msgid "Project"
msgstr "Projekt"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Kategorie"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Projektart"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Mehr Vorlagen herunterladen"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Vorlage aus Datei laden"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Ungültige Adresse"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Leerer Projektname"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Ungültiger Projektname"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr ""
"Es ist nicht möglich, Unterordner anzulegen; es fehlen Zugriffsrechte auf: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr ""
"Ungültige Projektvorlage, bitte wählen Sie einen Eintrag aus der untersten "
"Ebene des Baumes aus."
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr ""
"Der Pfad existiert bereits und enthält Dateien. Öffnen Sie ihn als Projekt."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -201,7 +201,7 @@
msgid "Location:"
msgstr "Arbeitsordner:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/de/kdevgit.po kdevplatform-5.1.1/po/de/kdevgit.po
--- kdevplatform-5.1.0/po/de/kdevgit.po 2017-03-13 19:05:04.000000000 +0000
+++ kdevplatform-5.1.1/po/de/kdevgit.po 2017-05-13 10:12:31.000000000 +0000
@@ -6,7 +6,7 @@
"Project-Id-Version: kdevgit\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2017-03-06 16:00+0100\n"
+"PO-Revision-Date: 2017-03-27 15:07+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
@@ -74,7 +74,7 @@
#, kde-format
msgid "Unable to find git executable. Is it installed on the system?"
msgstr ""
-"Die „git“-Programmdatei ist nicht auffindbar. Ist sie auf Ihrem System "
+"Die „git“-Programmdatei wurde nicht gefunden. Ist sie auf Ihrem System "
"installiert?"
#: gitplugin.cpp:233
diff -Nru kdevplatform-5.1.0/po/de/kdevgrepview.po kdevplatform-5.1.1/po/de/kdevgrepview.po
--- kdevplatform-5.1.0/po/de/kdevgrepview.po 2017-03-13 19:05:04.000000000 +0000
+++ kdevplatform-5.1.1/po/de/kdevgrepview.po 2017-05-13 10:12:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-03-06 16:01+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
@@ -102,39 +102,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Zeile %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 Übereinstimmung"
msgstr[1] "%1 Übereinstimmungen"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 Datei"
msgstr[1] "%1 Dateien"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 in %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (eine Übereinstimmung)"
msgstr[1] "%2 (%1 Übereinstimmungen)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/de/kdevpatchreview.po kdevplatform-5.1.1/po/de/kdevpatchreview.po
--- kdevplatform-5.1.0/po/de/kdevpatchreview.po 2017-03-13 19:05:04.000000000 +0000
+++ kdevplatform-5.1.1/po/de/kdevpatchreview.po 2017-05-13 10:12:31.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-09-20 21:07+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
@@ -22,55 +22,55 @@
msgstr "Eigener Patch"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Patch"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Basisordner des Patches ..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Aus Datei"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Ort des Patches ..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Aus Befehl"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Befehl zur Ausgabe ..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Patch ist bereits auf die lokale Version angewendet"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Bereits angewendet"
diff -Nru kdevplatform-5.1.0/po/de/kdevplatform.po kdevplatform-5.1.1/po/de/kdevplatform.po
--- kdevplatform-5.1.0/po/de/kdevplatform.po 2017-03-13 19:05:04.000000000 +0000
+++ kdevplatform-5.1.1/po/de/kdevplatform.po 2017-05-13 10:12:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-03-06 16:03+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
@@ -351,8 +351,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Löschen"
@@ -484,7 +484,7 @@
msgstr "Letzte Ausdrücke"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Alle entfernen"
@@ -628,6 +628,14 @@
msgid "Failed to apply changes: %1"
msgstr "Anwenden der Änderungen ist fehlgeschlagen: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Umbenennen"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -753,13 +761,6 @@
msgid "Applying changes failed: %1"
msgstr "Anwenden folgender Änderungen fehlgeschlagen: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Umbenennen"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1585,27 +1586,27 @@
msgid "Various items"
msgstr "Verschiedene Elemente"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Der Ordner %1 kann nicht gelöscht werden."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Die Datei %1 kann nicht gelöscht werden."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Die Datei %1 existiert bereits."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Die Datei %1 kann nicht angelegt werden."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Der Ordner %1 kann nicht angelegt werden."
@@ -1787,12 +1788,12 @@
msgid "&Color Theme"
msgstr "&Farbschema"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Einrichten"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1801,7 +1802,7 @@
"Die Einstellungen im aktuellen Modul wurden geändert.\n"
"Möchten Sie die Änderungen anwenden oder verwerfen?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Einstellungen anwenden"
@@ -2913,18 +2914,18 @@
msgid "Show detailed progress window"
msgstr "Ausführlichen Fortschrittsdialog anzeigen"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Projekt %1 wird geladen"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "%1 wird geladen"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2933,31 +2934,31 @@
"Die Projektdatei %1 kann nicht geladen werden. Das Projekt wurde aus der "
"Sitzung entfernt."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Versteckter Ordner (%1) für Entwicklerdatei kann nicht erstellt werden"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Die Projektdatei %1 kann nicht geholt werden"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"%1 kann nicht geladen werden, ein Projekt mit dem gleichen Namen „%2“ ist "
"bereits geöffnet."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2966,12 +2967,12 @@
"Das Modul für den Projekt-Import (%1) überstützt das IProjectFileManager-"
"Interface nicht."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Das Projekt kann nicht geöffnet werden"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2980,32 +2981,32 @@
"Entwicklerspezifische Projekteinstellungen können nicht gespeichert werden.\n"
"Achtung: Die von Ihnen geänderten Projekteinstellungen gehen verloren."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Projekt %1 einrichten"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Ungültige Adresse: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Das Projekt wird bereits geöffnet"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "%1 wird bereits geöffnet, es wird nicht noch einmal geöffnet"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Überschreiben"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3014,12 +3015,12 @@
"Öffnen des Projekts wird mit der eben angegebenen Projektkonfiguration "
"fortgesetzt."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Existierende Datei öffnen"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3028,13 +3029,13 @@
"Öffnen des Projekts wird mit der bestehenden Projektkonfiguration "
"fortgesetzt."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Abbrechen und das Projekt nicht öffnen."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3043,34 +3044,34 @@
"Es gibt bereits eine Projektkonfigurationsdatei in %1.\n"
"Möchten Sie diese Datei überschreiben oder sie verwenden?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Bestehende Projektkonfigurationsdatei überschreiben"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Die Konfigurationsdatei %1 kann nicht erstellt werden"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Das aktuelle Projekt neu öffnen?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Projekt öffnen/importieren ..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Projekt öffnen oder importieren"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3086,19 +3087,19 @@
"eines Ordners, der noch keine KDevelop4-Projektdatei hat, wird diese Datei "
"neu angelegt.-"
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Projekt holen ..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Projekt holen"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3108,65 +3109,65 @@
"Führt den Anwender durch den Vorgang des Projektabrufs und importiert es "
"dann in KDevelop4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Projekt(e) schließen"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Alle aktuell ausgewählten Projekte schließen"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Einstellungen öffnen ..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Aktuelles Projekt einspielen ..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Einspielen ..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Kürzlich verwendetes Projekt öffnen"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Kürzlich verwendetes Projekt öffnen"
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Projekt der aktuellen Datei öffnen"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Das Projekt ist bereits geöffnet: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Kein aktives Dokument"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Das Projekt ist bereits geöffnet"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3175,12 +3176,12 @@
"Das Projekt, das Sie gerade öffnen, ist bereits in mindestens einer anderen "
"Sitzung geöffnet. Was möchten Sie tun?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Projekt zur aktuellen Sitzung hinzufügen"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Sitzung %1 öffnen"
@@ -3635,19 +3636,19 @@
msgid "Create New Session"
msgstr "Neue Sitzung erstellen"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "Die laufende Instanz %1 (PID: %2) wurde angezeigt"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "Die laufende Instanz %1 (PID: %2) ist anscheinend hängen geblieben."
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3657,7 +3658,7 @@
"Die angegebene Anwendung antwortete nicht auf einen D-Bus-Aufruf, "
"möglicherweise ist sie abgestürzt oder hängt."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3666,13 +3667,13 @@
"Sperren der Sitzung %1 fehlgeschlagen. ist bereits durch %2 auf %3 "
"(PID %4) gesperrt."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
msgstr "Sperren der Sitzung %1 (Sperrdatei nicht verfügbar)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3682,25 +3683,25 @@
"
Bitte schließen Sie die fehlerhafte Instanz der Anwendung oder wählen Sie "
"eine andere Sitzung zum Starten.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Programmstart erneut versuchen"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Andere Sitzung auswählen"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Sperren der Sitzung %1 fehlgeschlagen."
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3809,19 +3810,19 @@
msgid "Configure Environment Variables"
msgstr "Umgebungsvariablen einrichten"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Variable eingeben ..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Stapelbearbeitungsmodus"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4389,7 +4390,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Neu"
@@ -4674,34 +4675,34 @@
msgid "Select Tool View to Add"
msgstr "Wählen Sie die Werkzeugansicht, die Sie hinzufügen möchten"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Aktiver Dokumentensatz"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Dokumentensatz"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Diesen Dokumentensatz löschen. Die enthaltenen Dokumente sind nicht "
"betroffen."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Dokumente:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Alle hinzufügen"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4710,7 +4711,7 @@
"Alle Dokumente, die zu diesem Dokumentensatz gehören, zum derzeit aktiven "
"Dokumentensatz hinzufügen."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4719,28 +4720,28 @@
"Alle Dokumente, die zu diesem Dokumentensatz gehören, aus dem derzeit "
"aktiven Dokumentensatz entfernen."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Klicken Sie, um dieses Dokument zu öffnen."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Diese Datei aus dem aktiven Dokumentensatz entfernen"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Diese Datei zum aktiven Dokumentensatz hinzufügen"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Stash"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Laden"
@@ -5185,25 +5186,25 @@
msgid "There are no committed differences."
msgstr "Es gibt keine Unterschiede"
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "VCS-Unterstützung"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Erstellt neuen Zweig aufbauend auf dem ausgewählten Zweig"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Entspricht „git branch -D“"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5211,25 +5212,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Mit Branch vergleichen"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "In den ausgewählten Zweig auslesen"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Auslesen"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Zusammenführen"
@@ -5385,73 +5386,73 @@
msgid "Source Revision"
msgstr "Quell-Revision"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Aktualisieren"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Hinzufügen"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Unterschiede anzeigen ..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Zurücksetzen"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Verlauf ..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anmerkung ..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Unterschiede anzeigen ..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Unterschiede anzeigen (alle Dateien) ..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Push"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Aktualisieren"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Es gibt keine Unterschiede"
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Unterschiede können nicht geholt werden."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2-Verlauf (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5460,7 +5461,7 @@
"Kann keine Kommentare anzeigen, Interface KTextEditor::AnnotationInterface "
"für den Editor fehlt."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5471,7 +5472,7 @@
"gefunden wurde oder kein Textdokument ist:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Revision kopieren"
@@ -5499,40 +5500,40 @@
msgid "Recursive"
msgstr "Rekursiv"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Commit-Nachricht:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Alte Nachrichten"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Weitere ausführliche Informationen finden Sie in der Werkzeugansicht "
"Versionsverwaltung."
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Einspielen nicht möglich"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Einspielen ist fehlgeschlagen"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Einspielen"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5545,12 +5546,12 @@
"Nachricht:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Im Begriff in das Archiv einzuspielen"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Patch für die aktuelle Version kann nicht erstellt werden."
@@ -5561,7 +5562,7 @@
msgstr "Unterschiede zwischen Revision %1 und %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Unterschied zwischen Revisionen"
diff -Nru kdevplatform-5.1.0/po/de/kdevprojectmanagerview.po kdevplatform-5.1.1/po/de/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/de/kdevprojectmanagerview.po 2017-03-13 19:05:04.000000000 +0000
+++ kdevplatform-5.1.1/po/de/kdevprojectmanagerview.po 2017-05-13 10:12:31.000000000 +0000
@@ -5,8 +5,8 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2017-03-06 16:04+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-05-12 14:22+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
@@ -191,63 +191,63 @@
#: projectmanagerviewplugin.cpp:244
#, kde-format
-msgid "Create File..."
-msgstr "Datei erstellen ..."
+msgid "Create &File..."
+msgstr "&Datei erstellen ..."
#: projectmanagerviewplugin.cpp:250
#, kde-format
-msgid "Create Folder..."
-msgstr "Ordner erstellen ..."
+msgid "Create F&older..."
+msgstr "&Ordner erstellen ..."
#: projectmanagerviewplugin.cpp:257
#, kde-format
msgctxt "@action"
-msgid "Build"
-msgstr "Erstellen"
+msgid "&Build"
+msgstr "&Erstellen"
#: projectmanagerviewplugin.cpp:261
#, kde-format
msgctxt "@action"
-msgid "Install"
-msgstr "Installieren"
+msgid "&Install"
+msgstr "&Installieren"
#: projectmanagerviewplugin.cpp:265
#, kde-format
msgctxt "@action"
-msgid "Clean"
-msgstr "Aufräumen"
+msgid "&Clean"
+msgstr "&Aufräumen"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
-msgstr "Zum Buildset hinzufügen"
+msgid "&Add to Build Set"
+msgstr "&Zum Buildset hinzufügen"
#: projectmanagerviewplugin.cpp:276
#, kde-format
-msgid "Close Project"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] "Projekt schließen"
-msgstr[1] "Projekte schließen"
+msgstr[0] "Projekt sch&ließen"
+msgstr[1] "Projekte sch&ließen"
#: projectmanagerviewplugin.cpp:282
#, kde-format
-msgid "Reload"
-msgstr "Neu laden"
+msgid "&Reload"
+msgstr "E&rneut laden"
#: projectmanagerviewplugin.cpp:288
#, kde-format
-msgid "Remove"
-msgstr "Entfernen"
+msgid "Remo&ve"
+msgstr "Ent&fernen"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, kde-format
-msgid "Rename..."
-msgstr "Umbenennen ..."
+msgid "Re&name..."
+msgstr "&Umbenennen..."
#: projectmanagerviewplugin.cpp:298
#, kde-format
-msgid "Remove From Target"
-msgstr "Aus dem Ziel entfernen"
+msgid "Remove From &Target"
+msgstr "Aus dem Ziel en&tfernen"
#: projectmanagerviewplugin.cpp:493
#, kde-format
@@ -271,6 +271,11 @@
msgid "Delete Files"
msgstr "Dateien löschen"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Umbenennen ..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/el/kdevappwizard.po kdevplatform-5.1.1/po/el/kdevappwizard.po
--- kdevplatform-5.1.0/po/el/kdevappwizard.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/el/kdevappwizard.po 2017-05-13 10:12:31.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2014-03-15 16:16+0200\n"
"Last-Translator: Dimitris Kardarakos \n"
"Language-Team: Greek \n"
@@ -56,62 +56,62 @@
"Αυτό εκκινεί το βοηθό εφαρμογής του KDevelop. Σας βοηθά στη δημιουργία "
"σκελετού για την εφαρμογή σας από ένα σύνολο προτύπων."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Αδυναμία δημιουργίας έργου από πρότυπο\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Αδυναμία δημιουργίας έργου"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Δείτε παρακαλώ την προβολή εργαλείων ελέγχου έκδοσης"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Σφάλμα συστήματος ελέγχου έκδοσης"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Αδυναμία αρχικοποίησης αποθετηρίου DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Αδυναμία προσθήκης αρχείων στο αποθετήριο DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Αδυναμία εισαγωγής του έργου στο %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Αδυναμία εισαγωγής του έργου"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Αδυναμία checkout του έργου που έχει εισαχθεί"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Αδυναμία δημιουργίας νέου έργου"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Το αρχείο %1 δεν μπορεί να δημιουργηθεί."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Πρότυπα έργου"
@@ -123,58 +123,58 @@
msgid "Project"
msgstr "Έργο"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Κατηγορία"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Τύπος έργου"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Ανάκτηση περισσότερων προτύπων"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Φόρτωση προτύπων από αρχείο"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Μη έγκυρη τοποθεσία"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Κενό όνομα έργου"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Μη έγκυρο όνομα έργου"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Αδυναμία δημιουργίας υποκαταλόγων, μη επαρκείς άδειες στο: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Μη έγκυρο πρότυπο έργου, παρακαλώ επιλέξτε έναν κόμβο-φύλλο"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
#| msgid "Path already exists and contains files"
msgid "Path already exists and contains files. Open it as a project."
msgstr "Η διαδρομή υπάρχει ήδη και περιέχει αρχεία"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -201,7 +201,7 @@
msgid "Location:"
msgstr "Τοποθεσία:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/el/kdevgrepview.po kdevplatform-5.1.1/po/el/kdevgrepview.po
--- kdevplatform-5.1.0/po/el/kdevgrepview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/el/kdevgrepview.po 2017-05-13 10:12:31.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2014-03-20 22:34+0200\n"
"Last-Translator: Dimitris Kardarakos \n"
"Language-Team: Greek \n"
@@ -107,39 +107,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Γραμμή %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 αποτέλεσμα σύγκρισης"
msgstr[1] "%1 αποτελέσματα σύγκρισης"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 αρχείο"
msgstr[1] "%1 αρχεία"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 σε %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (ένα αποτέλεσμα σύγκρισης)"
msgstr[1] "%2 (%1 αποτελέσματα σύγκρισης)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/el/kdevpatchreview.po kdevplatform-5.1.1/po/el/kdevpatchreview.po
--- kdevplatform-5.1.0/po/el/kdevpatchreview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/el/kdevpatchreview.po 2017-05-13 10:12:31.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-11-02 15:52+0200\n"
"Last-Translator: Petros Vidalis \n"
"Language-Team: Greek \n"
@@ -27,55 +27,55 @@
msgstr "Προσαρμοσμένη διόρθωση"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Διόρθωση"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Βάση:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Βάση διορθώσεων..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Από αρχείο"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Θέση διόρθωσης..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Από εντολή"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Έξοδος εντολής..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Η διόρθωση ήδη εφαρμόστηκε στην τοπική έκδοση"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Εφαρμόστηκε ήδη"
diff -Nru kdevplatform-5.1.0/po/el/kdevplatform.po kdevplatform-5.1.1/po/el/kdevplatform.po
--- kdevplatform-5.1.0/po/el/kdevplatform.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/el/kdevplatform.po 2017-05-13 10:12:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2013-07-08 05:49+0200\n"
"Last-Translator: Dimitrios Glentadakis \n"
"Language-Team: Greek \n"
@@ -377,8 +377,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Διαγραφή"
@@ -511,7 +511,7 @@
msgstr "Πρόσφατες εκφράσεις"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Αφαίρεση όλων"
@@ -659,6 +659,14 @@
msgid "Failed to apply changes: %1"
msgstr "Αποτυχία κλειδώματος συνεδρίας %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Μετονομασία"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -789,13 +797,6 @@
msgid "Applying changes failed: %1"
msgstr ""
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Μετονομασία"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, fuzzy, kde-format
@@ -1641,27 +1642,27 @@
msgid "Various items"
msgstr "Διάφορα αντικείμενα"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Αδυναμία αφαίρεσης φακέλου %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Αδυναμία αφαίρεσης αρχείου %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Το αρχείο %1 ήδη υπάρχει."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Αδυναμία δημιουργίας του αρχείου %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Αδυναμία δημιουργίας του φακέλου %1."
@@ -1843,21 +1844,21 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, fuzzy, kde-format
#| msgctxt "@info:status"
#| msgid "configure"
msgid "Configure"
msgstr "διαμόρφωση"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
msgstr ""
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, fuzzy, kde-format
#| msgid "Run Settings"
msgid "Apply Settings"
@@ -2996,49 +2997,49 @@
msgid "Show detailed progress window"
msgstr "Εμφάνιση παραθύρου λεπτομερούς προόδου"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Φόρτωση έργου %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Φόρτωση %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
"session."
msgstr ""
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"Αδυναμία δημιουργίας κρυφού καταλόγου (%1)0 για το αρχείο των προγραμματιστών"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Αδυναμία ανάκτησης αρχείου του έργου %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Αδυναμία φόρτωσης %1, ένα έργο με το ίδιο όνομα '%2' είναι ήδη ανοικτό."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -3047,12 +3048,12 @@
"το πρόσθετο εισαγωγής έργου (%1) δεν υποστηρίζει το περιβάλλον εργασίας "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Αδυναμία ανοίγματος του έργου"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -3061,44 +3062,44 @@
"Αδυναμία αποθήκευσης διαμόρφωσης έργου σχετικά με τους προγραμματιστές.\n"
"Προσοχή: οι ρυθμίσεις που τροποποιήσατε θα χαθούν."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Διαμόρφωση έργου %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Μη έγκυρη θέση: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Το έργο ήδη ανοίγεται"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Ήδη ανοίγεται το %1, δεν γίνεται άνοιγμα ξανά"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Αντικατάσταση"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
"Continue to open the project and use the just provided project configuration."
msgstr "Συνέχιση ανοίγματος του έργου με χρήση της παρεχόμενης διαμόρφωσης."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Άνοιγμα υπάρχοντος αρχείου"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3106,13 +3107,13 @@
msgstr ""
"Συνέχιση ανοίγματος του έργου αλλά με χρήση της υπάρχουσας διαμόρφωσης."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Ακυρώστε και μην ανοίξετε το έργο."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3121,34 +3122,34 @@
"Υπάρχει ήδη ένα αρχείο διαμόρφωσης έργου στο %1.\n"
"Θέλετε να το παρακάμψετε ή να ανοίξετε το υπάρχον;"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Παράκαμψη της τρέχουσας διαμόρφωσης έργου"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Αδυναμία δημιουργίας του αρχείου διαμόρφωσης του έργου %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Άνοιγμα ξανά του τρέχοντος έργου;"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Άνοιγμα / Εισαγωγή έργου..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Άνοιγμα ή εισαγωγή έργου"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, fuzzy, kde-format
#| msgctxt "@info:whatsthis"
#| msgid ""
@@ -3171,19 +3172,19 @@
"υπάρχοντος καταλόγου που δεν έχει ακόμη ένα αρχείο έργου KDevelop4, το "
"αρχείο θα δημιουργηθεί."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Προσκόμιση έργου..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Προσκόμιση έργου"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3193,68 +3194,68 @@
"Καθοδηγεί τον χρήστη στην προσκόμιση του έργου και το εισαγάγει στο KDevelop "
"4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Κλείσιμο έργου (έργων)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Κλείσιμο όλων των τρεχόντων επιλεγμένων έργων"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Άνοιγμα διαμόρφωσης..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Υποβολή τρέχοντος έργου..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Υποβολή..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, fuzzy, kde-format
#| msgctxt "@info:tooltip"
#| msgid "Open recent project"
msgid "Open Recent Project"
msgstr "Άνοιγμα πρόσφατου έργου"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Ανοίγει το πρόσφατα ανοιγμένο έργο."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Άνοιγμα έργου για το τρέχον αρχείο"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Το έργο είναι ήδη ανοιχτό: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Δεν υπάρχουν ανοικτά έγγραφα"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, fuzzy, kde-format
#| msgid "Project already open: %1"
msgid "Project Already Open"
msgstr "Το έργο είναι ήδη ανοιχτό: %1"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3263,12 +3264,12 @@
"Το έργο που προσπαθείτε να ανοίξετε είναι ήδη ανοιχτό σε τουλάχιστο άλλη μία "
"συνεδρία. Τι θέλετε να κάνετε;"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Προσθήκη έργου στην τρέχουσα συνεδρία"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Άνοιγμα συνεδρίας %1"
@@ -3729,19 +3730,19 @@
msgid "Create New Session"
msgstr "Δημιουργία νέας συνεδρίας"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "να γίνει η εκτελούμενη %1 διεργασία (PID: %2) ορατή"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "η εκτελούμενη %1 διεργασία (PID %2) έχει προφανώς παραλύσει"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3751,7 +3752,7 @@
"Η δοσμένη εφαρμογή δεν ανταποκρίνεται σε κλήση DBUS, ίσως να έχει "
"καταρρεύσει ή να έχει παραλύσει."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3760,7 +3761,7 @@
"Αποτυχία κλειδώματος της συνεδρίας %1, έχει ήδη κλειδωθεί από %2 "
"στο %3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3768,7 +3769,7 @@
"Αποτυχία κλειδώματος της συνεδρίας %1 (αρχείο κλειδώματος δεν είναι "
"διαθέσιμο)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3778,25 +3779,25 @@
"
Κλείστε την ενοχλητική διεργασία της εφαρμογής ή επιλέξτε να εκτελέσετε "
"μιαν άλλη συνεδρία.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Επαναδοκιμή εκκίνησης"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Επιλέξτε άλλη συνεδρία"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Αποτυχία κλειδώματος συνεδρίας %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3911,20 +3912,20 @@
msgid "Configure Environment Variables"
msgstr "Διαμόρφωση μεταβλητών περιβάλλοντος"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, fuzzy, kde-format
#| msgid "Enter the target here..."
msgid "Enter variable ..."
msgstr "Εισάγετε εδώ τον προορισμό..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr ""
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, fuzzy, kde-format
#| msgctxt "project name (branch name)"
#| msgid "%1 (%2)"
@@ -4520,7 +4521,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Νέο"
@@ -4808,34 +4809,34 @@
msgid "Select Tool View to Add"
msgstr "Επιλογή εργαλειοπροβολής για προσθήκη"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, fuzzy, kde-format
#| msgid "Working Set"
msgid "Active Working Set"
msgstr "Σειρά εργασιών"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Σειρά εργασιών"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Αφαιρέστε αυτή τη σειρά εργασιών. Τα έγγραφα που περιέχει δεν επηρεάζονται."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Έγγραφα:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Προσθήκη όλων"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4844,7 +4845,7 @@
"Προσθήκη όλων των εγγράφων που είναι τμήμα αυτής της σειράς εργασιών στην "
"τρέχουσα ενεργή σειρά εργασιών."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4853,28 +4854,28 @@
"Αφαίρεση όλων των εγγράφων που είναι τμήμα αυτής της σειράς εργασιών από την "
"τρέχουσα ενεργή σειρά εργασιών."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Κάντε κλικ για άνοιγμα και ενεργοποίηση αυτού του εγγράφου."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Αφαίρεση αυτού του αρχείου από την τρέχουσα σειρά εργασιών"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Προσθήκη αυτού του αρχείου στην τρέχουσα σειρά εργασιών"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Φόρτωση"
@@ -5315,25 +5316,25 @@
msgid "There are no committed differences."
msgstr "Δεν υπάρχουν διαφορές."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Υποστήριξη VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Δημιουργία νέου κλάδου με βάση τον επιλεγμένο κλάδο"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Ίδιο με το git-branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5341,26 +5342,26 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, fuzzy, kde-format
#| msgid "Compare to Base..."
msgid "Compare to Branch"
msgstr "Σύγκριση με τη βάση..."
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Checkout στον επιλεγμένο κλάδο"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Checkout"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr ""
@@ -5516,73 +5517,73 @@
msgid "Source Revision"
msgstr "Αναθεώρηση πηγαίου κώδικα"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Ενημέρωση"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Προσθήκη"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Εμφάνιση διαφορών..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Επαναφορά"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Ιστορικό..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Επισήμανση..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Εμφάνιση διαφορών..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Εμφάνιση διαφορών (όλα τα αρχεία)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Ώθηση"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Έλξη"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Δεν υπάρχουν διαφορές."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Αδυναμία ανάκτησης διαφορών."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2 ιστορικό (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5591,7 +5592,7 @@
"Αδυναμία εμφάνισης επισημάνσεων, λείπει το περιβάλλον KTextEditor::"
"AnnotationInterface για τον κειμενογράφο."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5602,7 +5603,7 @@
"δεν ήταν έγγραφο κειμένου:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Αντιγραφή αναθεώρησης"
@@ -5631,40 +5632,40 @@
msgid "Recursive"
msgstr "Αναδρομικά"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Μήνυμα επικύρωσης:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Παλιά μηνύματα"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Files to commit"
msgid "Unable to commit"
msgstr "Αρχεία προς υποβολή"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Commit Message"
msgid "Commit unsuccessful"
msgstr "Υποβολή μηνύματος"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Υποβολή"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5677,12 +5678,12 @@
"Με μήνυμα:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Επίκειται υποβολή στο αποθετήριο"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Αδυναμία δημιουργίας διόρθωσης για την τρέχουσα έκδοση."
@@ -5693,7 +5694,7 @@
msgstr "Διαφορά ανάμεσα στις αναθεωρήσεις %1 και %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Διαφορά μεταξύ αναθεωρήσεων"
diff -Nru kdevplatform-5.1.0/po/el/kdevprojectmanagerview.po kdevplatform-5.1.1/po/el/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/el/kdevprojectmanagerview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/el/kdevprojectmanagerview.po 2017-05-13 10:12:31.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2014-03-20 22:15+0200\n"
"Last-Translator: Dimitris Kardarakos \n"
"Language-Team: Greek \n"
@@ -197,63 +197,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Δημιουργία αρχείου"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Δημιουργία φακέλου"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Κατασκευή"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Εγκατάσταση"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Καθαρισμός"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Προσθήκη στο σύνολο κατασκευής"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Κλείσιμο έργου"
msgstr[1] "Κλείσιμο έργων"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Επαναφόρτωση"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Αφαίρεση"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Μετονομασία..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Αφαίρεση από τον προορισμό"
#: projectmanagerviewplugin.cpp:493
@@ -278,6 +288,11 @@
msgid "Delete Files"
msgstr "Διαγραφή αρχείων"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Μετονομασία..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/en_GB/kdevappwizard.po kdevplatform-5.1.1/po/en_GB/kdevappwizard.po
--- kdevplatform-5.1.0/po/en_GB/kdevappwizard.po 2017-03-13 19:05:05.000000000 +0000
+++ kdevplatform-5.1.1/po/en_GB/kdevappwizard.po 2017-05-13 10:12:32.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-02-08 11:02+0000\n"
"Last-Translator: \n"
"Language-Team: British English \n"
@@ -54,62 +54,62 @@
"This starts KDevelop's application wizard. It helps you to generate a "
"skeleton for your application from a set of templates."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Could not create project from template\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Failed to create project"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Please see the Version Control toolview"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Version Control System Error"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Could not initialise DVCS repository"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Could not add files to the DVCS repository"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Could not import project into %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Could not import project"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Could not checkout imported project"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Could not create new project"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "The file %1 cannot be created."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Project Templates"
@@ -121,57 +121,57 @@
msgid "Project"
msgstr "Project"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Category"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Project Type"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Get More Templates"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Load Template From File"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Invalid location"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Empty project name"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Invalid project name"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Unable to create subdirectories, missing permissions on: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Invalid project template, please choose a leaf item"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "Path already exists and contains files. Open it as a project."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -198,7 +198,7 @@
msgid "Location:"
msgstr "Location:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/en_GB/kdevgrepview.po kdevplatform-5.1.1/po/en_GB/kdevgrepview.po
--- kdevplatform-5.1.0/po/en_GB/kdevgrepview.po 2017-03-13 19:05:05.000000000 +0000
+++ kdevplatform-5.1.1/po/en_GB/kdevgrepview.po 2017-05-13 10:12:32.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-03-05 11:14+0000\n"
"Last-Translator: Steve Allewell \n"
"Language-Team: English \n"
@@ -102,39 +102,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Line %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 match"
msgstr[1] "%1 matches"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 file"
msgstr[1] "%1 files"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 in %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (one match)"
msgstr[1] "%2 (%1 matches)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/en_GB/kdevpatchreview.po kdevplatform-5.1.1/po/en_GB/kdevpatchreview.po
--- kdevplatform-5.1.0/po/en_GB/kdevpatchreview.po 2017-03-13 19:05:05.000000000 +0000
+++ kdevplatform-5.1.1/po/en_GB/kdevpatchreview.po 2017-05-13 10:12:32.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-08-05 12:56+0000\n"
"Last-Translator: Steve Allewell \n"
"Language-Team: English \n"
@@ -24,55 +24,55 @@
msgstr "Custom Patch"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Patch"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Patch base..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "From File"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Patch location..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "From Command"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Command's output..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Patch is already applied on local version"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Already applied"
diff -Nru kdevplatform-5.1.0/po/en_GB/kdevplatform.po kdevplatform-5.1.1/po/en_GB/kdevplatform.po
--- kdevplatform-5.1.0/po/en_GB/kdevplatform.po 2017-03-13 19:05:05.000000000 +0000
+++ kdevplatform-5.1.1/po/en_GB/kdevplatform.po 2017-05-13 10:12:32.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-03-05 11:16+0000\n"
"Last-Translator: Steve Allewell \n"
"Language-Team: English \n"
@@ -350,8 +350,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Delete"
@@ -480,7 +480,7 @@
msgstr "Recent Expressions"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Remove All"
@@ -623,6 +623,14 @@
msgid "Failed to apply changes: %1"
msgstr "Failed to apply changes: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Rename"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -746,13 +754,6 @@
msgid "Applying changes failed: %1"
msgstr "Applying changes failed: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Rename"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1579,27 +1580,27 @@
msgid "Various items"
msgstr "Various items"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Cannot remove folder %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Cannot remove file %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "The file %1 already exists."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Cannot create file %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Cannot create folder %1."
@@ -1781,12 +1782,12 @@
msgid "&Color Theme"
msgstr "&Colour Theme"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configure"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1795,7 +1796,7 @@
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Apply Settings"
@@ -2895,18 +2896,18 @@
msgid "Show detailed progress window"
msgstr "Show detailed progress window"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Loading Project %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Loading %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2915,22 +2916,22 @@
"Unable to load the project file %1. The project has been removed from the "
"session."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Unable to create hidden dir (%1) for developer file"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Unable to get project file: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr "Could not load %1, a project with the same name '%2' is already open."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
@@ -2939,7 +2940,7 @@
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2948,12 +2949,12 @@
"project importing plugin (%1) does not support the IProjectFileManager "
"interface."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Could not open project"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2962,32 +2963,32 @@
"Could not store developer specific project configuration.\n"
"Attention: The project settings you changed will be lost."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configure Project %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Invalid Location: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Project already being opened"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Already opening %1, not opening again"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Override"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -2995,12 +2996,12 @@
msgstr ""
"Continue to open the project and use the just provided project configuration."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Open Existing File"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3008,13 +3009,13 @@
msgstr ""
"Continue to open the project but use the existing project configuration."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancel and do not open the project."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3023,34 +3024,34 @@
"There already exists a project configuration file at %1.\n"
"Do you want to override it or open the existing file?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Override existing project configuration"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Unable to create configuration file %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Reopen the current project?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Open / Import Project..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Open or import project"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3066,19 +3067,19 @@
"directory that does not yet have a KDevelop4 project file, the file will be "
"created."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Fetch Project..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Fetch project"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3088,65 +3089,65 @@
"Guides the user through the project fetch and then imports it into KDevelop "
"4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Close Project(s)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Closes all currently selected projects"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Open Configuration..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Commit Current Project..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Commit..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Open Recent Project"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Opens recently opened project."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Open Project for Current File"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Project already open: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "No active document"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Project Already Open"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3155,12 +3156,12 @@
"The project you're trying to open is already open in at least one other "
"session. What do you want to do?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Add project to current session"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Open session %1"
@@ -3613,19 +3614,19 @@
msgid "Create New Session"
msgstr "Create New Session"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "made running %1 instance (PID: %2) visible"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "running %1 instance (PID: %2) is apparently hung"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3635,7 +3636,7 @@
"The given application did not respond to a DBUS call, it may have crashed or "
"is hanging."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3643,13 +3644,13 @@
msgstr ""
"Failed to lock the session %1, already locked by %2 on %3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
msgstr "Failed to lock the session %1 (lock-file unavailable)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3659,25 +3660,25 @@
"
Please, close the offending application instance or choose another "
"session to launch.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Retry startup"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Choose another session"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Failed to Lock Session %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3784,19 +3785,19 @@
msgid "Configure Environment Variables"
msgstr "Configure Environment Variables"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Enter variable ..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Batch Edit Mode"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4358,7 +4359,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "New"
@@ -4637,32 +4638,32 @@
msgid "Select Tool View to Add"
msgstr "Select Tool View to Add"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Active Working Set"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Working Set"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr "Remove this working set. The contained documents are not affected."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documents:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Add All"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4671,7 +4672,7 @@
"Add all documents that are part of this working set to the currently active "
"working set."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4680,28 +4681,28 @@
"Remove all documents that are part of this working set from the currently "
"active working set."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Click to open and activate this document."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Remove this file from the current working set"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Add this file to the current working set"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Stash"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Load"
@@ -5130,25 +5131,25 @@
msgid "There are no committed differences."
msgstr "There are no committed differences."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "VCS support"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Creates new branch based on the selected branch"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "The same as git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5158,25 +5159,25 @@
"and the last commit on the selected branch.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Compare to Branch"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Checkout to the selected branch"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Checkout"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Merge"
@@ -5332,73 +5333,73 @@
msgid "Source Revision"
msgstr "Source Revision"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Update"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Add"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Show Differences..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Revert"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "History..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Annotation..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Show Diff..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Show Diff (all files)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Push"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Pull"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "There are no differences."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Unable to get difference."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2 History (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5407,7 +5408,7 @@
"Cannot display annotations, missing interface KTextEditor::"
"AnnotationInterface for the editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5418,7 +5419,7 @@
"not a text document:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copy Revision"
@@ -5446,38 +5447,38 @@
msgid "Recursive"
msgstr "Recursive"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Commit Message:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Old Messages"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr "For more detailed information please see the Version Control toolview"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Unable to commit"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Commit unsuccessful"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Commit"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5490,12 +5491,12 @@
"With message:\n"
"
"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr ""
@@ -5464,7 +5465,7 @@
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr ""
diff -Nru kdevplatform-5.1.0/po/eo/kdevprojectmanagerview.po kdevplatform-5.1.1/po/eo/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/eo/kdevprojectmanagerview.po 2017-03-13 19:05:06.000000000 +0000
+++ kdevplatform-5.1.1/po/eo/kdevprojectmanagerview.po 2017-05-13 10:12:32.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2009-11-15 12:06+0100\n"
"Last-Translator: Axel Rousseau \n"
"Language-Team: esperanto \n"
@@ -197,67 +197,72 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Krei dosierujon"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Krei dosierujon"
#: projectmanagerviewplugin.cpp:257
#, fuzzy, kde-format
#| msgid "Bu&ild"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Munt&i"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
-msgstr "Instalu"
+msgid "&Install"
+msgstr "Instali"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Forviŝi"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
-msgstr ""
+#, fuzzy, kde-format
+#| msgid "Bu&ild"
+msgid "&Add to Build Set"
+msgstr "Munt&i"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Projektoj"
+msgstr[1] "Projektoj"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Reŝargi"
#: projectmanagerviewplugin.cpp:288
#, fuzzy, kde-format
#| msgid "Rename"
-msgid "Remove"
+msgid "Remo&ve"
msgstr "Alinomi"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, fuzzy, kde-format
#| msgid "Rename"
-msgid "Rename..."
+msgid "Re&name..."
msgstr "Alinomi"
#: projectmanagerviewplugin.cpp:298
#, fuzzy, kde-format
#| msgid "Remove Folder"
-msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Elpreni dosierujon"
#: projectmanagerviewplugin.cpp:493
@@ -283,6 +288,12 @@
msgid "Delete Files"
msgstr ""
+#: projectmanagerviewplugin.cpp:601
+#, fuzzy, kde-format
+#| msgid "Rename"
+msgid "Rename..."
+msgstr "Alinomi"
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/es/kdevappwizard.po kdevplatform-5.1.1/po/es/kdevappwizard.po
--- kdevplatform-5.1.0/po/es/kdevappwizard.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/es/kdevappwizard.po 2017-05-13 10:12:32.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-02-04 21:04+0100\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
@@ -53,62 +53,62 @@
"Esto inicia el asistente de aplicaciones de KDevelop, que le ayuda a generar "
"el esqueleto de su aplicación a partir de un conjunto de plantillas."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "No se puede crear el proyecto a partir de la plantilla\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Fallo al crear el proyecto"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Por favor, consulte el visor de la herramienta de control de versiones"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Error del sistema de control de versiones"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "No se puede inicializar el repositorio DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "No es posible añadir archivos al repositorio DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "No se puede importar el proyecto en %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "No se puede importar el proyecto"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "No se puede descargar el proyecto importado"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "No se puede crear el nuevo proyecto"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "No se puede crear el archivo %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Plantillas de proyectos"
@@ -120,57 +120,57 @@
msgid "Project"
msgstr "Proyecto"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoría"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipo de proyecto"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obtener más plantillas"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Cargar plantilla de un archivo"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Ubicación no válida"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nombre de proyecto vacío"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nombre de proyecto no válido"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "No es posible crear subcarpetas. Faltan permisos en: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Plantilla de proyecto no válida; seleccione un elemento de hoja"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "La ruta ya existe y contiene archivos. Ábralo como proyecto."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -197,7 +197,7 @@
msgid "Location:"
msgstr "Ubicación:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/es/kdevgrepview.po kdevplatform-5.1.1/po/es/kdevgrepview.po
--- kdevplatform-5.1.0/po/es/kdevgrepview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/es/kdevgrepview.po 2017-05-13 10:12:32.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-03-07 20:53+0100\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
@@ -101,39 +101,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Línea %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 coincidencia"
msgstr[1] "%1 coincidencias"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 archivo"
msgstr[1] "%1 archivos"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 en %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (1 coincidencia)"
msgstr[1] "%2 (%1 coincidencias)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/es/kdevpatchreview.po kdevplatform-5.1.1/po/es/kdevpatchreview.po
--- kdevplatform-5.1.0/po/es/kdevpatchreview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/es/kdevpatchreview.po 2017-05-13 10:12:32.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-10 22:21+0200\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
@@ -23,55 +23,55 @@
msgstr "Parche personalizado"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Parche"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Parchear base..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Desde el archivo"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Parchear ubicación..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Desde la orden"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Salida de la orden..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "El parche ya está aplicado en la versión local"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Ya aplicado"
diff -Nru kdevplatform-5.1.0/po/es/kdevplatform.po kdevplatform-5.1.1/po/es/kdevplatform.po
--- kdevplatform-5.1.0/po/es/kdevplatform.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/es/kdevplatform.po 2017-05-13 10:12:32.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-03-07 20:48+0100\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
@@ -351,8 +351,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Borrar"
@@ -482,7 +482,7 @@
msgstr "Expresiones recientes"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Eliminar todas"
@@ -626,6 +626,14 @@
msgid "Failed to apply changes: %1"
msgstr "Ha fallado la aplicación de cambios: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Cambiar nombre"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -750,13 +758,6 @@
msgid "Applying changes failed: %1"
msgstr "Ha fallado la aplicación de cambios: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Cambiar nombre"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1586,27 +1587,27 @@
msgid "Various items"
msgstr "Elementos diversos"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "No se puede eliminar la carpeta %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "No se puede eliminar el archivo %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "El archivo %1 ya existe."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "No se puede crear el archivo %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "No se puede crear la carpeta %1."
@@ -1789,12 +1790,12 @@
msgid "&Color Theme"
msgstr "Tema de &color"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configurar"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1803,7 +1804,7 @@
"Las preferencias del módulo actual han cambiado.\n"
"¿Desea aplicar los cambios o descartarlos?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Aplicar preferencias"
@@ -2918,18 +2919,18 @@
msgid "Show detailed progress window"
msgstr "Mostrar ventana de progreso detallado"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Cargando proyecto %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Cargando %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2938,24 +2939,24 @@
"No ha sido posible cargar el archivo de proyecto %1. Se ha eliminado el "
"proyecto de la sesión."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"No se puede crear la carpeta oculta (%1) para el archivo del desarrollador"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "No se puede obtener el archivo de proyecto: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"No se puede cargar %1, ya se ha abierto un proyecto con el mismo nombre «%2»."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
@@ -2965,7 +2966,7 @@
" Compruebe que están instalados los programas necesarios o consulte la "
"salida de la consola para más información."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2974,12 +2975,12 @@
"el complemento de importación del proyecto (%1) no permite la interfaz "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "No se puede abrir el proyecto"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2989,32 +2990,32 @@
"desarrollador.\n"
"Atención: las preferencias del proyecto que ha modificado se perderán."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configurar el proyecto %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Ubicación no válida: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "El proyecto ya está siendo abierto"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Ya se está abriendo %1, no se abrirá de nuevo"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Redefinir"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3023,12 +3024,12 @@
"Continuar abriendo el proyecto usando la configuración de proyecto "
"proporcionada."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Abrir archivo existente"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3036,13 +3037,13 @@
msgstr ""
"Continuar abriendo el proyecto usando la configuración de proyecto existente."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancelar y no abrir el proyecto."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3051,34 +3052,34 @@
"Ya existe un archivo de configuración de proyecto en %1.\n"
"¿Desea ignorarlo o abrir el archivo existente?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Ignorar la configuración del proyecto existente"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "No se puede crear el archivo de configuración %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "¿Volver a abrir el proyecto actual?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Abrir/importar proyecto..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Abrir o importar proyecto"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3094,19 +3095,19 @@
"un directorio existente que todavía no contiene un archivo de proyecto de "
"KDevelop4, se creará dicho archivo."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Obtener proyecto..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Obtener proyecto"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3116,65 +3117,65 @@
"Guía al usuario a través del proceso de obtención de un proyecto y luego lo "
"importa en KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Cerrar proyecto(s)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Cerrar todos los proyectos actualmente seleccionados"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Abrir configuración..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Enviar el proyecto actual..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Enviar..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Abrir proyecto reciente"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Abre un proyecto recientemente abierto."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Abrir proyecto del archivo actual"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "El proyecto ya está abierto: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Ningún documento activo"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "El proyecto ya está abierto"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3183,12 +3184,12 @@
"El proyecto que está intentando abrir ya está abierto en al menos otra "
"sesión. ¿Qué desea hacer?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Añadir el proyecto a la sesión actual"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Abrir la sesión %1"
@@ -3644,19 +3645,19 @@
msgid "Create New Session"
msgstr "Crear nueva sesión"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "se ha hecho visible la ejecución de %1 (PID: %2)"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "la ejecución de %1 (PID %2) está aparentemente colgada"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3666,7 +3667,7 @@
"La aplicación indicada no ha respondido a una llamada de DBUS; es posible "
"que haya fallado o que se esté bloqueando."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3675,7 +3676,7 @@
"Ha fallado el bloqueo de la sesión %1; ya está bloqueada por %2 en "
"%3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3683,7 +3684,7 @@
"Ha fallado el bloqueo de la sesión %1 (archivo de bloqueo no "
"disponible)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3693,25 +3694,25 @@
"
Por favor, termine la ejecución de la aplicación transgresora o escoja "
"otra sesión para lanzar.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Reintentar el inicio"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Escoger otra sesión"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Ha fallado el bloqueo de la sesión %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3820,19 +3821,19 @@
msgid "Configure Environment Variables"
msgstr "Configurar variables de entorno"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Introducir variable..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Modo de edición por lotes"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4401,7 +4402,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nueva"
@@ -4684,34 +4685,34 @@
msgid "Select Tool View to Add"
msgstr "Seleccione la vista de herramientas a añadir"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Conjunto de trabajo activo"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Conjunto de trabajo"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Eliminar este conjunto de trabajo. Los elementos que contiene no se verán "
"afectados."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documentos:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Añadir todo"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4720,7 +4721,7 @@
"Añadir todos los documentos que son parte de este conjunto de trabajo al "
"conjunto de trabajo actualmente activo."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4729,28 +4730,28 @@
"Eliminar todos los documentos que son parte de este conjunto de trabajo del "
"conjunto de trabajo actualmente activo."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Pulse para abrir y activar este documento."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Eliminar este archivo del conjunto de trabajo actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Añadir este archivo al conjunto de trabajo actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Reserva"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Cargar"
@@ -5189,25 +5190,25 @@
msgid "There are no committed differences."
msgstr "No hay diferencias enviadas."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Uso de VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Crea una nueva rama basada en la rama seleccionada"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Lo mismo que git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5217,25 +5218,25 @@
"está vacía) y el último envío de la rama seleccionada.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Comparar con la rama"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Descargar en la rama seleccionada"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Descargar"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Fusionar"
@@ -5391,73 +5392,73 @@
msgid "Source Revision"
msgstr "Revisión de origen"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Actualizar"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Añadir"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostrar diferencias..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Revertir"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historia..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotación..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostrar diferencias..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostrar diferencias (todos los archivos)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Incorporar"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Extraer"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "No hay diferencias."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "No se puede obtener la diferencia."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Historial de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5466,7 +5467,7 @@
"No se pueden mostrar anotaciones: falta la interfaz KTextEditor::"
"AnnotationInterface para el editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5477,7 +5478,7 @@
"encontrado o no era un documento de texto:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copiar revisión"
@@ -5505,40 +5506,40 @@
msgid "Recursive"
msgstr "Recursivo"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Mensaje de envío:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Mensajes antiguos"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Para una información más detallada, por favor, consulte el visor de la "
"herramienta de control de versiones"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "No se puede enviar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Envío sin éxito"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Enviar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5551,12 +5552,12 @@
"Con el mensaje:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "A punto de enviar al repositorio"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "No se puede crear un parche para la versión actual."
@@ -5567,7 +5568,7 @@
msgstr "Diferencias entre las revisiones %1 y %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Diferencias entre revisiones"
diff -Nru kdevplatform-5.1.0/po/es/kdevprojectmanagerview.po kdevplatform-5.1.1/po/es/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/es/kdevprojectmanagerview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/es/kdevprojectmanagerview.po 2017-05-13 10:12:32.000000000 +0000
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2017-03-07 20:48+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-05-06 21:41+0200\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
"Language: es\n"
@@ -195,63 +195,63 @@
#: projectmanagerviewplugin.cpp:244
#, kde-format
-msgid "Create File..."
-msgstr "Crear archivo..."
+msgid "Create &File..."
+msgstr "Crear &archivo..."
#: projectmanagerviewplugin.cpp:250
#, kde-format
-msgid "Create Folder..."
-msgstr "Crear carpeta..."
+msgid "Create F&older..."
+msgstr "C&rear carpeta..."
#: projectmanagerviewplugin.cpp:257
#, kde-format
msgctxt "@action"
-msgid "Build"
-msgstr "Construir"
+msgid "&Build"
+msgstr "&Construir"
#: projectmanagerviewplugin.cpp:261
#, kde-format
msgctxt "@action"
-msgid "Install"
-msgstr "Instalar"
+msgid "&Install"
+msgstr "&Instalar"
#: projectmanagerviewplugin.cpp:265
#, kde-format
msgctxt "@action"
-msgid "Clean"
-msgstr "Limpiar"
+msgid "&Clean"
+msgstr "&Limpiar"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
-msgstr "Añadir al conjunto de construcción"
+msgid "&Add to Build Set"
+msgstr "&Añadir al conjunto de construcción"
#: projectmanagerviewplugin.cpp:276
#, kde-format
-msgid "Close Project"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] "Cerrar proyecto"
+msgstr[0] "Ce&rrar proyecto"
msgstr[1] "Cerrar proyectos"
#: projectmanagerviewplugin.cpp:282
#, kde-format
-msgid "Reload"
-msgstr "Volver a cargar"
+msgid "&Reload"
+msgstr "&Volver a cargar"
#: projectmanagerviewplugin.cpp:288
#, kde-format
-msgid "Remove"
-msgstr "Eliminar"
+msgid "Remo&ve"
+msgstr "E&liminar"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, kde-format
-msgid "Rename..."
-msgstr "Cambiar nombre..."
+msgid "Re&name..."
+msgstr "Cambiar &nombre..."
#: projectmanagerviewplugin.cpp:298
#, kde-format
-msgid "Remove From Target"
-msgstr "Eliminar del objetivo"
+msgid "Remove From &Target"
+msgstr "Eliminar del obje&tivo"
#: projectmanagerviewplugin.cpp:493
#, kde-format
@@ -275,6 +275,11 @@
msgid "Delete Files"
msgstr "Borrar archivos"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Cambiar nombre..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/et/kdevappwizard.po kdevplatform-5.1.1/po/et/kdevappwizard.po
--- kdevplatform-5.1.0/po/et/kdevappwizard.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/et/kdevappwizard.po 2017-05-13 10:12:33.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2016-01-29 00:31+0200\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
@@ -54,62 +54,62 @@
"See käivitab KDevelopi rakenduse nõustaja, mis aitab luua mallide põhjal oma "
"rakenduse põhikavatise."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Projekti loomine malli põhjal nurjus\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Projekti loomine nurjus"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Palun vaata versioonihalduse tööriistavaadet"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Versioonihaldussüsteemi tõrge"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "DVCS hoidla initsialiseerimine nurjus"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Failide lisamine DVCS hoidlasse nurjus"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Projekti import asukohta %1 nurjus."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Projekti import nurjus"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Imporditud projekti väljavõtmine nurjus"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Uue projekti loomine nurjus"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Faili %1 loomine nurjus."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Projekti mallid"
@@ -121,57 +121,57 @@
msgid "Project"
msgstr "Projekt"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Kategooria"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Projekti tüüp"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Uute mallide hankimine"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Malli laadimine failist"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Vigane asukoht"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Tühi projekt nimi"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Vigane projekti nimi"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Alamkataloogide loomne nurjus, õigused puuduvad: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Vigane projekt mall, palun vali puust element"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "Asukoht on juba olemas ja sisaldab faile. Ava see projektina."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -196,7 +196,7 @@
msgid "Location:"
msgstr "Asukoht:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/et/kdevgrepview.po kdevplatform-5.1.1/po/et/kdevgrepview.po
--- kdevplatform-5.1.0/po/et/kdevgrepview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/et/kdevgrepview.po 2017-05-13 10:12:33.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2016-12-15 18:55+0200\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
@@ -102,39 +102,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Rida %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 vaste"
msgstr[1] "%1 vastet"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 failis"
msgstr[1] "%1 failis"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (üks vaste)"
msgstr[1] "%2 (%1 vastet)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/et/kdevpatchreview.po kdevplatform-5.1.1/po/et/kdevpatchreview.po
--- kdevplatform-5.1.0/po/et/kdevpatchreview.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/et/kdevpatchreview.po 2017-05-13 10:12:33.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-30 21:31+0300\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
@@ -24,55 +24,55 @@
msgstr "Kohandatud paik"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Paik"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Baas:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Paiga baas..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Failist"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Paiga asukoht..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Käsust"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Käsu väljund..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Paik on juba rakendatud kohalikule versioonile"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Juba rakendatud"
diff -Nru kdevplatform-5.1.0/po/et/kdevplatform.po kdevplatform-5.1.1/po/et/kdevplatform.po
--- kdevplatform-5.1.0/po/et/kdevplatform.po 2017-03-13 19:05:07.000000000 +0000
+++ kdevplatform-5.1.1/po/et/kdevplatform.po 2017-05-13 10:12:33.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2016-12-15 19:07+0200\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
@@ -348,8 +348,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Kustuta"
@@ -479,7 +479,7 @@
msgstr "Viimati kasutatud avaldised"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Eemalda kõik"
@@ -623,6 +623,14 @@
msgid "Failed to apply changes: %1"
msgstr "Muudatuste rakendamine nurjus: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Muuda nime"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -746,13 +754,6 @@
msgid "Applying changes failed: %1"
msgstr "Muudatuste rakendamine nurjus: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Muuda nime"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1581,27 +1582,27 @@
msgid "Various items"
msgstr "Mitmesugused elemendid"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Kataloogi %1 eemaldamine nurjus."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Faili %1 eemaldamine nurjus."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Fail %1 on juba olemas."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Faili %1 loomine nurjus."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Kataloogi %1 loomine nurjus."
@@ -1780,12 +1781,12 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Seadistamine"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1794,7 +1795,7 @@
"Aktiivse mooduli seadistusi on muudetud.\n"
"Kas muudatused rakendada või tühistada?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Seadistuste rakendamine"
@@ -2894,47 +2895,47 @@
msgid "Show detailed progress window"
msgstr "Näita üksikasjalikku edenemisdialoogi"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Projekti %1 laadimine"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "%1 laadimine"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
"session."
msgstr "Projektifaili %1 laadimine nurjus. Projekt on seansist eemaldatud."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Peidetud kataloogi (%1) loomine arendaja faili tarbeks nurjus"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Projektifaili hankimine nurjus: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr "%1 laadimine nurjus, projekt sama nimega \"%2\" on juba avatud."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2942,12 +2943,12 @@
msgstr ""
"projekti importimise plugin (%1) ei toeta IProjectFileManageri liidest."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Projekti avamine nurjus"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2956,44 +2957,44 @@
"Arendajale omase projekti seadistuse salvestamine nurjus.\n"
"Tähelepanu: projekti seadistused, mida oled muutnud, lähevad kaotsi."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Projekti %1 seadistamine"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Vigane asukoht: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projekti juba avatakse"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "%1 juba avatakse, seda ei hakata uuesti avama"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Tühista "
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
"Continue to open the project and use the just provided project configuration."
msgstr "Edasi projekti avamisega, kasutades äsja määratud projekti seadistust."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Ava olemasolev fail"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3001,13 +3002,13 @@
msgstr ""
"Edasi projekti avamisega, aga kasutades olemasolevat projekti seadistust."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Loobumine projekti avamisest."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3016,34 +3017,34 @@
"Projekti seadistustefail %1 on juba olemas.\n"
"Kas tühistada see või avada olemasolev fail?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Tühista olemasolev projekti seadistus"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Seadistustefaili %1 loomine nurjus"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Kas avada aktiivne projekt uuesti?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Ava/impordi projekt..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Projekti avamine või import"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3058,19 +3059,19 @@
"kataloogi avamiseks KDevelopis. Kui avatakse olemasolev kataloog, milles "
"pole veel KDevelop 4 projektifaili, viimane luuakse."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Tõmba projekt..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Projekti tõmbamine"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3080,65 +3081,65 @@
"Juhendab kasutajat projekti tõmbamise ajal ning võimaldab selle importida "
"KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Sulge projektid"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Sulgeb kõik parajasti valitud projektid"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Ava seadistus..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Kanna aktiivne projekt sisse..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Kanna sisse..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Ava viimati avatud projekt"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Viimati avatud projekti avamine."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Ava aktiivse faili projekt"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Projekt on juba avatud: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Ükski dokument pole aktiivnedid"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Projekt on juba avatud"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3147,12 +3148,12 @@
"Projekt, mida proovid avada, on juba avatud vähemalt ühes seansis. Mida "
"soovid ette võtta?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Lisa projekt aktiivsesse seanssi"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Ava seanss %1"
@@ -3605,19 +3606,19 @@
msgid "Create New Session"
msgstr "Loo uus seanss"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "töötav %1 isend (PID %2) muudeti nähtavaks"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "töötav %1 isend (PID %2) on nähtavasti hangunud"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3627,7 +3628,7 @@
"Määratud rakendus ei vasta D-Busi väljakutsele, seda võib olla tabanud krahh "
"või on see hangunud."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3636,13 +3637,13 @@
"Seansi %1 lukustamine nurjus, selle on juba lukustanud %2 masinas "
"%3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
msgstr "Seansi %1 lukustamine nurjus (lukustusfail pole kättesaadav)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3650,25 +3651,25 @@
"session to launch.
"
msgstr "
Palun sulge tõrkuv rakenduse isend või käivita uus seanss.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Proovi uuesti käivitada"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Vali teine seanss"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Seansi %1 lukustamine nurjus"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3779,19 +3780,19 @@
msgid "Configure Environment Variables"
msgstr "Keskkonnamuutujate seadistamine"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Sisesta muutuja..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Pakkmuutmise režiim"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4352,7 +4353,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Uus"
@@ -4632,67 +4633,67 @@
msgid "Select Tool View to Add"
msgstr "Lisatava tööriistavaate valimine"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Aktiivne töökomplekt"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Töökomplekt"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr "Eemalda see töökomplekt. See ei mõjuta selles sisalduvaid dokumente."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Dokumendid:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Lisa kõik"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
"working set."
msgstr "Lisa kõik selle töökomplekti dokumendid aktiivsesse töökomplekti."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
"active working set."
msgstr "Eemalda kõik selle töökomplekti dokumendid aktiivsest töökomplektist."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Klõpsa dokumendi avamiseks ja aktiveerimiseks."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Eemalda see fail aktiivsest töökomplektist"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Lisa see fail aktiivsesse töökomplekti"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Panipaik"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Laadi"
@@ -5123,25 +5124,25 @@
msgid "There are no committed differences."
msgstr "Erinevusi pole."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "VCS-i toetus"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Uue haru loomine valitud haru põhjal"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Sama, mis git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (yksi osuma)"
msgstr[1] "%2 (%1 osumaa)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
@@ -255,14 +255,12 @@
"heti. Voit myös korvata."
#: grepviewplugin.cpp:136 grepviewplugin.cpp:159
-#, fuzzy, kde-format
-#| msgid "Find/Replace in This Folder"
+#, kde-format
msgid "Find/Replace in This Folder..."
-msgstr "Etsi ja korvaa tästä kansiosta"
+msgstr "Etsi ja korvaa tästä kansiosta…"
#: grepviewplugin.cpp:147
-#, fuzzy, kde-format
-#| msgid "Find/Replace in Fi&les..."
+#, kde-format
msgid "&Find/Replace in Files..."
msgstr "Etsi ja korvaa &tiedostoista…"
diff -Nru kdevplatform-5.1.0/po/fi/kdevpatchreview.po kdevplatform-5.1.1/po/fi/kdevpatchreview.po
--- kdevplatform-5.1.0/po/fi/kdevpatchreview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fi/kdevpatchreview.po 2017-05-13 10:12:33.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-11 19:33+0200\n"
"Last-Translator: Lasse Liehu \n"
"Language-Team: Finnish \n"
@@ -26,56 +26,56 @@
msgstr "Mukautettu korjaus"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Korjaus"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Peruskansio:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Korjauksen peruskansio…"
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Tiedostosta"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Korjauksen sijainti…"
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Komennosta"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Komennon tuloste…"
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Korjaus on jo käytössä paikallisessa versiossa"
# Onko parempaa tapaa sanoa?
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Jo käytössä"
diff -Nru kdevplatform-5.1.0/po/fi/kdevplatform.po kdevplatform-5.1.1/po/fi/kdevplatform.po
--- kdevplatform-5.1.0/po/fi/kdevplatform.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fi/kdevplatform.po 2017-05-13 10:12:33.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2016-05-27 23:11+0200\n"
"Last-Translator: Lasse Liehu \n"
"Language-Team: Finnish \n"
@@ -352,8 +352,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Poista"
@@ -483,7 +483,7 @@
msgstr "Viimeaikaiset lausekkeet"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Poista kaikki"
@@ -627,6 +627,14 @@
msgid "Failed to apply changes: %1"
msgstr "Muutosten toteuttaminen epäonnistui: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Muuta nimeä"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -750,13 +758,6 @@
msgid "Applying changes failed: %1"
msgstr "Muutosten toteuttaminen epäonnistui: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Muuta nimeä"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1595,27 +1596,27 @@
msgid "Various items"
msgstr "Useita kohteita"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Kansiota %1 ei voi poistaa."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Tiedostoa %1 ei voi poistaa."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Tiedosto %1 on jo olemassa."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Tiedostoa %1 ei voi luoda."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Kansiota %1 ei voi luoda."
@@ -1689,19 +1690,19 @@
#: project/widgets/dependencieswidget.ui:35
#, kde-format
msgid "Enter a dependency to add to the list"
-msgstr ""
+msgstr "Kirjoita luetteloon lisättävä riippuvuus"
#. i18n: ectx: property (toolTip), widget (QPushButton, addDependency)
#: project/widgets/dependencieswidget.ui:55
#, kde-format
msgid "Adds the listed target to the dependency list."
-msgstr ""
+msgstr "Lisää luetellun kohteen riippuvuusluetteloon."
#. i18n: ectx: property (toolTip), widget (QListWidget, dependencies)
#: project/widgets/dependencieswidget.ui:68
#, kde-format
msgid "List of indirect dependent targets."
-msgstr ""
+msgstr "Epäsuorien riippuvuuskohteiden luettelo."
#. i18n: ectx: property (whatsThis), widget (QListWidget, dependencies)
#: project/widgets/dependencieswidget.ui:71
@@ -1711,24 +1712,26 @@
"depend on, but for which an action needs to be taken before running the "
"application."
msgstr ""
+"Tämä luettelo sisältää kohteet, joista sovellus ei ole suoraan riippuvainen, "
+"mutta joille täytyy tehdä toimintoja ennen sovelluksen suorittamista."
#. i18n: ectx: property (toolTip), widget (QPushButton, removeDependency)
#: project/widgets/dependencieswidget.ui:87
#, kde-format
msgid "Removes the selected dependencies from the list."
-msgstr ""
+msgstr "Poistaa valitut riippuvuudet luettelosta."
#. i18n: ectx: property (toolTip), widget (QPushButton, moveDepUp)
#: project/widgets/dependencieswidget.ui:103
#, kde-format
msgid "Moves the selected dependency up in the list."
-msgstr ""
+msgstr "Siirtää valitun riippuvuuden luettelossa ylemmäs."
#. i18n: ectx: property (toolTip), widget (QPushButton, moveDepDown)
#: project/widgets/dependencieswidget.ui:119
#, kde-format
msgid "Moves the selected dependency down in the list."
-msgstr ""
+msgstr "Siirtää valitun riippuvuuden luettelossa alemmas."
#: serialization/itemrepository.h:217 serialization/itemrepository.h:1945
#, kde-format
@@ -1796,12 +1799,12 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Asetukset"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1810,7 +1813,7 @@
"Nykyisessä asetusosiossa on tallentamattomia muutoksia.\n"
"Haluatko ottaa muutokset käyttöön vai hylätäänkö ne?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Käytä asetuksia"
@@ -2917,18 +2920,18 @@
msgid "Show detailed progress window"
msgstr "Näytä edistymisen yksityiskohtainen ikkuna"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Ladataan projektia %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Ladataan %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2937,31 +2940,31 @@
"Projektitiedoston %1 lataaminen epäonnistui. Projekti on poistettu "
"istunnosta."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Kehittäjätiedostolle ei saatu luotua piilokansiota (%1)"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Projektitiedostoa ei saatu noudettua: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Tiedostoa %1 ei voitu ladata, koska projekti samalla nimellä ”%2” on jo "
"avoinna."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2969,12 +2972,12 @@
msgstr ""
"projektin tuontiliitännäinen (%1) ei tue IProjectFileManager-rajapintaa"
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Projektia ei voitu avata"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2983,57 +2986,57 @@
"Projektin kehittäjäkohtaisia asetuksia ei voitu tallentaa.\n"
"Huomio: Muuttamasi projektiasetukset menetetään."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Projektin %1 asetukset"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Virheellinen sijainti: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projektia ollaan jo avaamassa"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Jo avaamassa projektia %1, ei avata uudelleen"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Korvaa"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
"Continue to open the project and use the just provided project configuration."
msgstr "Jatka projektin avaamista ja käytä juuri annettuja projektiasetuksia"
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Avaa nykyinen tiedosto"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
"Continue to open the project but use the existing project configuration."
msgstr "Jatka projektin avaamista, mutta käytä nykyisiä projektiasetuksia"
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Peru äläkä avaa projektia"
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3042,34 +3045,34 @@
"Kansiossa %1 on jo projektiasetustiedosto.\n"
"Haluatko korvata sen vai avata nykyisen tiedoston?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Korvaa nykyiset projektiasetukset"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Asetustiedoston %1 luonti epäonnistui"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Avaa nykyinen projekti uudelleen?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Avaa tai tuo projekti…"
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Avaa tai tuo projekti"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3084,19 +3087,19 @@
"olevan kansion, joka avataan KDevelopissa. Uusi KDevelop4-projektitiedosto "
"luodaan, jos avatussa kansiossa ei sitä vielä ole."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Nouda projekti…"
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Nouda projekti"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3104,65 +3107,65 @@
"4."
msgstr "Opastaa käyttäjän noutamaan projektin ja tuomaan sen KDevelop 4:ään."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Sulje projektit"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Sulje kaikki valitut projektit"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Avaa asetukset…"
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Kommitoi nykyinen projekti…"
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Kommitoi…"
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Avaa viimeaikainen projekti"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Avaa viimeaikaisen projektin."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Avaa nykyisen tiedoston projekti"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Projekti on jo avoinna: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Ei aktiivista tiedostoa"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Projekti on jo avoinna"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3171,12 +3174,12 @@
"Olet avaamassa projektia, joka on jo avoinna vähintään yhdessä toisessa "
"istunnossa. Mitä haluat tehdä?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Lisää projekti nykyiseen istuntoon"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Avaa istunto %1"
@@ -3636,19 +3639,19 @@
msgid "Create New Session"
msgstr "Luo uusi istunto"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "tehtiin käynnissä oleva %1-instanssi (PID: %2) näkyväksi"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "käynnissä oleva %1-instanssi (PID: %2) on nähtävästi jumissa"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3658,7 +3661,7 @@
"Valittu ohjelma ei vastannut D-Bus-pyyntöön, joten se saattaa olla kaatunut "
"tai jumissa."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3667,7 +3670,7 @@
"Istunnon %1 lukitseminen epäonnistui, koska %2 on jo lukinnut sen "
"koneella %3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3675,7 +3678,7 @@
"Istunnon %1 lukitseminen epäonnistui (lukitustiedosto ei ole "
"saatavilla)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3685,25 +3688,25 @@
"
Sulje häiritsevä ohjelmainstanssi tai valitse toinen käynnistettävä "
"istunto.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Yritä käynnistämistä uudelleen"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Valitse toinen istunto"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Istunnon %1 lukitseminen epäonnistui"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3815,19 +3818,19 @@
msgid "Configure Environment Variables"
msgstr "Ympäristömuuttujien asetukset"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Kirjoita muuttuja…"
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Erämuokkaustila"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4386,7 +4389,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Uusi"
@@ -4666,32 +4669,32 @@
msgid "Select Tool View to Add"
msgstr "Valitse lisättävä työkalunäkymä"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Aktiivinen työjoukko"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Työjoukko"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr "Poista tämä työjoukko. Ei vaikuta siihen kuuluviin tiedostoihin."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Tiedostot:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Lisää kaikki"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4699,7 +4702,7 @@
msgstr ""
"Lisää kaikki tähän työjoukkoon kuuluvat tiedostot aktiiviseen työjoukkoon."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4707,28 +4710,28 @@
msgstr ""
"Poista kaikki tähän työjoukkoon kuuluvat tiedostot aktiivisesta työjoukosta."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Avaa ja aktivoi tämä tiedosto napsauttamalla"
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Poista tämä tiedosto nykyisestä työjoukosta"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Lisää tämä tiedosto nykyiseen työjoukkoon"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Piilota"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Lataa"
@@ -5167,25 +5170,25 @@
msgid "There are no committed differences."
msgstr "Ei eroja."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "VCS-tuki"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Luo uusi haara, joka perustuu valittuun haaraan"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Sama kuin git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5193,25 +5196,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Checkout-toiminto valittuun haaraan"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Checkout"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Yhdistä"
@@ -5367,73 +5370,73 @@
msgid "Source Revision"
msgstr "Lähteen versio"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Päivitä"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Lisää"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Näytä erot…"
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Palauta"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historia…"
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Merkinnät…"
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Näytä erot…"
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Näytä erot (kaikki tiedostot)…"
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Lähetä muutokset (push)"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Nouda muutokset (pull)"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Ei eroja."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Eroja ei saatu haettua."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2-historia (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5442,7 +5445,7 @@
"Merkintöjä ei voitu näyttää, koska KTextEditor::AnnotationInterface-"
"rajapinta puuttuu muokkaimesta."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5453,7 +5456,7 @@
"se ei ollut tekstitiedosto:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Kopioi versio"
@@ -5481,38 +5484,38 @@
msgid "Recursive"
msgstr "Rekursiivinen"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Muutosviesti:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Vanhat viestit"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr "Katso lisätietoja versionhallinnan työkalunäkymästä"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Muutoksen toteuttaminen epäonnistui"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Muutos epäonnistui"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Kommitoi"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5525,12 +5528,12 @@
"Viestillä:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Suorittamassa commit-toimintoa versionhallintaan"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Nykyiselle versiolle ei voitu luoda korjausta."
@@ -5541,7 +5544,7 @@
msgstr "Versioiden %1 ja %2 erot:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Muutokset versioiden välillä"
diff -Nru kdevplatform-5.1.0/po/fi/kdevprojectmanagerview.po kdevplatform-5.1.1/po/fi/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/fi/kdevprojectmanagerview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fi/kdevprojectmanagerview.po 2017-05-13 10:12:33.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2015-08-01 13:50+0200\n"
"Last-Translator: Lasse Liehu \n"
"Language-Team: Finnish \n"
@@ -198,63 +198,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Luo tiedosto"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Luo kansio"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Käännä"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Asenna"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Puhdista"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Lisää käännösjoukkoon"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Sulje projekti"
msgstr[1] "Sulje projektit"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Päivitä"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Poista"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Muuta nimeä…"
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Poista kohteesta"
#: projectmanagerviewplugin.cpp:493
@@ -279,6 +289,11 @@
msgid "Delete Files"
msgstr "Poista tiedostot"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Muuta nimeä…"
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/fr/kdevappwizard.po kdevplatform-5.1.1/po/fr/kdevappwizard.po
--- kdevplatform-5.1.0/po/fr/kdevappwizard.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fr/kdevappwizard.po 2017-05-13 10:12:33.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2014-09-02 17:14+0200\n"
"Last-Translator: Vincent PINON \n"
"Language-Team: French \n"
@@ -61,62 +61,62 @@
"aidera dans la génération d'un squelette pour votre application à partir "
"d'un ensemble de modèles."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Impossible de créer le projet à partir d'un modèle\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Impossible de créer le projet"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Veuillez voir l'affichage de l'outil de contrôle de versions"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Erreur du système de contrôle de versions"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Impossible d'initialiser le dépôt « DVCS »"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Impossible d'ajouter des fichiers au dépôt « DVCS »"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Impossible d'importer le projet dans %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Impossible d'importer un projet"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Impossible d'extraire un projet importé"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Impossible de créer un nouveau projet"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Impossible de créer le fichier %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Modèles de projets"
@@ -128,60 +128,60 @@
msgid "Project"
msgstr "Projet"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Catégorie"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Type de projet"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obtenir plus de modèles"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Charger un modèle depuis un fichier"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Emplacement non valable"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nom de projet vide"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nom de projet non valable"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr ""
"Impossible de créer des sous-dossiers, les droits d'accès sont manquants "
"sur : %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Modèle de projet non valable. Veuillez choisir un élément final."
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
#| msgid "Path already exists and contains files"
msgid "Path already exists and contains files. Open it as a project."
msgstr "L'emplacement existe déjà et contient des fichiers"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -208,7 +208,7 @@
msgid "Location:"
msgstr "Emplacement :"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/fr/kdevgrepview.po kdevplatform-5.1.1/po/fr/kdevgrepview.po
--- kdevplatform-5.1.0/po/fr/kdevgrepview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fr/kdevgrepview.po 2017-05-13 10:12:33.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2014-03-03 17:04+0100\n"
"Last-Translator: Vincent PINON \n"
"Language-Team: French \n"
@@ -108,39 +108,39 @@
msgid "Grep: %1"
msgstr "Grep : %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Ligne %1 : "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 correspondance"
msgstr[1] "%1 correspondances"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 fichier"
msgstr[1] "%1 fichiers"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 dans %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (une seule correspondance)"
msgstr[1] "%2 (%1 correspondances)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/fr/kdevpatchreview.po kdevplatform-5.1.1/po/fr/kdevpatchreview.po
--- kdevplatform-5.1.0/po/fr/kdevpatchreview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fr/kdevpatchreview.po 2017-05-13 10:12:33.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2014-03-03 17:05+0100\n"
"Last-Translator: Vincent PINON \n"
"Language-Team: French \n"
@@ -29,55 +29,55 @@
msgstr "Correctif personnalisé"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Correctif"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base :"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Base du correctif..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Depuis un fichier"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Emplacement du correctif..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Depuis une commande"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Sortie de la commande..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Le correctif est déjà appliqué sur la version locale"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Déjà appliqué"
diff -Nru kdevplatform-5.1.0/po/fr/kdevplatform.po kdevplatform-5.1.1/po/fr/kdevplatform.po
--- kdevplatform-5.1.0/po/fr/kdevplatform.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fr/kdevplatform.po 2017-05-13 10:12:33.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevplatform-old\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2015-06-11 15:36+0200\n"
"Last-Translator: Vincent PINON \n"
"Language-Team: French \n"
@@ -364,8 +364,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Supprimer"
@@ -498,7 +498,7 @@
msgstr "Expressions récentes"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Tout supprimer"
@@ -646,6 +646,14 @@
msgid "Failed to apply changes: %1"
msgstr "Il est impossible de verrouiller la session %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Renommer"
+
#: language/assistant/renamefileaction.cpp:56
#, fuzzy, kde-format
#| msgid "Renaming \"%1\" to \"%2\""
@@ -775,13 +783,6 @@
msgid "Applying changes failed: %1"
msgstr "L'application des modifications a échoué : %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Renommer"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1623,27 +1624,27 @@
msgid "Various items"
msgstr "Éléments divers"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Il est impossible de supprimer le dossier %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Il est impossible de supprimer le fichier %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Le fichier %1 existe déjà."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Il est impossible de créer le fichier %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Il est impossible de créer le dossier %1."
@@ -1828,21 +1829,21 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, fuzzy, kde-format
#| msgctxt "@info:status"
#| msgid "configure"
msgid "Configure"
msgstr "configuré"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
msgstr ""
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr ""
@@ -2976,18 +2977,18 @@
msgid "Show detailed progress window"
msgstr "Afficher la fenêtre de progression détaillée"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Chargement du projet %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Chargement de %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2996,33 +2997,33 @@
"Impossible de charger le fichier projet %1. Le projet a été supprimé de "
"la session."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"Il est impossible de créer le dossier caché (%1) pour le fichier de "
"développeur"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Il est impossible d'obtenir le fichier projet : %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Il est impossible de charger %1, un projet du même nom « %2 » est déjà "
"ouvert."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -3031,12 +3032,12 @@
"le module externe d'importation de projet (%1) ne prend pas en charge "
"l'interface IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Il est impossible d'ouvrir le projet"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -3046,32 +3047,32 @@
"développeur.\n"
"Attention : les paramètres de projet que vous avez modifiés seront perdus."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configurer le projet %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Emplacement incorrect : %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projet déjà en cours d'ouverture"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "%1 déjà en cours d'ouverture, ne pas ouvrir à nouveau"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Redéfinir"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3080,12 +3081,12 @@
"Continue à ouvrir le projet et utilise la configuration de projet qui vient "
"d'être fournie."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Ouvrir un fichier existant"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3094,13 +3095,13 @@
"Continue à ouvrir le projet mais utilise la configuration de projet "
"existante."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Annule et n'ouvre pas le projet."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3109,34 +3110,34 @@
"Il existe déjà un fichier de configuration de projet à %1.\n"
"Voulez-vous le redéfinir ou ouvrir le fichier existant ?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Redéfinir une configuration de projet existante"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Il est impossible de créer le fichier de configuration %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Rouvrir le projet actuel ?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Ouvrir / Importer un projet..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Ouvre / Importe un projet"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, fuzzy, kde-format
#| msgctxt "@info:whatsthis"
#| msgid ""
@@ -3159,19 +3160,19 @@
"dossier existant ne contenant pas encore de fichier de projet KDevelop4, le "
"fichier sera créé."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Extraire un projet..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Extrait un projet"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3181,65 +3182,65 @@
"Guide l'utilisateur tout au long de l'extraction du projet puis l'importe "
"dans KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Ferme le ou les projets"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Ferme tous les projets actuellement sélectionnés"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Ouvrir la configuration..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Valider le projet actuel..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Propagation..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Ouvre un projet récent"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Ouvre un projet récemment ouvert."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Ouvrir un projet pour le fichier actuel"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Projet déjà ouvert : %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Pas de document actif"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Projet déjà ouvert"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3248,12 +3249,12 @@
"Le projet que vous tentez d'ouvrir actuellement est déjà ouvert dans au "
"moins une autre session. Que voulez-vous faire ?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Ajouter un projet à la session actuelle"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Ouvrir la session %1"
@@ -3714,20 +3715,20 @@
msgid "Create New Session"
msgstr "Créer une nouvelle session"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "rendu l'instance en cours d'exécution %1 (PID : %2) visible"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr ""
"L'instance en cours de fonctionnement %1 (PID : %2) est apparemment bloquée"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3737,7 +3738,7 @@
"L'application donnée n'a pas répondu à un appel D-BUS. Il se peut qu'elle se "
"soit arrêtée brutalement ou qu'elle soit bloquée."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3746,7 +3747,7 @@
"Il est impossible de verrouiller la session %1, déjà verrouillée "
"par %2 sur %3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3754,7 +3755,7 @@
"Il est impossible de verrouiller la session %1 (fichier-verrou "
"indisponible)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3764,25 +3765,25 @@
"
Veuillez fermer l'instance de l'application incriminée ou choisissez une "
"autre session à lancer.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Tenter un nouveau démarrage"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Choisir une autre session"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Il est impossible de verrouiller la session %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3898,19 +3899,19 @@
msgid "Configure Environment Variables"
msgstr "Configurer les variables d'environnement"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Saisissez la variable..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr ""
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, fuzzy, kde-format
#| msgctxt "project name (branch name)"
#| msgid "%1 (%2)"
@@ -4502,7 +4503,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nouveau"
@@ -4790,34 +4791,34 @@
msgid "Select Tool View to Add"
msgstr "Sélectionner la vue d'outils à ajouter"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Ensemble de travail actif"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Espace de travail"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Supprime cet espace de travail. Les documents qu'il contient n'en sont pas "
"affectés."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documents :"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Tout ajouter"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4826,7 +4827,7 @@
"Ajoute à l'espace de travail actuellement actif tous les documents faisant "
"partie de cet espace de travail."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4835,28 +4836,28 @@
"Supprime de l'espace de travail actuellement actif tous les documents "
"faisant partie de cet espace de travail."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Cliquez pour ouvrir et activer ce document."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Supprimer ce fichier de l'espace de travail actuel"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Ajouter ce fichier à l'espace de travail actuellement actif"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Charger"
@@ -5301,25 +5302,25 @@
msgid "There are no committed differences."
msgstr "Il n'existe pas de différences."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Prise en charge de VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Crée une nouvelle branche reposant sur la branche sélectionnée"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Identique à « git branch -D »"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5327,25 +5328,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Extraire dans la branche sélectionnée"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Extraire"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr ""
@@ -5501,73 +5502,73 @@
msgid "Source Revision"
msgstr "Révision des sources"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Mettre à jour"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Ajouter"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Afficher les différences..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Annuler"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historique..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Annotation..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Afficher les différences..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Afficher les différences (tous les fichiers)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Envoyer"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Recevoir"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Il n'existe pas de différences."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Il est impossible d'obtenir des différences."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Historique de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5576,7 +5577,7 @@
"Il est impossible d'afficher les annotations, il manque l'interface "
"KTextEditor::AnnotationInterface pour l'éditeur."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5587,7 +5588,7 @@
"introuvable ou n'est pas un document texte :\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Révision de la copie"
@@ -5616,39 +5617,39 @@
msgid "Recursive"
msgstr "Récursivement"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Message de propagation :"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Anciens messages"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Unable to write to %1"
msgid "Unable to commit"
msgstr "Il est impossible d'écrire dans %1"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Validation"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5661,12 +5662,12 @@
"Avec le message :\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "À propos de la propagation dans le dépôt"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Il est impossible de créer un correctif pour la version actuelle."
@@ -5677,7 +5678,7 @@
msgstr "Différences entre les révisions %1 et %2 :"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Différences entre les révisions"
diff -Nru kdevplatform-5.1.0/po/fr/kdevprojectmanagerview.po kdevplatform-5.1.1/po/fr/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/fr/kdevprojectmanagerview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/fr/kdevprojectmanagerview.po 2017-05-13 10:12:33.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2014-03-03 17:21+0100\n"
"Last-Translator: Vincent PINON \n"
"Language-Team: French \n"
@@ -202,63 +202,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Créer un fichier"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Créer un dossier"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Construire"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Installer"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Nettoyer"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Ajouter à l'ensemble de construction"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Fermer un projet"
msgstr[1] "Fermer des projets"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Recharger"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Supprimer"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Renommer..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Supprimer de la cible"
#: projectmanagerviewplugin.cpp:493
@@ -283,6 +293,11 @@
msgid "Delete Files"
msgstr "Supprimer des fichiers"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Renommer..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/ga/kdevappwizard.po kdevplatform-5.1.1/po/ga/kdevappwizard.po
--- kdevplatform-5.1.0/po/ga/kdevappwizard.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/ga/kdevappwizard.po 2017-05-13 10:12:34.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevplatform/kdevappwizard.po\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2009-01-23 07:07-0500\n"
"Last-Translator: Kevin Scannell \n"
"Language-Team: Irish \n"
@@ -58,64 +58,64 @@
"Cabhróidh an treoraí leat creatlach d'fheidhmchláir a chruthú as tacar "
"teimpléad.
"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Níorbh fhéidir tionscadal nua a chruthú ó theimpléad.\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Níorbh fhéidir tionscadal nua a chruthú"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, fuzzy, kde-format
#| msgctxt "Page for version control options"
#| msgid "Version Control"
msgid "Version Control System Error"
msgstr "Rialú Leaganacha"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr ""
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr ""
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Níorbh fhéidir an tionscadal a iompórtáil i %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Níorbh fhéidir an tionscadal a iompórtáil"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Níorbh fhéidir an tionscadal iompórtáilte a sheiceáil amach"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Níorbh fhéidir tionscadal nua a chruthú"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Ní féidir comhad %1 a chruthú."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Teimpléid Tionscadail"
@@ -127,57 +127,57 @@
msgid "Project"
msgstr "Tionscadal"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Catagóir"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr ""
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr ""
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr ""
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr ""
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr ""
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr ""
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr ""
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr ""
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr ""
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -202,7 +202,7 @@
msgid "Location:"
msgstr "Suíomh:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/ga/kdevgrepview.po kdevplatform-5.1.1/po/ga/kdevgrepview.po
--- kdevplatform-5.1.0/po/ga/kdevgrepview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/ga/kdevgrepview.po 2017-05-13 10:12:34.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevelop/kdevgrepview.po\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2009-01-20 10:11-0500\n"
"Last-Translator: Kevin Scannell \n"
"Language-Team: Irish \n"
@@ -108,12 +108,12 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Líne %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
@@ -123,7 +123,7 @@
msgstr[3] ""
msgstr[4] ""
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
@@ -133,13 +133,13 @@
msgstr[3] ""
msgstr[4] ""
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
"
msgstr ""
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr ""
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Roghnaigh seisiún eile"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr ""
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3779,20 +3780,20 @@
msgid "Configure Environment Variables"
msgstr "Timpeallacht"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, fuzzy, kde-format
#| msgid "&Remove all"
msgid "Enter variable ..."
msgstr "&Bain uile"
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr ""
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, fuzzy, kde-format
#| msgid "%1 (%2)"
msgctxt "a copy of the existing environment was created"
@@ -4337,7 +4338,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nua"
@@ -4607,67 +4608,67 @@
msgid "Select Tool View to Add"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Cáipéisí:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Cuir Uile Leis"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
"working set."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
"active working set."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr ""
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Luchtaigh"
@@ -5084,25 +5085,25 @@
msgid "There are no committed differences."
msgstr "Níl aon difríochtaí ann."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Tacaíocht VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5110,26 +5111,26 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, fuzzy, kde-format
#| msgid "Compare to Base..."
msgid "Compare to Branch"
msgstr "Cuir i gComparáid leis an mBun..."
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Seiceáil Amach"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr ""
@@ -5283,73 +5284,73 @@
msgid "Source Revision"
msgstr ""
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Nuashonraigh"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Cuir Leis"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Taispeáin Difríochtaí..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Fill"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Stair..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anótáil..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr ""
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr ""
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Brúigh"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr ""
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Níl aon difríochtaí ann."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Ní féidir difríochtaí a fháil."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2 Stair (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5358,7 +5359,7 @@
"Ní féidir anótálacha a thaispeáint, comhéadan KTextEditor::"
"AnnotationInterface ar iarraidh ón eagarthóir."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5369,7 +5370,7 @@
"cháipéis, nó ní cáipéis téacs é:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Cóipeáil an Leasú"
@@ -5398,39 +5399,39 @@
msgid "Recursive"
msgstr "Athchúrsach"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Seanteachtaireachtaí"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, fuzzy, kde-format
#| msgid "Unable to write to %1"
msgid "Unable to commit"
msgstr "Ní féidir %1 a scríobh"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Cuir i bhFeidhm"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5439,12 +5440,12 @@
"
%2
"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr ""
@@ -5455,7 +5456,7 @@
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr ""
diff -Nru kdevplatform-5.1.0/po/ga/kdevprojectmanagerview.po kdevplatform-5.1.1/po/ga/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/ga/kdevprojectmanagerview.po 2017-03-13 19:05:09.000000000 +0000
+++ kdevplatform-5.1.1/po/ga/kdevprojectmanagerview.po 2017-05-13 10:12:34.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevplatform/kdevprojectmanagerview.po\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2009-01-20 10:11-0500\n"
"Last-Translator: Kevin Scannell \n"
"Language-Team: Irish \n"
@@ -196,41 +196,47 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Cruthaigh Comhad"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Cruthaigh Fillteán"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Tóg"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Suiteáil"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Glan"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
-msgstr ""
+#, fuzzy, kde-format
+#| msgid "Build"
+msgid "&Add to Build Set"
+msgstr "Tóg"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Dún Tionscadal"
msgstr[1] "Dún Tionscadail"
@@ -239,23 +245,27 @@
msgstr[4] "Dún Tionscadail"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Athluchtaigh"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Bain"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Athainmnigh..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Bain ón Sprioc"
#: projectmanagerviewplugin.cpp:493
@@ -283,6 +293,11 @@
msgid "Delete Files"
msgstr "Scrios Comhaid"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Athainmnigh..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/gl/kdevappwizard.po kdevplatform-5.1.1/po/gl/kdevappwizard.po
--- kdevplatform-5.1.0/po/gl/kdevappwizard.po 2017-03-13 19:05:11.000000000 +0000
+++ kdevplatform-5.1.1/po/gl/kdevappwizard.po 2017-05-13 10:12:34.000000000 +0000
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-03-12 19:41+0100\n"
"Last-Translator: Adrián Chaves Fernández \n"
"Language-Team: Galician \n"
@@ -62,62 +62,62 @@
"Isto inicia o asistente de aplicativos de KDevelop. Axudarao a xerar un "
"esqueleto para o seu aplicativo a partir duns modelos."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Non foi posíbel crear un proxecto novo a partir dun modelo\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Fallou a creación do proxecto"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Vexa a vista «Control de versións»."
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Erro do sistema de control de versións"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Non foi posíbel inicializar o repositorio do DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Non foi posíbel engadir os ficheiros ao repositorio do DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Non foi posíbel importar o proxecto en %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Non foi posíbel importar o proxecto"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Non foi posíbel obter o proxecto importado"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Non foi posíbel crear un proxecto novo"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Non foi posíbel crear o ficheiro %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Modelos de proxecto"
@@ -129,57 +129,57 @@
msgid "Project"
msgstr "Proxecto"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoría"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipo de proxecto"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obter máis modelos"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Cargar un modelo desde un ficheiro"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Lugar non válido"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "O nome do proxecto está en branco"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "O nome do proxecto non é válido"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Non foi posíbel crear subcartafoles, non ten permisos en: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "O modelo de proxecto non é válido, escolla un elemento terminal"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "Ese cartafol xa existe e contén ficheiros. Ábrao como un proxecto."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -206,7 +206,7 @@
msgid "Location:"
msgstr "Localización:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/gl/kdevgrepview.po kdevplatform-5.1.1/po/gl/kdevgrepview.po
--- kdevplatform-5.1.0/po/gl/kdevgrepview.po 2017-03-13 19:05:11.000000000 +0000
+++ kdevplatform-5.1.1/po/gl/kdevgrepview.po 2017-05-13 10:12:34.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2015-03-12 20:00+0100\n"
"Last-Translator: Adrián Chaves Fernández \n"
"Language-Team: Galician \n"
@@ -110,39 +110,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Liña %1:"
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 coincidencia"
msgstr[1] "%1 coincidencias"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 ficheiro"
msgstr[1] "%1 ficheiros"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 en %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (unha coincidencia)"
msgstr[1] "%2 (%1 coincidencias)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/gl/kdevpatchreview.po kdevplatform-5.1.1/po/gl/kdevpatchreview.po
--- kdevplatform-5.1.0/po/gl/kdevpatchreview.po 2017-03-13 19:05:11.000000000 +0000
+++ kdevplatform-5.1.1/po/gl/kdevpatchreview.po 2017-05-13 10:12:34.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2015-05-14 06:09+0200\n"
"Last-Translator: Adrián Chaves Fernández \n"
"Language-Team: Galician \n"
@@ -28,55 +28,55 @@
msgstr "Parche personalizado"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Parche"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Base de parches…"
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Dun ficheiro"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Localización do parche…"
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Dunha orde"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Saída da orde…"
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "O parche xa está aplicado na versión local"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Xa aplicado"
diff -Nru kdevplatform-5.1.0/po/gl/kdevplatform.po kdevplatform-5.1.1/po/gl/kdevplatform.po
--- kdevplatform-5.1.0/po/gl/kdevplatform.po 2017-03-13 19:05:11.000000000 +0000
+++ kdevplatform-5.1.1/po/gl/kdevplatform.po 2017-05-13 10:12:34.000000000 +0000
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2016-06-29 07:01+0100\n"
"Last-Translator: Adrián Chaves Fernández (Gallaecio) \n"
@@ -358,8 +358,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Borrar"
@@ -490,7 +490,7 @@
msgstr "Expresións recentes"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Eliminar todo"
@@ -570,7 +570,7 @@
#: documentation/documentationview.cpp:71
#, kde-format
msgid "Back"
-msgstr "Recuar"
+msgstr "Retroceder"
#: documentation/documentationview.cpp:72
#, kde-format
@@ -635,6 +635,14 @@
msgid "Failed to apply changes: %1"
msgstr "Fallou a aplicación das modificacións: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Renomear"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -758,13 +766,6 @@
msgid "Applying changes failed: %1"
msgstr "Fallou a aplicación das modificacións: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Renomear"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -930,7 +931,7 @@
#: language/duchain/navigation/abstractdeclarationnavigationcontext.cpp:84
#, kde-format
msgid "Back to %1 "
-msgstr "Recuar ata %1 "
+msgstr "Retroceder ata %1 "
#: language/duchain/navigation/abstractdeclarationnavigationcontext.cpp:100
#, kde-format
@@ -1599,27 +1600,27 @@
msgid "Various items"
msgstr "Varios elementos"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Non é posíbel eliminar o cartafol %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Non foi posíbel eliminar o ficheiro %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Xa existe un ficheiro chamado %1."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Non foi posíbel crear o ficheiro %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Non foi posíbel crear o cartafol %1."
@@ -1798,12 +1799,12 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configurar"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1812,7 +1813,7 @@
"Modificouse a configuración do módulo activo.\n"
"Quere aplicar as modificacións ou descartalas?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Aplicar a configuración"
@@ -2583,18 +2584,18 @@
#: shell/mainwindow_p.cpp:234
#, kde-format
msgid "About KDevelop Platform"
-msgstr "Acerca da plataforma KDevelop"
+msgstr "Sobre a plataforma KDevelop"
#: shell/mainwindow_p.cpp:236
#, kde-format
msgid "Show Information about KDevelop Platform"
-msgstr "Mostrar información acerca da plataforma KDevelop"
+msgstr "Mostrar información sobre a plataforma KDevelop"
#: shell/mainwindow_p.cpp:237
#, kde-format
msgctxt "@info:whatsthis"
msgid "Shows a dialog with information about KDevelop Platform."
-msgstr "Mostrar un diálogo con información acerca da plataforma KDevelop."
+msgstr "Mostrar un diálogo con información sobre a plataforma KDevelop."
#: shell/mainwindow_p.cpp:241
#, kde-format
@@ -2606,7 +2607,7 @@
msgctxt "@info:whatsthis"
msgid "Shows a dialog with information about all loaded plugins."
msgstr ""
-"Mostra un diálogo con información acerca de todos os complementos cargados."
+"Mostra un diálogo con información sobre todos os complementos cargados."
#: shell/mainwindow_p.cpp:245
#, kde-format
@@ -2925,18 +2926,18 @@
msgid "Show detailed progress window"
msgstr "Mostrar a xanela de progreso detallada"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Estase a cargar o proxecto %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Estase a cargar %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2945,31 +2946,31 @@
"Non foi posíbel cargar o ficheiro do proxecto %1. O proxecto retirouse da "
"sesión."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"Non foi posíbel crear o directorio oculto (%1) para o ficheiro do "
"desenvolvedores"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Non foi posíbel obter o ficheiro do proxecto: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr "Non foi posíbel cargar %1, xa ten aberto outro proxecto chamado «%2»."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2978,12 +2979,12 @@
"o engadido de importación de proxecto (%1) non admite a interface "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Non foi posíbel abrir o proxecto"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2994,32 +2995,32 @@
"Atención: perderanse as modificacións que fixese na configuración do "
"proxecto."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configurar o proxecto %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Lugar non válido: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Ese proxecto xa se está a abrir"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Xa se está a abrir %1, non se abre de novo"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Anular"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3028,12 +3029,12 @@
"Continuar a abrir o proxecto e empregar a configuración de proxecto que se "
"acaba de indicar."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Abrir un ficheiro existente"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3042,13 +3043,13 @@
"Continuar a abrir o proxecto mais empregar a configuración de proxecto "
"existente."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancelar e non abrir o proxecto."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3057,34 +3058,34 @@
"Xa existe un proxecto de configuración do proxecto en %1.\n"
"Quere substituílo ou abrir o ficheiro existente?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Anular a configuración do proxecto existente"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Non foi posíbel crear o ficheiro de configuración %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Desexa abrir de novo o proxecto actual?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Abrir ou Importar un proxecto…"
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Abrir ou importar un proxecto."
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3100,19 +3101,19 @@
"directorio existente que aínda non teña un ficheiro de proxecto de "
"KDevelop4, o ficheiro créase."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Obter un proxecto…"
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Descargar un proxecto"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3120,65 +3121,65 @@
"4."
msgstr "Axuda ao usuario a descargar un proxecto e impórtao a KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Pechar o(s) proxecto(s)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Pecha todos os proxectos escollidos"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Abrir a configuración…"
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Enviar este proxecto…"
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Entregar…"
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Abrir un proxecto recente"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Abre un proxecto aberto recentemente."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Abrir un proxecto para o ficheiro actual"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Ese proxecto xa está aberto: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Non hai ningún documento activo"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Ese proxecto xa está aberto"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3187,12 +3188,12 @@
"O proxecto que está a intentar abrir xa está aberto en polo menos outra "
"sesión. Que quere facer?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Engadir un proxecto á sesión actual"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Abrir a sesión %1"
@@ -3648,19 +3649,19 @@
msgid "Create New Session"
msgstr "Crear unha sesión nova"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "facer que a instancia en execución de %1 (PID: %2) sexa visíbel"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "aparentemente, a instancia en execución de %1 (PID: %2) esta «colgada»"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3670,7 +3671,7 @@
"O aplicativo mencionado non respondeu a unha chamada de DBUS; pode que "
"quebrase ou que estea «colgado»."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3679,7 +3680,7 @@
"Non foi posíbel bloquear a sesión %1; xa está bloqueada por %2 en "
"%3 (PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3687,7 +3688,7 @@
"Non foi posíbel bloquear a sesión %1 (o ficheiro de bloqueo non "
"está dispoñíbel)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3697,25 +3698,25 @@
"
Peche a instancia do aplicativo ofensor ou escolla outra sesión para "
"iniciar.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Intentar iniciar de novo"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Escoller outra sesión"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Non foi posíbel bloquear a sesión %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3827,19 +3828,19 @@
msgid "Configure Environment Variables"
msgstr "Configurar as variábeis do ambiente"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Introduza unha variable…"
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Modo de edición por lotes"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4407,7 +4408,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Novo"
@@ -4691,34 +4692,34 @@
msgid "Select Tool View to Add"
msgstr "Escolla a vista de utilidade para engadir"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Conxunto activo de traballo"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Conxunto de traballo"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Eliminar este conxunto de traballo. Os documentos contidos nel non se vén "
"afectados."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documentos:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Engadir todo"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4727,7 +4728,7 @@
"Engadir todos os documentos que fan parte deste conxunto de traballo ao "
"conxunto de traballo actual."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4736,28 +4737,28 @@
"Eliminar todos os documentos que fan parte deste conxunto de traballo do "
"conxunto de traballo activo."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Prema para abrir e activar este documento."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Eliminar este ficheiro do conxunto de traballo actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Engadir este ficheiro ao conxunto de traballo actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Reserva"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Cargar"
@@ -5196,25 +5197,25 @@
msgid "There are no committed differences."
msgstr "Non hai diferenzas."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Soporte de VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Crea unha galla nova baseada na escollida"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "O mesmo que git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5222,25 +5223,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Obter a galla escollida"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Obter"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Fusionar"
@@ -5396,73 +5397,73 @@
msgid "Source Revision"
msgstr "Revisión de orixe"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Actualizar"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Engadir"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostrar as diferenzas…"
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Reverter"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historial…"
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotación…"
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostrar as diferenzas…"
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostrar as diferenzas (todos os ficheiros)…"
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Puxar"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Tirar"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Non hai diferenzas."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Non foi posíbel obter as diferenzas."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Historial de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5471,7 +5472,7 @@
"Non é posíbel mostrar as anotacións; falta a interface KTextEditor::"
"AnnotationInterface do editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5482,7 +5483,7 @@
"documento ou non era un documento de texto:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copiar a revisión"
@@ -5510,38 +5511,38 @@
msgid "Recursive"
msgstr "Recursivo"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Descrición da entrega:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Mensaxes vellas"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr "Para máis información, vexa a vista «Control de versións»."
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "A remisión fallou"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Non foi posíbel efectuar a remisión."
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Remitir"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5554,12 +5555,12 @@
"Coa mensaxe:\n"
"
"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr ""
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr ""
@@ -5310,7 +5311,7 @@
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr ""
diff -Nru kdevplatform-5.1.0/po/hu/kdevprojectmanagerview.po kdevplatform-5.1.1/po/hu/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/hu/kdevprojectmanagerview.po 2017-03-13 19:05:11.000000000 +0000
+++ kdevplatform-5.1.1/po/hu/kdevprojectmanagerview.po 2017-05-13 10:12:35.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2014-02-08 22:58+0100\n"
"Last-Translator: Balázs Úr \n"
"Language-Team: Hungarian \n"
@@ -197,63 +197,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Fájl létrehozása"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Mappa létrehozása"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Fordítás"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Telepítés"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Tisztítás"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Hozzáadás a fordítókészlethez"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Projekt bezárása"
msgstr[1] "Projektek bezárása"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Újratöltés"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Eltávolítás"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Átnevezés…"
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Eltávolítás a célból"
#: projectmanagerviewplugin.cpp:493
@@ -278,6 +288,11 @@
msgid "Delete Files"
msgstr "Fájlok törlése"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Átnevezés…"
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/it/kdevappwizard.po kdevplatform-5.1.1/po/it/kdevappwizard.po
--- kdevplatform-5.1.0/po/it/kdevappwizard.po 2017-03-13 19:05:13.000000000 +0000
+++ kdevplatform-5.1.1/po/it/kdevappwizard.po 2017-05-13 10:12:36.000000000 +0000
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-04-14 21:35+0200\n"
"Last-Translator: Simone Solinas \n"
"Language-Team: Italian \n"
@@ -59,62 +59,62 @@
"Avvia la procedura guidata di KDevelop. Questa ti aiuta a generare uno "
"scheletro per l'applicazione da un insieme di modelli."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Impossibile creare un progetto da un modello\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Impossibile creare progetto"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Vedere la vista degli strumenti del controllo versione"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Errore del sistema di controllo versione"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Impossibile inizializzare il deposito DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Impossibile aggiungere file al deposito DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Impossibile importare il progetto in %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Impossibile importare il progetto"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Impossibile controllare il progetto importato."
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Impossibile creare un nuovo progetto"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Il file %1 non può essere creato."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Modelli di progetto"
@@ -126,57 +126,57 @@
msgid "Project"
msgstr "Progetto"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoria"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipo di progetto"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Ottieni altri modelli"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Carica il modello dal file"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Posizione non valida"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nome progetto vuoto"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nome progetto non valido"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Impossibile creare sottocartelle, mancano le autorizzazioni per: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Modello di progetto non valido, scegliere un modello"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "Il percorso esiste già e contiene dei file. Aprilo come un progetto."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -203,7 +203,7 @@
msgid "Location:"
msgstr "Posizione:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/it/kdevgrepview.po kdevplatform-5.1.1/po/it/kdevgrepview.po
--- kdevplatform-5.1.0/po/it/kdevgrepview.po 2017-03-13 19:05:13.000000000 +0000
+++ kdevplatform-5.1.1/po/it/kdevgrepview.po 2017-05-13 10:12:36.000000000 +0000
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2017-02-18 14:09+0100\n"
"Last-Translator: Luigi Toscano \n"
"Language-Team: Italian \n"
@@ -107,39 +107,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Riga %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 corrispondenza"
msgstr[1] "%1 corrispondenze"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 file"
msgstr[1] "%1 file"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 in %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (una corrispondenza)"
msgstr[1] "%2 (%1 corrispondenze)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/it/kdevpatchreview.po kdevplatform-5.1.1/po/it/kdevpatchreview.po
--- kdevplatform-5.1.0/po/it/kdevpatchreview.po 2017-03-13 19:05:13.000000000 +0000
+++ kdevplatform-5.1.1/po/it/kdevpatchreview.po 2017-05-13 10:12:36.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-31 17:53+0100\n"
"Last-Translator: Luigi Toscano \n"
"Language-Team: Italian \n"
@@ -24,55 +24,55 @@
msgstr "Patch personalizzata"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Patch"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Patch base..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Da file"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Posizione patch..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Da comando"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Output del comando ..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "La patch è già applicata sulla versione locale"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Già applicata"
diff -Nru kdevplatform-5.1.0/po/it/kdevplatform.po kdevplatform-5.1.1/po/it/kdevplatform.po
--- kdevplatform-5.1.0/po/it/kdevplatform.po 2017-03-13 19:05:13.000000000 +0000
+++ kdevplatform-5.1.1/po/it/kdevplatform.po 2017-05-13 10:12:36.000000000 +0000
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-02-28 21:06+0100\n"
"Last-Translator: Luigi Toscano \n"
"Language-Team: Italian \n"
@@ -358,8 +358,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Elimina"
@@ -491,7 +491,7 @@
msgstr "Espressioni recenti"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Rimuovi tutto"
@@ -635,6 +635,14 @@
msgid "Failed to apply changes: %1"
msgstr "Impossibile applicare i cambiamenti: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Rinomina"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -758,13 +766,6 @@
msgid "Applying changes failed: %1"
msgstr "Applicazione cambiamenti non riuscita: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Rinomina"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1594,27 +1595,27 @@
msgid "Various items"
msgstr "Elementi vari"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Impossibile rimuovere la cartella %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Impossibile rimuovere il file %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Il file %1 esiste già."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Impossibile creare il file %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Impossibile creare la cartella %1."
@@ -1796,12 +1797,12 @@
msgid "&Color Theme"
msgstr "Tema di &colori"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configura"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1810,7 +1811,7 @@
"Sono cambiate le impostazioni del modulo corrente.\n"
"Vuoi applicare le modifiche o vuoi scartarle?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Applica le impostazioni"
@@ -2928,18 +2929,18 @@
msgid "Show detailed progress window"
msgstr "Mostra una finestra di progresso dettagliata"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Caricamento progetto %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Caricamento %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2948,23 +2949,23 @@
"Impossibile caricare il file di progetto: %1. Il progetto è stato rimosso "
"dalla sessione."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Impossibile creare una cartella nascosta (%1) per i file di sviluppo"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Impossibile recuperare il file di progetto: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Impossibile caricare %1, un progetto con lo stesso nome «%2» è già aperto."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
@@ -2974,7 +2975,7 @@
"Verifica che i programmi richiesti siano installati, o controlla l'output "
"della console per maggiori informazioni."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2983,12 +2984,12 @@
"l'estensione (%1) per importare i progetti non supporta l'interfaccia "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Impossibile aprire il progetto"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2997,32 +2998,32 @@
"Impossibile salvare la configurazione del progetto\n"
"Attenzione: le impostazioni del progetto che hai modificato andranno perse."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configura il progetto %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Posizione non valida: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Il progetto è già aperto"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Già aperto %1, non riaprirlo"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Sovrascrivi"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3031,12 +3032,12 @@
"Continua ad aprire il progetto e a utilizzare la configurazione del progetto "
"appena fornito."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Apri file esistente"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3045,13 +3046,13 @@
"Continua ad aprire il progetto ma usa la configurazione del progetto "
"esitente."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Annulla e non aprire il progetto."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3060,34 +3061,34 @@
"Esiste già un file di configurazione del progetto in %1. \n"
"Vuoi sovrascriverlo o aprire il file esistente?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Sovrascrivi la configurazione del progetto esistente"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Impossibile creare il file di configurazione %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Riapro il progetto?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Apri / Importa progetto..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Apre o importa un progetto"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3103,19 +3104,19 @@
"una cartella esistente che non dispone ancora di un file di progetto di "
"KDevelop 4, il file verrà creato."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Preleva progetto..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Recupera progetto"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3124,65 +3125,65 @@
msgstr ""
"Guida l'utente nell'apertura del progetto e poi lo importa in KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Chiudi progetto(i)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Chiudi tutti i progetti selezionati"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Apri configurazione..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Esegui il commit del progetto corrente..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Esegui il commit..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Apre un progetto recente"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Apre un progetto aperto di recente."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Apri progetto dal file corrente"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Progetto già aperto: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Nessun documento attivo"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Progetto già aperto"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3191,12 +3192,12 @@
"Il progetto che stai cercando di aprire è già aperto, almeno, in un'altra "
"sessione. Cosa vuoi fare?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Aggiungi un progetto alla sessione corrente"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Apri la sessione %1"
@@ -3652,19 +3653,19 @@
msgid "Create New Session"
msgstr "Crea una nuova sessione"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "messa in esecuzione un'istanza visibile di %1 (PID: %2)"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "l'istanza di %1 in esecuzione (PID: %2) è apparentemente sospesa"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3674,7 +3675,7 @@
"L'applicazione non ha risposto ad una chiamata a DBUS, potrebbe essere in "
"crash o sospesa."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3683,7 +3684,7 @@
"Impossibile bloccare la sessione %1, è già bloccata da %2 a %3 (PID "
"%4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3691,7 +3692,7 @@
"Impossibile bloccare la sessione %1 (file di blocco non "
"disponibile)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3701,25 +3702,25 @@
"
Chiudi l'istanza dell'applicazione incriminata o scegli un altra sessione "
"da lanciare.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Riprova l'avvio"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Scegli un'altra sessione"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Impossibile bloccare la sessione %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3828,19 +3829,19 @@
msgid "Configure Environment Variables"
msgstr "Configura le variabili d'ambiente"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Inserisci la variabile ..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Modalità di modifica in blocco"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4408,7 +4409,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nuovo"
@@ -4692,33 +4693,33 @@
msgid "Select Tool View to Add"
msgstr "Seleziona la vista degli strumenti da aggiungere"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Working set attivo"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Working set"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Rimuovi questo working set. I documenti contenuti non ne sono interessati."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documenti:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Aggiungi tutto"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4727,7 +4728,7 @@
"Aggiungi tutti i documenti che fanno parte di questo working set al working "
"set attivo."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4736,28 +4737,28 @@
"Rimuovi tutti i documenti che fanno parte di questo working set dal working "
"set attivo."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Fare clic per aprire e attivare questo documento."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Rimuovi questo file dal working set attuale"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Aggiungi questo file al working set attuale"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Stash"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Carica"
@@ -5196,25 +5197,25 @@
msgid "There are no committed differences."
msgstr "Non ci sono differenze già depositate."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Supporto VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Crea un nuovo ramo basato sul ramo selezionato"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "Lo stesso come git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5224,25 +5225,25 @@
"non vuota) e l'ultimo commit sul ramo selezionato.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Confronta con il ramo"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Scarica il ramo selezionato"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Scarica"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Unisci"
@@ -5398,73 +5399,73 @@
msgid "Source Revision"
msgstr "Revisione sorgente"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Aggiorna"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Aggiungi"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostra differenze..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Ritorna"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Cronologia..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Annotazione..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostra diff..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostra diff (tutti i file)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Push"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Pull"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Non ci sono differenze."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Impossibile ottenere la differenza."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Cronologia %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5473,7 +5474,7 @@
"Impossibile mostare le annotazioni, manca l'interfaccia KTextEditor::"
"AnnotationInterface dell'editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5484,7 +5485,7 @@
"trovato, o non è un documento di testo:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copia la revisione"
@@ -5512,40 +5513,40 @@
msgid "Recursive"
msgstr "Ricorsivo"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Messaggio di commit:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Vecchi messaggi"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Per informazioni più dettagliate vedere la vista degli strumenti della "
"versione di controllo"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Impossibile fare il commit"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Commit fallito"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Commit"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5558,12 +5559,12 @@
"Con messaggio:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "In procinto di effettuare il commit sul repository"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Impossibile creare una patch per la versione corrente."
@@ -5574,7 +5575,7 @@
msgstr "Differenza tra le revisioni %1 e %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Differenza tra le revisioni"
diff -Nru kdevplatform-5.1.0/po/it/kdevprojectmanagerview.po kdevplatform-5.1.1/po/it/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/it/kdevprojectmanagerview.po 2017-03-13 19:05:13.000000000 +0000
+++ kdevplatform-5.1.1/po/it/kdevprojectmanagerview.po 2017-05-13 10:12:36.000000000 +0000
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2016-10-14 01:10+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-05-07 20:46+0100\n"
"Last-Translator: Luigi Toscano \n"
"Language-Team: Italian \n"
"Language: it\n"
@@ -195,63 +195,63 @@
#: projectmanagerviewplugin.cpp:244
#, kde-format
-msgid "Create File..."
-msgstr "Crea file..."
+msgid "Create &File..."
+msgstr "Crea &file..."
#: projectmanagerviewplugin.cpp:250
#, kde-format
-msgid "Create Folder..."
-msgstr "Crea cartella..."
+msgid "Create F&older..."
+msgstr "Crea c&artella..."
#: projectmanagerviewplugin.cpp:257
#, kde-format
msgctxt "@action"
-msgid "Build"
-msgstr "Compila"
+msgid "&Build"
+msgstr "&Compila"
#: projectmanagerviewplugin.cpp:261
#, kde-format
msgctxt "@action"
-msgid "Install"
-msgstr "Installa"
+msgid "&Install"
+msgstr "&Installa"
#: projectmanagerviewplugin.cpp:265
#, kde-format
msgctxt "@action"
-msgid "Clean"
-msgstr "Pulisci"
+msgid "&Clean"
+msgstr "Pulis&ci"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
-msgstr "Aggiungi al gruppo di compilazione"
+msgid "&Add to Build Set"
+msgstr "&Aggiungi al gruppo di compilazione"
#: projectmanagerviewplugin.cpp:276
#, kde-format
-msgid "Close Project"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] "Chiudi il progetto"
+msgstr[0] "Chiudi i&l progetto"
msgstr[1] "Chiudi i progetti"
#: projectmanagerviewplugin.cpp:282
#, kde-format
-msgid "Reload"
-msgstr "Ricarica"
+msgid "&Reload"
+msgstr "&Ricarica"
#: projectmanagerviewplugin.cpp:288
#, kde-format
-msgid "Remove"
-msgstr "Rimuovi"
+msgid "Remo&ve"
+msgstr "Rimuo&vi"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, kde-format
-msgid "Rename..."
-msgstr "Rinomina..."
+msgid "Re&name..."
+msgstr "Ri&nomina..."
#: projectmanagerviewplugin.cpp:298
#, kde-format
-msgid "Remove From Target"
-msgstr "Rimuovi dall'obiettivo"
+msgid "Remove From &Target"
+msgstr "Rimuovi dall'obie&ttivo"
#: projectmanagerviewplugin.cpp:493
#, kde-format
@@ -275,6 +275,11 @@
msgid "Delete Files"
msgstr "Cancella i file"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Rinomina..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/ja/kdevappwizard.po kdevplatform-5.1.1/po/ja/kdevappwizard.po
--- kdevplatform-5.1.0/po/ja/kdevappwizard.po 2017-03-13 19:05:12.000000000 +0000
+++ kdevplatform-5.1.1/po/ja/kdevappwizard.po 2017-05-13 10:12:36.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2010-07-16 23:44-0700\n"
"Last-Translator: Fumiaki Okushi \n"
"Language-Team: Japanese \n"
@@ -57,63 +57,63 @@
"新しいプロジェクト
Defines the command to execute the external terminal emulator. Use the "
@@ -210,19 +215,19 @@
"p>"
#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: nativeappconfig.ui:247
+#: nativeappconfig.ui:250
#, kde-format
msgid "Dependencies"
msgstr "Avhengigheter"
#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: nativeappconfig.ui:253
+#: nativeappconfig.ui:256
#, kde-format
-msgid "Action:"
-msgstr "Handling:"
+msgid "Act&ion:"
+msgstr ""
#. i18n: ectx: property (toolTip), widget (KComboBox, dependencyAction)
-#: nativeappconfig.ui:263
+#: nativeappconfig.ui:266
#, kde-format
msgid ""
"Specifies the action to take for the dependencies before starting the "
@@ -232,7 +237,7 @@
"startes."
#. i18n: ectx: property (whatsThis), widget (KComboBox, dependencyAction)
-#: nativeappconfig.ui:266
+#: nativeappconfig.ui:269
#, kde-format
msgid ""
"The selected action will be run before the executable is started. This "
@@ -244,79 +249,31 @@
"kjørbare fila ikke direkte avhenger av, før programmet kjøres."
#. i18n: ectx: property (text), item, widget (KComboBox, dependencyAction)
-#: nativeappconfig.ui:273
+#: nativeappconfig.ui:276
#, kde-format
msgid "Do Nothing"
msgstr "Ikke gjør noe"
#. i18n: ectx: property (text), item, widget (KComboBox, dependencyAction)
-#: nativeappconfig.ui:278
+#: nativeappconfig.ui:281
#, kde-format
msgctxt "@action"
msgid "Build"
msgstr "Bygg"
#. i18n: ectx: property (text), item, widget (KComboBox, dependencyAction)
-#: nativeappconfig.ui:283
+#: nativeappconfig.ui:286
#, kde-format
msgctxt "@action"
msgid "Build and Install"
msgstr "Bygg og installer"
#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: nativeappconfig.ui:291
+#: nativeappconfig.ui:294
#, kde-format
msgid "Targets:"
msgstr "Mål:"
-#. i18n: ectx: property (toolTip), widget (ProjectItemLineEdit, targetDependency)
-#. i18n: ectx: property (placeholderText), widget (ProjectItemLineEdit, targetDependency)
-#: nativeappconfig.ui:306 nativeappconfig.ui:309
-#, kde-format
-msgid "Enter a dependency to add to the list"
-msgstr "Oppgi en avhengighet som skal legges til lista"
-
-#. i18n: ectx: property (toolTip), widget (QPushButton, addDependency)
-#: nativeappconfig.ui:329
-#, kde-format
-msgid "Adds the listed target to the dependency list."
-msgstr "Legger til målet på lista til avhengighetslista."
-
-#. i18n: ectx: property (toolTip), widget (QListWidget, dependencies)
-#: nativeappconfig.ui:342
-#, kde-format
-msgid "List of indirect dependent targets."
-msgstr "Liste over indirekte avhengige mål."
-
-#. i18n: ectx: property (whatsThis), widget (QListWidget, dependencies)
-#: nativeappconfig.ui:345
-#, kde-format
-msgid ""
-"This list should contain targets that the application does not directly "
-"depend on, but for which an action needs to be taken before running the "
-"application."
-msgstr ""
-"Denne lista bør inneholde mål som programmet ikke direkte avhenger av, men "
-"som trenger at en handling utføres før programmet kjøres."
-
-#. i18n: ectx: property (toolTip), widget (QPushButton, removeDependency)
-#: nativeappconfig.ui:361
-#, kde-format
-msgid "Removes the selected dependencies from the list."
-msgstr "Fjerner de valgte avhengighetene fra lista."
-
-#. i18n: ectx: property (toolTip), widget (QPushButton, moveDepUp)
-#: nativeappconfig.ui:374
-#, kde-format
-msgid "Move a dependency up in the list."
-msgstr "Flytt en avhengighet oppover i lista."
-
-#. i18n: ectx: property (toolTip), widget (QPushButton, moveDepDown)
-#: nativeappconfig.ui:387
-#, kde-format
-msgid "Moves the selected dependency down in the list."
-msgstr "Flytter den markerte avhengigheten nedover i lista."
-
#: nativeappjob.cpp:68
#, kde-format
msgid ""
diff -Nru kdevplatform-5.1.0/po/nb/kdevexecutescript.po kdevplatform-5.1.1/po/nb/kdevexecutescript.po
--- kdevplatform-5.1.0/po/nb/kdevexecutescript.po 2017-03-13 19:05:15.000000000 +0000
+++ kdevplatform-5.1.1/po/nb/kdevexecutescript.po 2017-05-13 10:12:38.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2016-11-19 22:45+0100\n"
+"POT-Creation-Date: 2017-03-04 07:12+0100\n"
"PO-Revision-Date: 2013-09-16 12:36+0200\n"
"Last-Translator: Bjørn Steensrud \n"
"Language-Team: Norwegian Bokmål \n"
@@ -19,12 +19,12 @@
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
-#: executescriptplugin.cpp:97
+#: executescriptplugin.cpp:96
#, kde-format
msgid "No valid executable specified"
msgstr "Det er ikke oppgitt noe gyldig program"
-#: executescriptplugin.cpp:107
+#: executescriptplugin.cpp:106
#, kde-format
msgid ""
"There is a quoting error in the script for the launch configuration '%1'. "
@@ -33,7 +33,7 @@
"Det er en hermetegnsfeil i skriptet for startoppsettet «%1». Avbryter "
"oppstart."
-#: executescriptplugin.cpp:112
+#: executescriptplugin.cpp:111
#, kde-format
msgid ""
"A shell meta character was included in the script for the launch "
@@ -42,14 +42,14 @@
"Det er tatt med et skall-metategn i skriptet for startoppsettet «%1», det er "
"ikke støtte for dette nå. Avbryter oppstart."
-#: executescriptplugin.cpp:129
+#: executescriptplugin.cpp:128
#, kde-format
msgid "No remote host set for launch configuration '%1'. Aborting start."
msgstr ""
"Det er ikke oppgitt en nettverksvert for startoppsettet «%1». Avbryter "
"oppstart."
-#: executescriptplugin.cpp:152
+#: executescriptplugin.cpp:151
#, kde-format
msgid ""
"There is a quoting error in the arguments for the launch configuration '%1'. "
@@ -58,7 +58,7 @@
"Det er en hermetegnsfeil i argumentene for startoppsettet «%1». Avbryter "
"oppstart."
-#: executescriptplugin.cpp:156
+#: executescriptplugin.cpp:155
#, kde-format
msgid ""
"A shell meta character was included in the arguments for the launch "
@@ -67,12 +67,12 @@
"Det er tatt med et skall-metategn i argumentene for startoppsettet «%1», det "
"er ikke støtte for dette nå. Avbryter oppstart."
-#: executescriptplugin.cpp:209
+#: executescriptplugin.cpp:208
#, kde-format
msgid "No valid interpreter specified"
msgstr "Det er ikke oppgitt noen gyldig tolker"
-#: executescriptplugin.cpp:219
+#: executescriptplugin.cpp:218
#, kde-format
msgid ""
"There is a quoting error in the interpreter for the launch configuration "
@@ -81,7 +81,7 @@
"Det er en hermetegnsfeil i tolkeren for startoppsettet «%1». Avbryter "
"oppstart."
-#: executescriptplugin.cpp:224
+#: executescriptplugin.cpp:223
#, kde-format
msgid ""
"A shell meta character was included in the interpreter for the launch "
@@ -90,22 +90,22 @@
"Det er tatt med et skall-metategn i tolkeren for startoppsettet «%1», det er "
"ikke støtte for dette nå. Avbryter oppstart."
-#: scriptappconfig.cpp:104
+#: scriptappconfig.cpp:103
#, kde-format
msgid "Type or select an interpreter"
msgstr "Skriv inn eller velg en tolker"
-#: scriptappconfig.cpp:137
+#: scriptappconfig.cpp:136
#, kde-format
msgid "Configure Script Application"
msgstr "Sett opp skriptprogram"
-#: scriptappconfig.cpp:147
+#: scriptappconfig.cpp:146
#, kde-format
msgid "Executes Script Applications"
msgstr "Kjører skriptprogrammer"
-#: scriptappconfig.cpp:157 scriptappconfig.cpp:207
+#: scriptappconfig.cpp:156 scriptappconfig.cpp:206
#, kde-format
msgid "Script Application"
msgstr "Skriptprogram"
diff -Nru kdevplatform-5.1.0/po/nb/kdevexternalscript.po kdevplatform-5.1.1/po/nb/kdevexternalscript.po
--- kdevplatform-5.1.0/po/nb/kdevexternalscript.po 2017-03-13 19:05:15.000000000 +0000
+++ kdevplatform-5.1.1/po/nb/kdevexternalscript.po 2017-05-13 10:12:38.000000000 +0000
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2016-11-19 22:45+0100\n"
+"POT-Creation-Date: 2017-03-04 07:12+0100\n"
"PO-Revision-Date: 2013-09-16 12:36+0200\n"
"Last-Translator: Bjørn Steensrud \n"
"Language-Team: Norwegian Bokmål \n"
@@ -168,198 +168,198 @@
msgstr "Rediger eksternt skript «%1»"
#. i18n: ectx: property (text), widget (QLabel, nameLabel)
-#: editexternalscript.ui:26
+#: editexternalscript.ui:19
#, kde-format
msgid "&Name:"
msgstr "&Navn:"
#. i18n: ectx: property (toolTip), widget (QLineEdit, nameEdit)
-#: editexternalscript.ui:37
+#: editexternalscript.ui:30
#, kde-format
msgid ""
"
The name will also be used as the identifier during code completion.
\n"
-"
Note: No spaces allowed.
"
-msgstr "
Navnet blir også brukt som identifikator under kodefullføring.
Dit start KDevelop sien Programm-Hölper. He hölpt Di "
"bi't Opstellen vun en Rohbuu för Dien Programm mit en Sett vun Vörlagen.
"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Projekt lett sik nich ut Vörlaag opstellen\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Projekt lett sik nich opstellen"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, fuzzy, kde-format
#| msgid "Version Control System:"
msgid "Version Control System Error"
msgstr "Verschoonkuntrullsysteem:"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "DVCS-Archiev lett sik nich torechtmaken"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Dateien laat sik nich na't DVCS-Archiev tofögen."
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Projekt lett sik nich na \"%1\" importeren"
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Projekt lett sik nich importeren."
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Importeert Projekt lett sik nich utlesen."
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Nieg Projekt lett sik nich opstellen."
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "De Datei \"%1\" lett sik nich opstellen."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Projektvörlagen"
@@ -127,60 +127,60 @@
msgid "Project"
msgstr "Projekt"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr ""
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, fuzzy, kde-format
#| msgid "Project Templates"
msgid "Project Type"
msgstr "Projektvörlagen"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, fuzzy, kde-format
#| msgid "Project Templates"
msgid "Get More Templates"
msgstr "Projektvörlagen"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr ""
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Leeg Steed"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Leddig Projektnaam"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Leeg Projektnaam"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Ünnerornern laat sik nich opstellen, Verlöven fehlt för: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Leeg Projektvörlaag, bitte en Ennknütt-Element utsöken."
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
#| msgid "Path already exists and contains files"
msgid "Path already exists and contains files. Open it as a project."
msgstr "Dat gifft den Orner al, un he is nich leddig!"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -207,7 +207,7 @@
msgid "Location:"
msgstr "Steed:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/nds/kdevgrepview.po kdevplatform-5.1.1/po/nds/kdevgrepview.po
--- kdevplatform-5.1.0/po/nds/kdevgrepview.po 2017-03-13 19:05:16.000000000 +0000
+++ kdevplatform-5.1.1/po/nds/kdevgrepview.po 2017-05-13 10:12:38.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2012-02-02 07:37+0100\n"
"Last-Translator: Manfred Wiese \n"
"Language-Team: Low Saxon \n"
@@ -106,39 +106,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Reeg %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 Dreper"
msgstr[1] "%1 Drepers"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 Datei"
msgstr[1] "%1Dateien"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 in %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (een Dreper)"
msgstr[1] "%2 (%1 Drepers)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, fuzzy, kde-format
#| msgid "Failed to replace %1 by %2 in %3:%4:%5"
msgctxt ""
diff -Nru kdevplatform-5.1.0/po/nds/kdevpatchreview.po kdevplatform-5.1.1/po/nds/kdevpatchreview.po
--- kdevplatform-5.1.0/po/nds/kdevpatchreview.po 2017-03-13 19:05:16.000000000 +0000
+++ kdevplatform-5.1.1/po/nds/kdevpatchreview.po 2017-05-13 10:12:38.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2012-02-02 07:40+0100\n"
"Last-Translator: Manfred Wiese \n"
"Language-Team: Low Saxon \n"
@@ -25,56 +25,56 @@
msgstr "Egen Kodeplaster"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Kodeplaster"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Basis:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr ""
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, fuzzy, kde-format
#| msgid "From file"
msgid "From File"
msgstr "Ut Datei"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr ""
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr ""
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Utgaav vun den Befehl..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr ""
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Al övernahmen"
diff -Nru kdevplatform-5.1.0/po/nds/kdevplatform.po kdevplatform-5.1.1/po/nds/kdevplatform.po
--- kdevplatform-5.1.0/po/nds/kdevplatform.po 2017-03-13 19:05:16.000000000 +0000
+++ kdevplatform-5.1.1/po/nds/kdevplatform.po 2017-05-13 10:12:38.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2012-02-02 07:34+0100\n"
"Last-Translator: Manfred Wiese \n"
"Language-Team: Low Saxon \n"
@@ -382,8 +382,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Wegdoon"
@@ -526,7 +526,7 @@
msgstr "Tolest bruukt Utdrück"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "All wegmaken"
@@ -672,6 +672,15 @@
msgid "Failed to apply changes: %1"
msgstr ""
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, fuzzy, kde-format
+#| msgid "Filename"
+msgid "Rename"
+msgstr "Dateinaam"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -802,14 +811,6 @@
msgid "Applying changes failed: %1"
msgstr ""
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, fuzzy, kde-format
-#| msgid "Filename"
-msgid "Rename"
-msgstr "Dateinaam"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, fuzzy, kde-format
@@ -1665,28 +1666,28 @@
msgid "Various items"
msgstr ""
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Orner %1 lett sik nich wegmaken."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Datei %1 lett sik nich wegmaken."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, fuzzy, kde-format
#| msgid "The file %1 exists already."
msgid "The file %1 already exists."
msgstr "Datei %1 gifft dat al."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Datei %1 lett sik nich opstellen."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Orner %1 lett sik nich opstellen."
@@ -1864,20 +1865,20 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, fuzzy, kde-format
#| msgid "Configure %1"
msgid "Configure"
msgstr "%1 instellen"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
"Do you want to apply the changes or discard them?"
msgstr ""
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, fuzzy, kde-format
#| msgid "Run Settings"
msgid "Apply Settings"
@@ -3103,48 +3104,48 @@
msgid "Show detailed progress window"
msgstr "Utföhrlich Vörankamenfinster wiesen"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Projekt \"%1\" warrt laadt."
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, fuzzy, kde-format
#| msgid "Loading %1"
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "%1 warrt laadt."
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
"session."
msgstr ""
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Versteken Orner (%1) för Schrieverdatei lett sik nich opstellen"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Projektdatei lett sik nich halen: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr "%1 lett sik nich laden, en Projekt mit den sülven Naam (%2) is al op."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -3153,12 +3154,12 @@
"Projektimport-Moduul (%1) deit de IProjectFileManager-Koppelsteed nich "
"ünnerstütten."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Projekt lett sik nich opmaken"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -3167,32 +3168,32 @@
"De Schriever-Projektinstellen laat sik nich sekern.\n"
"Wohrscho: Dien ännerte Projektinstellen kaamt weg."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Projekt \"%1\" instellen"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Leeg Steed: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projekt warrt al opmaakt"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "\"%1\" warrt al opmaakt, man keen tweet maal"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Överschrieven"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, fuzzy, kde-format
#| msgid ""
#| "Continue to open the project and use the just provided project "
@@ -3203,12 +3204,12 @@
msgstr ""
"Dat Projekt wieder opmaken, un de jüst ingeven Projekt-Instellen bruken"
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Vörhannen Datei opmaken"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, fuzzy, kde-format
#| msgid ""
#| "Continue to open the project but use the existing project configuration."
@@ -3217,14 +3218,14 @@
"Continue to open the project but use the existing project configuration."
msgstr "Dat Projekt wieder opmaken, man de vörhannen Projekt-Instellen bruken"
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, fuzzy, kde-format
#| msgid "Cancel and do not open the project."
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Afbreken un dat Projekt nich opmaken"
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3233,36 +3234,36 @@
"Dat gifft al en Instellendatei för Projektinstellen bi %1.\n"
"Wullt Du ehr övergahn oder de vörhannen Datei opmaken?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Vörhannen Projekt-Instellen övergahn"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Instellendatei \"%1\" lett sik nich opstellen."
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Dat aktuelle Projekt wedder opmaken?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, fuzzy, kde-format
#| msgid "Open / Import Project..."
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Projekt opmaken oder importeren…"
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, fuzzy, kde-format
#| msgid "Open / Import Project"
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Projekt opmaken oder importeren"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, fuzzy, kde-format
#| msgid ""
#| "Open / Import project
Open an existing KDevelop 4 project or "
@@ -3284,21 +3285,21 @@
"KDevelop opmaken. Maakst Du en vörhannen Orner op, binnen den dat noch keen "
"KDevelop-4-Projektdatei gifft, warrt een opstellt.
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
@@ -139,7 +139,7 @@
msgstr[1] "%2 (%1 dopasowania)"
msgstr[2] "%2 (%1 dopasowań)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
@@ -176,22 +176,22 @@
#: grepoutputview.cpp:85
#, kde-format
msgid "New &Search"
-msgstr "&Nowe znajdywanie"
+msgstr "&Nowe wyszukiwanie"
#: grepoutputview.cpp:86
#, kde-format
msgid "Clear Search History"
-msgstr "Wyczyść historię znajdywania"
+msgstr "Wyczyść historię wyszukiwania"
#: grepoutputview.cpp:87
#, kde-format
msgid "Refresh"
-msgstr ""
+msgstr "Odśwież"
#: grepoutputview.cpp:185
#, kde-format
msgid "Search \"%1\" in %2 (at time %3)"
-msgstr "Znajdź \"%1\" w %2 (w czasie %3)"
+msgstr "Wyszukaj \"%1\" w %2 (w czasie %3)"
#: grepoutputview.cpp:266
#, kde-format
@@ -251,16 +251,14 @@
"przełączyć, aby dopasować bezpośrednio. Możesz także dokonać zamiany."
#: grepviewplugin.cpp:136 grepviewplugin.cpp:159
-#, fuzzy, kde-format
-#| msgid "Find/Replace in This Folder"
+#, kde-format
msgid "Find/Replace in This Folder..."
-msgstr "Znajdź i zastąp w tym katalogu"
+msgstr "Znajdź/Zastąp w tym katalogu..."
#: grepviewplugin.cpp:147
-#, fuzzy, kde-format
-#| msgid "Find/Replace in Fi&les..."
+#, kde-format
msgid "&Find/Replace in Files..."
-msgstr "Znajdź/zastąp w p&likach"
+msgstr "Znajdź/Zastąp w p&likach..."
#. i18n: ectx: property (windowTitle), widget (QWidget, GrepWidget)
#: grepwidget.ui:32
diff -Nru kdevplatform-5.1.0/po/pl/kdevopenwith.po kdevplatform-5.1.1/po/pl/kdevopenwith.po
--- kdevplatform-5.1.0/po/pl/kdevopenwith.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pl/kdevopenwith.po 2017-05-13 10:12:40.000000000 +0000
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Łukasz Wojniłowicz , 2011, 2012, 2014, 2015.
+# Łukasz Wojniłowicz , 2011, 2012, 2014, 2015, 2017.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2015-12-05 06:35+0100\n"
+"PO-Revision-Date: 2017-04-08 07:14+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -19,10 +19,9 @@
"|| n%100>=20) ? 1 : 2);\n"
#: openwithplugin.cpp:150
-#, fuzzy, kde-format
-#| msgid "other..."
+#, kde-format
msgid "Other..."
-msgstr "inne..."
+msgstr "Inne..."
#: openwithplugin.cpp:161
#, kde-format
diff -Nru kdevplatform-5.1.0/po/pl/kdevpatchreview.po kdevplatform-5.1.1/po/pl/kdevpatchreview.po
--- kdevplatform-5.1.0/po/pl/kdevpatchreview.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pl/kdevpatchreview.po 2017-05-13 10:12:40.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2016-07-15 20:38+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
@@ -24,55 +24,55 @@
msgstr "Własna łatka"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Łatka"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Baza:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Łataj bazę..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Z pliku"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Położenie łatki..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Z polecenia"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Wyjście polecenia..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "Łatka został już zastosowana na lokalnej wersji"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Już zastosowana"
diff -Nru kdevplatform-5.1.0/po/pl/kdevplatform.po kdevplatform-5.1.1/po/pl/kdevplatform.po
--- kdevplatform-5.1.0/po/pl/kdevplatform.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pl/kdevplatform.po 2017-05-13 10:12:40.000000000 +0000
@@ -16,13 +16,13 @@
# Krzysztof Lichota , 2005, 2006, 2007.
# Marta Rybczyńska , 2007, 2008, 2010, 2013.
# Michał Smoczyk , 2008.
-# Łukasz Wojniłowicz , 2011, 2012, 2013, 2014, 2015, 2016.
+# Łukasz Wojniłowicz , 2011, 2012, 2013, 2014, 2015, 2016, 2017.
msgid ""
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2016-10-15 07:01+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
+"PO-Revision-Date: 2017-04-08 07:14+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -364,8 +364,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Usuń"
@@ -403,8 +403,7 @@
msgstr "Lokalne"
#: debugger/variable/variabletooltip.cpp:141
-#, fuzzy, kde-format
-#| msgid "Watch this"
+#, kde-format
msgid "Watch This"
msgstr "Obserwuj to"
@@ -495,7 +494,7 @@
msgstr "Ostatnie wyrażenia"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Usuń wszystkie"
@@ -616,7 +615,7 @@
#: interfaces/contextmenuextension.cpp:193
#, kde-format
msgid "Analyze With"
-msgstr ""
+msgstr "Analizuj przy użyciu"
#: interfaces/isourceformatter.cpp:190
#, kde-format
@@ -639,6 +638,14 @@
msgid "Failed to apply changes: %1"
msgstr "Nieudane wprowadzanie zmian: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Zmień nazwę"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -763,13 +770,6 @@
msgid "Applying changes failed: %1"
msgstr "Nieudane zastosowanie zmian: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Zmień nazwę"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1600,27 +1600,27 @@
msgid "Various items"
msgstr "Rozmaite elementy"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Nie można usunąć katalogu %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Nie można usunąć pliku %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "Plik %1 już istnieje."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Nie można utworzyć pliku %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Nie można utworzyć katalogu %1."
@@ -1694,19 +1694,19 @@
#: project/widgets/dependencieswidget.ui:35
#, kde-format
msgid "Enter a dependency to add to the list"
-msgstr ""
+msgstr "Podaj zależność do dodania do listy"
#. i18n: ectx: property (toolTip), widget (QPushButton, addDependency)
#: project/widgets/dependencieswidget.ui:55
#, kde-format
msgid "Adds the listed target to the dependency list."
-msgstr ""
+msgstr "Dodaje cel z listy do listy zależności."
#. i18n: ectx: property (toolTip), widget (QListWidget, dependencies)
#: project/widgets/dependencieswidget.ui:68
#, kde-format
msgid "List of indirect dependent targets."
-msgstr ""
+msgstr "Lista pośrednich celów zależnych."
#. i18n: ectx: property (whatsThis), widget (QListWidget, dependencies)
#: project/widgets/dependencieswidget.ui:71
@@ -1716,24 +1716,26 @@
"depend on, but for which an action needs to be taken before running the "
"application."
msgstr ""
+"Lista ta powinna zawierać cele, na których program nie polega bezpośrednio, "
+"lecz wobec, których należy podjąć działanie przed uruchomieniem programu."
#. i18n: ectx: property (toolTip), widget (QPushButton, removeDependency)
#: project/widgets/dependencieswidget.ui:87
#, kde-format
msgid "Removes the selected dependencies from the list."
-msgstr ""
+msgstr "Usuwa wybrane zależności z listy."
#. i18n: ectx: property (toolTip), widget (QPushButton, moveDepUp)
#: project/widgets/dependencieswidget.ui:103
#, kde-format
msgid "Moves the selected dependency up in the list."
-msgstr ""
+msgstr "Przesuwa wybraną zależność w górę na liście."
#. i18n: ectx: property (toolTip), widget (QPushButton, moveDepDown)
#: project/widgets/dependencieswidget.ui:119
#, kde-format
msgid "Moves the selected dependency down in the list."
-msgstr ""
+msgstr "Przesuwa wybraną zależność w dół na liście."
#: serialization/itemrepository.h:217 serialization/itemrepository.h:1945
#, kde-format
@@ -1798,14 +1800,14 @@
#: shell/colorschemechooser.cpp:66
#, kde-format
msgid "&Color Theme"
-msgstr ""
+msgstr "Zestaw &kolorów"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Ustawienia"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1814,7 +1816,7 @@
"Ustawienia w bieżącym module uległy zmianie.\n"
"Zastosować czy porzucić zmiany?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Wprowadzanie zmian"
@@ -1873,10 +1875,9 @@
msgstr "Aleix Pol Gonzalez"
#: shell/core.cpp:108
-#, fuzzy, kde-format
-#| msgid "Co-Maintainer, CMake Support, Run Support, Kross Support"
+#, kde-format
msgid "CMake Support, Run Support, Kross Support"
-msgstr "Ko-opiekun, Obsługa CMake, Obsługa Run, Obsługa Kross"
+msgstr "Obsługa CMake, Obsługa Run, Obsługa Kross"
#: shell/core.cpp:109
#, kde-format
@@ -1961,34 +1962,34 @@
msgstr "Milian Wolff"
#: shell/core.cpp:120
-#, fuzzy, kde-format
-#| msgid ""
-#| "Co-Maintainer, Generic manager, Webdevelopment Plugins, Snippets, "
-#| "Performance"
+#, kde-format
msgid "Generic manager, Webdevelopment Plugins, Snippets, Performance"
msgstr ""
-"Współopiekun, Ogólny menadżer, wtyczki do tworzenia stron internetowych, "
-"fragmenty kodu, wydajność"
+"Zwykłe zarządzanie, wtyczki do tworzenia stron internetowych, Wstawki, "
+"Wydajność"
#: shell/core.cpp:121
#, kde-format
msgid "Kevin Funk"
-msgstr ""
+msgstr "Kevin Funk"
#: shell/core.cpp:121
#, kde-format
msgid "Co-maintainer, C++/Clang, QA, Windows Support, Performance, Website"
msgstr ""
+"Współopiekun, C++/Clang, jakość, wsparcie na Windowsie, strona internetowa, "
+"wydajność"
#: shell/core.cpp:122
#, kde-format
msgid "Sven Brauch"
-msgstr ""
+msgstr "Sven Brauch"
#: shell/core.cpp:122
#, kde-format
msgid "Co-maintainer, AppImage, Python Support, User Interface improvements"
msgstr ""
+"Współopiekun, AppImage, Obsługa Pythona, ulepszenia w interfejsie użytkownika"
#: shell/core.cpp:161
#, kde-format
@@ -2927,18 +2928,18 @@
msgid "Show detailed progress window"
msgstr "Pokaż szczegółowe okno postępu"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Wczytywanie projektu %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Wczytywanie %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2946,30 +2947,33 @@
msgstr ""
"Nie można wczytać pliku projektu %1. Projekt został usunięty z sesji."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr "Nie można utworzyć ukrytego katalogu (%1) dla pliku programistycznego"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Nie można pobrać pliku projektu: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Nie można wczytać %1, projekt o tej samej nazwie '%2' jest już otwarty."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
+"Nie można wczytać wtyczki do zarządzania projektami %1 Sprawdź czy "
+"wymagane programy zostały dograne lub przeczytaj co wyświetla konsola, aby "
+"dowiedzieć się więcej."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2978,12 +2982,12 @@
"wtyczka importująca projekty (%1) nie obsługuje interfejsu "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Nie można otworzyć projektu"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2992,32 +2996,32 @@
"Nie można przechować ustawień charakterystycznych dla programisty.\n"
"Uwaga: Zmienione ustawienia projektu zostaną utracone."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Ustawienia projektu %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Nieprawidłowe położenie: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "Projekt jest już otwierany"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Już otwierasz %1, nie otwieraj ponownie"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Zastąp"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3025,12 +3029,12 @@
msgstr ""
"Kontynuuj otwieranie projektu i użyj tylko dostarczonych ustawień projektu."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Otwórz istniejący plik"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3038,13 +3042,13 @@
msgstr ""
"Kontynuuj otwieranie projektu, lecz użyj istniejących ustawień projektu."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Anuluj i nie otwieraj projektu."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3053,34 +3057,34 @@
"Już istnieje plik ustawień projektu w %1.\n"
"Czy chcesz go zastąpić, czy otworzyć istniejący plik?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Zastąp istniejące ustawienia projektu"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Nie można utworzyć pliku ustawień %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Czy otworzyć ponownie obecny projekt?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Otwórz / importuj projekt..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Otwórz lub zaimportuj projekt"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3096,19 +3100,19 @@
"istniejącego katalogu, który jeszcze nie ma pliku projektu KDevelop4, "
"zostanie utworzony taki plik."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Pobierz projekt..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Pobierz projekt"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3118,65 +3122,65 @@
"Prowadzi użytkownika przez pobieranie projektu i następnie importuje go do "
"KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Zamknij projekt(y)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Zamyka wszystkie obecnie zaznaczone projekty"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Otwórz ustawienia..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Wdrożenie obecnego projektu..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Wdrożenie..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Otwórz ostatni projekt"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Otwiera ostatnio otwierany projekt."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Otwórz projekt dla bieżącego pliku"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "Projekt jest już otwarty: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Brak aktywnego dokumentu"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Projekt jest już otwarty"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3185,12 +3189,12 @@
"Projekt, który próbujesz otworzyć, jest już otwarty w co najmniej jednej "
"innej sesji. Co chcesz zrobić?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Dodaj projekt dla bieżącej sesji"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Otwórz sesję %1"
@@ -3645,19 +3649,19 @@
msgid "Create New Session"
msgstr "Utwórz nową sesję"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "uczyniono uruchomione wystąpienie %1 (PID: %2) widocznym"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "wygląda na to, że uruchomione wystąpienie %1 (PID: %2) zawiesiło się"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3667,7 +3671,7 @@
"Dany program nie odpowiedział na zawołanie DBUS, możliwe, że uległ awarii "
"lub zawiesił się."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3676,13 +3680,13 @@
"Nieudane zablokowanie sesji %1, już zablokowana przez %2 na %3 "
"(PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
msgstr "Nieudane zablokowanie sesji %1 (plik blokady niedostępny)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3692,25 +3696,25 @@
"
Proszę zamknij problemowe wystąpienie programu lub wybierz inną sesję do "
"uruchomienia.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Ponów uruchomienie"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Wybierz inną sesję"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Nieudane zablokowanie sesji %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3719,13 +3723,12 @@
#: shell/settings/analyzerspreferences.cpp:39
#, kde-format
msgid "Analyzers"
-msgstr ""
+msgstr "Analizatory"
#: shell/settings/analyzerspreferences.cpp:49
-#, fuzzy, kde-format
-#| msgid "Configure Templates"
+#, kde-format
msgid "Configure Analyzers"
-msgstr "Ustawienia szablonów"
+msgstr "Ustawienia analizatorów"
#: shell/settings/bgpreferences.cpp:91
#, kde-format
@@ -3795,11 +3798,9 @@
msgstr " wątki"
#: shell/settings/documentationpreferences.cpp:49
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Configure notifications"
+#, kde-format
msgid "Configure Documentation"
-msgstr "Ustawienia powiadomień"
+msgstr "Ustawienia dokumentacji"
#: shell/settings/editstyledialog.cpp:112
#, kde-format
@@ -3822,19 +3823,19 @@
msgid "Configure Environment Variables"
msgstr "Ustawienia zmiennych środowiskowych"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Podaj zmienną ..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Tryb edycji wsadowej"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4176,7 +4177,7 @@
#, kde-format
msgctxt "@title:group"
msgid "Analyzers"
-msgstr ""
+msgstr "Analizatory"
#: shell/settings/pluginpreferences.cpp:56
#, kde-format
@@ -4406,7 +4407,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nowy"
@@ -4686,32 +4687,32 @@
msgid "Select Tool View to Add"
msgstr "Wybierz widok narzędzia do dodania"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Aktywny zestaw roboczy"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Zestaw roboczy"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr "Usuń ten zestaw roboczy. Nie ma to wpływu na zawarte dokumenty."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Dokumenty:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Dodaj wszystkie"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4720,7 +4721,7 @@
"Dodaj wszystkie dokumenty, które są częścią tego zestawu roboczego, do "
"obecnie aktywnego zestawu roboczego."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4729,28 +4730,28 @@
"Usuń wszystkie dokumenty, które są częścią tego zestawu roboczego, z obecnie "
"aktywnego zestawu roboczego."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Naciśnij, aby otworzyć i aktywować ten dokument."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Usuń plik z bieżącego zestawu roboczego"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Dodaj ten plik do bieżącego zestawu roboczego"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Odłóż"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Wczytaj"
@@ -5175,62 +5176,62 @@
msgstr "Z wykazu, musisz wybrać gałąź, którą scalić z bieżącą gałęzią."
#: vcs/dvcs/ui/branchmanager.cpp:225
-#, fuzzy, kde-format
-#| msgid "Unable to get difference."
+#, kde-format
msgid "Unable to retrieve diff."
msgstr "Nie można uzyskać różnicy."
#: vcs/dvcs/ui/branchmanager.cpp:232
-#, fuzzy, kde-format
-#| msgid "There are no differences."
+#, kde-format
msgid "There are no committed differences."
-msgstr "Nie ma różnic."
+msgstr "Nie ma wdrożonych różnic."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Obsługa VCS"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Tworzy nową gałąź opartą o wybraną gałąź"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "To samo co git branch -D"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
"and the last commit on the selected branch.
"
msgstr ""
+"
Pokaż zmiany pomiędzy bieżącą gałęzią (lub poczekalni, jeśli nie jest "
+"pusta) i ostatnim wdrożeniem w wybranej gałęzi.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
-#, fuzzy, kde-format
+#: vcs/dvcs/ui/branchmanager.ui:77
+#, kde-format
msgid "Compare to Branch"
-msgstr "Klasy rodziców..."
+msgstr "Porównaj z gałęzią"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Pobierz wersję wyjściową wybranej gałęzi"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Wersja wyjściowa"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Scal"
@@ -5386,73 +5387,73 @@
msgid "Source Revision"
msgstr "Wydanie źródłowe"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Uaktualnij"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Dodaj"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Pokaż różnice..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Przywróć"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Historia..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Adnotacje..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Pokaż różnice..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Pokaż różnice (wszystkie pliki)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Popchnij"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Pociągnij"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Nie ma różnic."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Nie można uzyskać różnicy."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "%2 Historia (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5461,7 +5462,7 @@
"Nie można wyświetlić przypisów, brakuje interfejsu KTextEditor::"
"AnnotationInterface dla edytora."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5472,7 +5473,7 @@
"nie był to dokument tekstowy:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Kopiuj wydanie"
@@ -5500,40 +5501,40 @@
msgid "Recursive"
msgstr "Rekursywnie"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Opis wdrożenia:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Stare wiadomości"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Po dalsze szczegółowe informacje proszę zobaczyć widok narzędzia sterowania "
"wersją"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Nie można wdrożyć zmian"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "Nieudane wdrażanie zmian"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Wdrożenie"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5546,12 +5547,12 @@
"Z opisem:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Nastąpi wdrożenie zmian w repozytorium"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Nie można utworzyć łatki dla bieżącej wersji."
@@ -5562,7 +5563,7 @@
msgstr "Różnice pomiędzy wydaniem %1 i %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Różnica pomiędzy wydaniami"
diff -Nru kdevplatform-5.1.0/po/pl/kdevproblemreporter.po kdevplatform-5.1.1/po/pl/kdevproblemreporter.po
--- kdevplatform-5.1.0/po/pl/kdevproblemreporter.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pl/kdevproblemreporter.po 2017-05-13 10:12:40.000000000 +0000
@@ -16,13 +16,13 @@
# Krzysztof Lichota , 2005, 2006, 2007.
# Marta Rybczyńska , 2007, 2008, 2010.
# Michał Smoczyk , 2008.
-# Łukasz Wojniłowicz , 2011, 2012, 2014, 2015, 2016.
+# Łukasz Wojniłowicz , 2011, 2012, 2014, 2015, 2016, 2017.
msgid ""
msgstr ""
"Project-Id-Version: kdevproblemreporter\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2016-01-30 07:44+0100\n"
+"PO-Revision-Date: 2017-04-08 07:14+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -144,10 +144,9 @@
msgstr "Wyświetlaj błędy"
#: problemsview.cpp:143
-#, fuzzy, kde-format
-#| msgid "Show Imports"
+#, kde-format
msgid "Show Errors"
-msgstr "Pokaż importy"
+msgstr "Pokaż błędy"
#: problemsview.cpp:146
#, kde-format
@@ -156,10 +155,9 @@
msgstr "Wyświetlaj ostrzeżenia"
#: problemsview.cpp:148
-#, fuzzy, kde-format
-#| msgid "Warning"
+#, kde-format
msgid "Show Warnings"
-msgstr "Ostrzeżenie"
+msgstr "Pokaż ostrzeżenia"
#: problemsview.cpp:151
#, kde-format
@@ -168,10 +166,9 @@
msgstr "Wyświetlaj wskazówki"
#: problemsview.cpp:153
-#, fuzzy, kde-format
-#| msgid "Show Imports"
+#, kde-format
msgid "Show Hints"
-msgstr "Pokaż importy"
+msgstr "Pokaż wskazówki"
#: problemsview.cpp:173
#, kde-format
@@ -196,7 +193,7 @@
#: problemsview.cpp:220
#, kde-format
msgid "Search..."
-msgstr ""
+msgstr "Szukaj..."
#: problemsview.cpp:460
#, kde-format
diff -Nru kdevplatform-5.1.0/po/pl/kdevprojectmanagerview.po kdevplatform-5.1.1/po/pl/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/pl/kdevprojectmanagerview.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pl/kdevprojectmanagerview.po 2017-05-13 10:12:40.000000000 +0000
@@ -16,13 +16,13 @@
# Krzysztof Lichota , 2005, 2006, 2007.
# Marta Rybczyńska , 2007, 2008, 2013.
# Michał Smoczyk , 2008.
-# Łukasz Wojniłowicz , 2011, 2012, 2014, 2015.
+# Łukasz Wojniłowicz , 2011, 2012, 2014, 2015, 2017.
msgid ""
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2015-08-09 08:32+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-04-08 07:14+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -209,65 +209,75 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
-#| msgid "Create File"
-msgid "Create File..."
-msgstr "Utwórz plik"
+#| msgid "Create File..."
+msgid "Create &File..."
+msgstr "Utwórz plik..."
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
-#| msgid "Create Folder"
-msgid "Create Folder..."
-msgstr "Utwórz katalog"
+#| msgid "Create Folder..."
+msgid "Create F&older..."
+msgstr "Utwórz katalog..."
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Buduj"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Instaluj"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
-msgstr "Oczyść"
+msgid "&Clean"
+msgstr "Porządkuj"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Dodaj do zestawu budowania"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Zamknij projekt"
msgstr[1] "Zamknij projekty"
msgstr[2] "Zamknij projekty"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Wczytaj ponownie"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Usuń"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Zmień nazwę..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Usuń z celu"
#: projectmanagerviewplugin.cpp:493
@@ -293,6 +303,11 @@
msgid "Delete Files"
msgstr "Usuń pliki"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Zmień nazwę..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
@@ -346,7 +361,7 @@
#: projecttreeview.cpp:364
#, kde-format
msgid "Analyze With"
-msgstr ""
+msgstr "Analizuj przy użyciu"
#: projecttreeview.cpp:382
#, kde-format
diff -Nru kdevplatform-5.1.0/po/pl/kdevswitchtobuddy.po kdevplatform-5.1.1/po/pl/kdevswitchtobuddy.po
--- kdevplatform-5.1.0/po/pl/kdevswitchtobuddy.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pl/kdevswitchtobuddy.po 2017-05-13 10:12:40.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Łukasz Wojniłowicz , 2013, 2014, 2016.
+# Łukasz Wojniłowicz , 2013, 2014, 2016, 2017.
# Marta Rybczyńska , 2013.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2016-09-17 09:23+0100\n"
+"PO-Revision-Date: 2017-04-08 07:14+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -42,4 +42,4 @@
#: switchtobuddyplugin.cpp:156
#, kde-format
msgid "Switch Header/Source"
-msgstr ""
\ No newline at end of file
+msgstr "Przełącz do nagłówka/źródła"
\ No newline at end of file
diff -Nru kdevplatform-5.1.0/po/pt/kdevappwizard.po kdevplatform-5.1.1/po/pt/kdevappwizard.po
--- kdevplatform-5.1.0/po/pt/kdevappwizard.po 2017-03-13 19:05:18.000000000 +0000
+++ kdevplatform-5.1.1/po/pt/kdevappwizard.po 2017-05-13 10:12:40.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-02-03 13:04+0000\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
@@ -56,62 +56,62 @@
"a gerar um esqueleto para a sua aplicação, a partir de um conjunto de "
"modelos."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Não foi possível criar o projecto a partir do modelo\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Não foi possível criar o projecto"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Veja por favor a área de ferramentas de Controlo de Versões"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Erro do Sistema de Controlo de Versões"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Não foi possível inicializar o repositório DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Não foi possível adicionar os ficheiros ao repositório DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Não foi possível importar o projecto para %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Não foi possível importar o projecto"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Não foi possível obter o projecto importado"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Não foi possível criar um novo projecto"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Não foi possível criar o ficheiro %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Modelos de Projectos"
@@ -123,57 +123,57 @@
msgid "Project"
msgstr "Projecto"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoria"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipo de Projecto"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obter Mais Modelos"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Carregar o Modelo de um Ficheiro"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Localização inválida"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nome do projecto em branco"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nome de projecto inválido"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Não foi possível criar as sub-pastas, faltam permissões em: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Modelo de projecto inválido; escolha por favor um item terminal"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "O local já existe e contém ficheiros. Abra-o como um projecto."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -200,7 +200,7 @@
msgid "Location:"
msgstr "Localização:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/pt/kdevgrepview.po kdevplatform-5.1.1/po/pt/kdevgrepview.po
--- kdevplatform-5.1.0/po/pt/kdevgrepview.po 2017-03-13 19:05:18.000000000 +0000
+++ kdevplatform-5.1.1/po/pt/kdevgrepview.po 2017-05-13 10:12:40.000000000 +0000
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2016-09-07 12:17+0100\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
@@ -98,39 +98,39 @@
msgid "Grep: %1"
msgstr "'Grep': %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Linha %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 ocorrência"
msgstr[1] "%1 ocorrências"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 ficheiro"
msgstr[1] "%1 ficheiros"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 em %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (uma ocorrência)"
msgstr[1] "%2 (%1 ocorrências)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/pt/kdevpatchreview.po kdevplatform-5.1.1/po/pt/kdevpatchreview.po
--- kdevplatform-5.1.0/po/pt/kdevpatchreview.po 2017-03-13 19:05:18.000000000 +0000
+++ kdevplatform-5.1.1/po/pt/kdevpatchreview.po 2017-05-13 10:12:40.000000000 +0000
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2015-05-13 18:37+0100\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
@@ -22,55 +22,55 @@
msgstr "Modificação Personalizada"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Modificação"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Base da modificação..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Do Ficheiro"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Localização da modificação..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Do Comando"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Resultado do comando..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "A modificação já está aplicada na versão local"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Já aplicada"
diff -Nru kdevplatform-5.1.0/po/pt/kdevplatform.po kdevplatform-5.1.1/po/pt/kdevplatform.po
--- kdevplatform-5.1.0/po/pt/kdevplatform.po 2017-03-13 19:05:18.000000000 +0000
+++ kdevplatform-5.1.1/po/pt/kdevplatform.po 2017-05-13 10:12:40.000000000 +0000
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2017-03-04 16:48+0000\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
@@ -367,8 +367,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Apagar"
@@ -498,7 +498,7 @@
msgstr "Expressões Recentes"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Remover Tudo"
@@ -642,6 +642,14 @@
msgid "Failed to apply changes: %1"
msgstr "Não foi possível aplicar as alterações: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Mudar o Nome"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -766,13 +774,6 @@
msgid "Applying changes failed: %1"
msgstr "A aplicação das alterações foi mal-sucedida: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Mudar o Nome"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1603,27 +1604,27 @@
msgid "Various items"
msgstr "Vários itens"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Não é possível remover a pasta %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Não é possível remover o ficheiro %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "O ficheiro %1 já existe."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Não é possível criar o ficheiro %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Não é possível criar a pasta %1."
@@ -1805,12 +1806,12 @@
msgid "&Color Theme"
msgstr "Tema de &Cores"
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configurar"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1819,7 +1820,7 @@
"A configuração do módulo actual foi alterada.\n"
"Deseja aplicar as alterações ou esquecê-las?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Aplicar a Configuração"
@@ -2933,18 +2934,18 @@
msgid "Show detailed progress window"
msgstr "Mostrar a janela de evolução detalhada"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "A Carregar o Projecto %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "A carregar o %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2953,26 +2954,26 @@
"Não foi possível carregar o ficheiro do projecto %1. O projecto foi "
"removido da sessão."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"Não foi possível criar a pasta escondida (%1) para o ficheiro de "
"desenvolvimento"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Não foi possível obter o ficheiro do projecto: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Não foi possível carregar o %1, por já existir um projecto '%2' com o mesmo "
"nome."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
@@ -2982,7 +2983,7 @@
"Verifique se os programas necessários estão instalados ou veja o resultado "
"na consola para obter mais informações."
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2991,12 +2992,12 @@
"O 'plugin' de importação do projecto (%1) não suporta a interface "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Não foi possível abrir o projecto"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -3005,32 +3006,32 @@
"Não foi possível guardar a configuração específica do projecto.\n"
"Atenção: A configuração do projecto que alterar perder-se-á."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configurar o Projecto %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Localização Inválida: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "O projecto já está a ser aberto"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Já está a abrir o '%1'; não será aberto de novo"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Substituto"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3038,12 +3039,12 @@
msgstr ""
"Continue para abrir o projecto e usar a configuração acabada de fornecer."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Abrir o Ficheiro Existente"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3052,13 +3053,13 @@
"Continuar para abrir o projecto, mas usando a configuração existente do "
"mesmo."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancelar e não abrir o projecto."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3067,34 +3068,34 @@
"Já existe um ficheiro de configuração do projecto em %1.\n"
"Deseja substituí-lo ou abrir o ficheiro existente?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Substituir a configuração do projecto existente"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Não foi possível criar o ficheiro de configuração %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Deseja abrir de novo o projecto actual?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Abrir / Importar um Projecto..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Abrir ou importar um projecto"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3110,19 +3111,19 @@
"pasta existente que ainda não tenha um ficheiro de projecto do KDevelop4, "
"será criado o ficheiro."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Obter o Projecto..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Obter um projecto"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3132,65 +3133,65 @@
"Conduz o utilizador pelo processo de obtenção do projecto e posterior "
"importação para o KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Fechar os Projectos"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Fecha todos os projectos seleccionados de momento"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Abrir a Configuração..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Enviar o Projecto Actual..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Enviar..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Abrir um Projecto Recente"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Abre um projecto aberto recentemente."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Abrir o Projecto para o Ficheiro Actual"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "O projecto já está aberto: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Nenhum documento activo"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "Projecto Já Aberto"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3199,12 +3200,12 @@
"O projecto que está a abrir já está aberto pelo menos numa outra sessão. O que deseja fazer?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Adicionar o projecto à sessão actual"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Abrir a sessão %1"
@@ -3659,19 +3660,19 @@
msgid "Create New Session"
msgstr "Criar uma Nova Sessão"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "tornou visível a instância de %1 em execução (PID: %2)"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "a instância de %1 em execução (PID: %2) está possivelmente bloqueada"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3681,7 +3682,7 @@
"A aplicação indicada não respondeu à chamada de DBUS; pode ter estoirado ou "
"bloqueado."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3690,7 +3691,7 @@
"Não foi possível bloquear a sessão %1, já bloqueada por %2 em %3 "
"(PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3698,7 +3699,7 @@
"Não foi possível bloquear a sessão %1 (ficheiro de bloqueio "
"indisponível)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3708,25 +3709,25 @@
"
Por favor, feche a instância da aplicação em questão ou escolha outra "
"sessão a lançar.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Repetir o arranque"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Escolher outra sessão"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Não Foi Possível Bloquear a Sessão %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3835,19 +3836,19 @@
msgid "Configure Environment Variables"
msgstr "Configurar as Variáveis de Ambiente"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Introduzir a variável..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Modo de Edição em Lote"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4419,7 +4420,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Nova"
@@ -4702,33 +4703,33 @@
msgid "Select Tool View to Add"
msgstr "Seleccione a Ferramenta a Adicionar"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Conjunto de Trabalho Activo"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Espaço de Trabalho"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Remover este espaço de trabalho. Os documentos existentes não são afectados."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documentos:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Adicionar Tudo"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4737,7 +4738,7 @@
"Adicionar todos os documentos que façam parte deste espaço de trabalho ao "
"espaço activo de momento."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4746,28 +4747,28 @@
"Remover todos os documentos que façam parte deste espaço de trabalho do "
"espaço activo de momento."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Carregue para abrir e activar este documento."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Remover este ficheiro do espaço de trabalho actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Adicionar este ficheiro ao espaço de trabalho actual"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Guardar no repositório temporário"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Carregar"
@@ -5207,25 +5208,25 @@
msgid "There are no committed differences."
msgstr "Não existem quaisquer diferenças gravadas."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Suporte ao SCV"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Cria uma nova ramificação com base na seleccionada"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "O mesmo que o 'git-branch -D'"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5236,25 +5237,25 @@
"modificação na ramificação seleccionada.
"
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr "Comparar com a Ramificação"
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Obtém a ramificação seleccionada"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Extrair"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Reunir"
@@ -5410,73 +5411,73 @@
msgid "Source Revision"
msgstr "Versão de Origem"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Actualizar"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Adicionar"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostrar as Diferenças..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Reverter"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Histórico..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotações..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostrar as Diferenças..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostrar as Diferenças (Todos os Ficheiros)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Empurrar"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Obter"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Não existem quaisquer diferenças."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Não foi possível obter as diferenças."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Histórico de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5485,7 +5486,7 @@
"Não é possível mostrar as anotações, porque falta a interface KTextEditor::"
"AnnotationInterface no editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5496,7 +5497,7 @@
"encontrado ou então não era um documento de texto:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copiar a Versão"
@@ -5524,40 +5525,40 @@
msgid "Recursive"
msgstr "Recursivo"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Mensagem de Envio:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Mensagens Antigas"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Para informações mais detalhadas, veja a área de ferramentas de Controlo de "
"Versões"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Não é possível enviar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "O envio das alterações foi mal-sucedido"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Enviar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5570,12 +5571,12 @@
"Com a mensagem:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Prestes a enviar para o repositório"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Não foi possível criar uma modificação para a versão actual."
@@ -5586,7 +5587,7 @@
msgstr "Diferença entre a versão %1 e a %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Diferença entre versões"
diff -Nru kdevplatform-5.1.0/po/pt/kdevprojectmanagerview.po kdevplatform-5.1.1/po/pt/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/pt/kdevprojectmanagerview.po 2017-03-13 19:05:18.000000000 +0000
+++ kdevplatform-5.1.1/po/pt/kdevprojectmanagerview.po 2017-05-13 10:12:40.000000000 +0000
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
-"PO-Revision-Date: 2015-07-28 15:59+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
+"PO-Revision-Date: 2017-05-07 18:10+0100\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
"Language: pt\n"
@@ -193,63 +193,63 @@
#: projectmanagerviewplugin.cpp:244
#, kde-format
-msgid "Create File..."
-msgstr "Criar um Ficheiro..."
+msgid "Create &File..."
+msgstr "Criar um &Ficheiro..."
#: projectmanagerviewplugin.cpp:250
#, kde-format
-msgid "Create Folder..."
-msgstr "Criar uma Pasta..."
+msgid "Create F&older..."
+msgstr "Criar uma &Pasta..."
#: projectmanagerviewplugin.cpp:257
#, kde-format
msgctxt "@action"
-msgid "Build"
-msgstr "Compilar"
+msgid "&Build"
+msgstr "&Compilar"
#: projectmanagerviewplugin.cpp:261
#, kde-format
msgctxt "@action"
-msgid "Install"
-msgstr "Instalar"
+msgid "&Install"
+msgstr "&Instalar"
#: projectmanagerviewplugin.cpp:265
#, kde-format
msgctxt "@action"
-msgid "Clean"
-msgstr "Limpar"
+msgid "&Clean"
+msgstr "&Limpar"
#: projectmanagerviewplugin.cpp:269
#, kde-format
-msgid "Add to Build Set"
-msgstr "Adicionar ao Conjunto de Compilações"
+msgid "&Add to Build Set"
+msgstr "&Adicionar ao Conjunto de Compilações"
#: projectmanagerviewplugin.cpp:276
#, kde-format
-msgid "Close Project"
+msgid "C&lose Project"
msgid_plural "Close Projects"
-msgstr[0] "Fechar o Projecto"
+msgstr[0] "Fe&char o Projecto"
msgstr[1] "Fechar os Projectos"
#: projectmanagerviewplugin.cpp:282
#, kde-format
-msgid "Reload"
-msgstr "Actualizar"
+msgid "&Reload"
+msgstr "&Recarregar"
#: projectmanagerviewplugin.cpp:288
#, kde-format
-msgid "Remove"
-msgstr "Remover"
+msgid "Remo&ve"
+msgstr "Remo&ver"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
+#: projectmanagerviewplugin.cpp:292
#, kde-format
-msgid "Rename..."
-msgstr "Mudar o Nome..."
+msgid "Re&name..."
+msgstr "Mudar o &Nome..."
#: projectmanagerviewplugin.cpp:298
#, kde-format
-msgid "Remove From Target"
-msgstr "Remover do Destino"
+msgid "Remove From &Target"
+msgstr "Remover do Des&tino"
#: projectmanagerviewplugin.cpp:493
#, kde-format
@@ -273,6 +273,11 @@
msgid "Delete Files"
msgstr "Apagar os Ficheiros"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Mudar o Nome..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/pt_BR/kdevappwizard.po kdevplatform-5.1.1/po/pt_BR/kdevappwizard.po
--- kdevplatform-5.1.0/po/pt_BR/kdevappwizard.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pt_BR/kdevappwizard.po 2017-05-13 10:12:40.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2015-02-03 18:31-0200\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
@@ -56,62 +56,62 @@
"Inicia o assistente de aplicativos do KDevelop. Ele lhe ajudará a gerar um "
"esqueleto para seu aplicativo, a partir de um conjunto de modelos."
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Could not create project from template\n"
msgstr "Não foi possível criar o projeto a partir do modelo\n"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, kde-format
msgid "Failed to create project"
msgstr "Não foi possível criar o projeto"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr "Veja a área de ferramentas de Controle de Versão"
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, kde-format
msgid "Version Control System Error"
msgstr "Erro do sistema de controle de versão"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr "Não foi possível inicializar o repositório DVCS"
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr "Não foi possível adicionar arquivos no repositório DVCS"
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, kde-format
msgid "Could not import project into %1."
msgstr "Não foi possível importar o projeto em %1."
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr "Não foi possível importar o projeto"
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr "Não foi possível obter o projeto importado"
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, kde-format
msgid "Could not create new project"
msgstr "Não foi possível criar um novo projeto"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr "Não foi possível criar o arquivo %1."
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Modelos de projeto"
@@ -123,57 +123,57 @@
msgid "Project"
msgstr "Projeto"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr "Categoria"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Project Type"
msgstr "Tipo de projeto"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, kde-format
msgid "Get More Templates"
msgstr "Obter mais modelos"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr "Carregar modelo a partir de um arquivo"
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, kde-format
msgid "Invalid location"
msgstr "Localização inválida"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Nome do projeto vazio"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Nome do projeto inválido"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr "Não foi possível criar subdiretórios, permissões faltantes em: %1"
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, kde-format
msgid "Invalid project template, please choose a leaf item"
msgstr "Modelo de projeto inválido; escolha por favor um item terminal"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, kde-format
msgid "Path already exists and contains files. Open it as a project."
msgstr "O caminho já existe e contém arquivos. Abra-o como um projeto."
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -199,7 +199,7 @@
msgid "Location:"
msgstr "Localização:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/pt_BR/kdevgrepview.po kdevplatform-5.1.1/po/pt_BR/kdevgrepview.po
--- kdevplatform-5.1.0/po/pt_BR/kdevgrepview.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pt_BR/kdevgrepview.po 2017-05-13 10:12:40.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2016-09-13 10:00-0300\n"
"Last-Translator: Luiz Fernando Ranghetti \n"
"Language-Team: Portuguese \n"
@@ -106,39 +106,39 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr "Linha %1: "
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
msgstr[0] "1 ocorrência"
msgstr[1] "%1 ocorrências"
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
msgstr[0] "1 arquivo"
msgstr[1] "%1 arquivos"
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "
%1 in %2
"
msgstr "
%1 em %2
"
-#: grepoutputmodel.cpp:394
+#: grepoutputmodel.cpp:395
#, kde-format
msgid "%2 (one match)"
msgid_plural "%2 (%1 matches)"
msgstr[0] "%2 (uma ocorrência)"
msgstr[1] "%2 (%1 ocorrências)"
-#: grepoutputmodel.cpp:469
+#: grepoutputmodel.cpp:470
#, kde-format
msgctxt ""
"%1 is the old text, %2 is the new text, %3 is the file path, %4 and %5 are "
diff -Nru kdevplatform-5.1.0/po/pt_BR/kdevpatchreview.po kdevplatform-5.1.1/po/pt_BR/kdevpatchreview.po
--- kdevplatform-5.1.0/po/pt_BR/kdevpatchreview.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pt_BR/kdevpatchreview.po 2017-05-13 10:12:40.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevpatchreview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-04 10:33+0200\n"
"PO-Revision-Date: 2015-05-13 08:25-0300\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
@@ -27,55 +27,55 @@
msgstr "Patch personalizado"
#. i18n: ectx: property (title), widget (QGroupBox, localPatchOptions)
-#: localpatchwidget.ui:17
+#: localpatchwidget.ui:29
#, kde-format
msgid "Patch"
msgstr "Modificação"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: localpatchwidget.ui:26
+#: localpatchwidget.ui:38
#, kde-format
msgid "Base:"
msgstr "Base:"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, baseDir)
-#: localpatchwidget.ui:33
+#: localpatchwidget.ui:45
#, kde-format
msgid "Patch base..."
msgstr "Base da modificação..."
#. i18n: ectx: attribute (title), widget (QWidget, fileTab)
-#: localpatchwidget.ui:44
+#: localpatchwidget.ui:56
#, kde-format
msgid "From File"
msgstr "Do arquivo"
#. i18n: ectx: property (placeholderText), widget (KUrlRequester, filename)
-#: localpatchwidget.ui:50
+#: localpatchwidget.ui:62
#, kde-format
msgid "Patch location..."
msgstr "Localização da modificação..."
#. i18n: ectx: attribute (title), widget (QWidget, commandTab)
-#: localpatchwidget.ui:58
+#: localpatchwidget.ui:70
#, kde-format
msgid "From Command"
msgstr "Do comando"
#. i18n: ectx: property (placeholderText), widget (QLineEdit, command)
-#: localpatchwidget.ui:64
+#: localpatchwidget.ui:76
#, kde-format
msgid "Command's output..."
msgstr "Saída do comando..."
#. i18n: ectx: property (toolTip), widget (QCheckBox, applied)
-#: localpatchwidget.ui:75
+#: localpatchwidget.ui:87
#, kde-format
msgid "Patch is already applied on local version"
msgstr "A modificação já está aplicada na versão local"
#. i18n: ectx: property (text), widget (QCheckBox, applied)
-#: localpatchwidget.ui:78
+#: localpatchwidget.ui:90
#, kde-format
msgid "Already applied"
msgstr "Já aplicada"
diff -Nru kdevplatform-5.1.0/po/pt_BR/kdevplatform.po kdevplatform-5.1.1/po/pt_BR/kdevplatform.po
--- kdevplatform-5.1.0/po/pt_BR/kdevplatform.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pt_BR/kdevplatform.po 2017-05-13 10:12:40.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kdevplatform\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-04-28 04:41+0200\n"
"PO-Revision-Date: 2016-09-13 10:01-0300\n"
"Last-Translator: Luiz Fernando Ranghetti \n"
"Language-Team: Portuguese \n"
@@ -354,8 +354,8 @@
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: debugger/util/pathmappings.cpp:229
#: shell/settings/sourceformattersettings.ui:195
-#: shell/workingsets/workingsettooltipwidget.cpp:96
-#: vcs/dvcs/ui/branchmanager.ui:32
+#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: vcs/dvcs/ui/branchmanager.ui:44
#, kde-format
msgid "Delete"
msgstr "Excluir"
@@ -486,7 +486,7 @@
msgstr "Expressões Recentes"
#: debugger/variable/variablewidget.cpp:336
-#: shell/workingsets/workingsettooltipwidget.cpp:139
+#: shell/workingsets/workingsettooltipwidget.cpp:140
#, kde-format
msgid "Remove All"
msgstr "Remover Todos"
@@ -631,6 +631,14 @@
msgid "Failed to apply changes: %1"
msgstr "Não foi possível aplicar as alterações: %1"
+#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: language/assistant/renameassistant.cpp:118
+#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:51
+#, kde-format
+msgid "Rename"
+msgstr "Renomear"
+
#: language/assistant/renamefileaction.cpp:56
#, kde-format
msgid "Rename file from \"%1\" to \"%2\"."
@@ -754,13 +762,6 @@
msgid "Applying changes failed: %1"
msgstr "Ocorreu uma falha na aplicação das alterações: %1"
-#. i18n: ectx: property (windowTitle), widget (QDialog, RenameDialog)
-#. i18n: ectx: property (text), widget (QPushButton, renameButton)
-#: language/codegen/basicrefactoring.ui:14 vcs/dvcs/ui/branchmanager.ui:39
-#, kde-format
-msgid "Rename"
-msgstr "Renomear"
-
#. i18n: ectx: property (text), widget (QLabel, newNameLabel)
#: language/codegen/basicrefactoring.ui:22
#, kde-format
@@ -1588,27 +1589,27 @@
msgid "Various items"
msgstr "Vários items"
-#: project/helper.cpp:77
+#: project/helper.cpp:80
#, kde-format
msgid "Cannot remove folder %1."
msgstr "Não foi possível remover a pasta %1."
-#: project/helper.cpp:78
+#: project/helper.cpp:81
#, kde-format
msgid "Cannot remove file %1."
msgstr "Não foi possível remover o arquivo %1."
-#: project/helper.cpp:95
+#: project/helper.cpp:98
#, kde-format
msgid "The file %1 already exists."
msgstr "O arquivo %1 já existe."
-#: project/helper.cpp:104
+#: project/helper.cpp:107
#, kde-format
msgid "Cannot create file %1."
msgstr "Não foi possível criar o arquivo %1."
-#: project/helper.cpp:121
+#: project/helper.cpp:124
#, kde-format
msgid "Cannot create folder %1."
msgstr "Não foi possível criar a pasta %1."
@@ -1787,12 +1788,12 @@
msgid "&Color Theme"
msgstr ""
-#: shell/configdialog.cpp:45
+#: shell/configdialog.cpp:46
#, kde-format
msgid "Configure"
msgstr "Configurar"
-#: shell/configdialog.cpp:97
+#: shell/configdialog.cpp:94
#, kde-format
msgid ""
"The settings of the current module have changed.\n"
@@ -1801,7 +1802,7 @@
"As configurações do módulo atual foram alteradas.\n"
"Deseja aplicar as alterações ou descartá-las?"
-#: shell/configdialog.cpp:98
+#: shell/configdialog.cpp:95
#, kde-format
msgid "Apply Settings"
msgstr "Aplicar configurações"
@@ -2919,18 +2920,18 @@
msgid "Show detailed progress window"
msgstr "Mostrar a janela de progresso detalhada"
-#: shell/project.cpp:111
+#: shell/project.cpp:110
#, kde-format
msgid "Loading Project %1"
msgstr "Carregando o projeto %1"
-#: shell/project.cpp:119
+#: shell/project.cpp:118
#, kde-format
msgctxt "%1: Project name"
msgid "Loading %1"
msgstr "Carregando %1"
-#: shell/project.cpp:233
+#: shell/project.cpp:232
#, kde-format
msgid ""
"Unable to load the project file %1. The project has been removed from the "
@@ -2939,32 +2940,32 @@
"Não foi possível carregar o arquivo do projeto %1. O projeto foi removido "
"da sessão."
-#: shell/project.cpp:258
+#: shell/project.cpp:257
#, kde-format
msgid "Unable to create hidden dir (%1) for developer file"
msgstr ""
"Não foi possível criar a pasta oculto (%1) para o arquivo de desenvolvimento"
-#: shell/project.cpp:274
+#: shell/project.cpp:273
#, kde-format
msgid "Unable to get project file: %1"
msgstr "Não foi possível obter o arquivo do projeto: %1"
-#: shell/project.cpp:313
+#: shell/project.cpp:312
#, kde-format
msgid "Could not load %1, a project with the same name '%2' is already open."
msgstr ""
"Não foi possível carregar o %1, por já existir um projeto '%2' com o mesmo "
"nome."
-#: shell/project.cpp:344
+#: shell/project.cpp:343
#, kde-format
msgid ""
"Could not load project management plugin %1. Check that the "
"required programs are installed, or see console output for more information."
msgstr ""
-#: shell/project.cpp:353
+#: shell/project.cpp:352
#, kde-format
msgid ""
"project importing plugin (%1) does not support the IProjectFileManager "
@@ -2973,12 +2974,12 @@
"O plugin de importação do projeto (%1) não suporta a interface "
"IProjectFileManager."
-#: shell/project.cpp:398
+#: shell/project.cpp:397
#, kde-format
msgid "Could not open project"
msgstr "Não foi possível abrir o projeto"
-#: shell/project.cpp:539
+#: shell/project.cpp:536
#, kde-format
msgid ""
"Could not store developer specific project configuration.\n"
@@ -2987,32 +2988,32 @@
"Não foi possível guardar a configuração específica do projeto.\n"
"Atenção: A configuração do projeto que alterar será perdida."
-#: shell/projectcontroller.cpp:160
+#: shell/projectcontroller.cpp:164
#, kde-format
msgid "Configure Project %1"
msgstr "Configurar o projeto %1"
-#: shell/projectcontroller.cpp:297
+#: shell/projectcontroller.cpp:301
#, kde-format
msgid "Invalid Location: %1"
msgstr "Localização inválida: %1"
-#: shell/projectcontroller.cpp:304
+#: shell/projectcontroller.cpp:308
#, kde-format
msgid "Project already being opened"
msgstr "O projeto já está sendo aberto"
-#: shell/projectcontroller.cpp:305
+#: shell/projectcontroller.cpp:309
#, kde-format
msgid "Already opening %1, not opening again"
msgstr "Já está abrindo o '%1'; não será aberto de novo"
-#: shell/projectcontroller.cpp:459
+#: shell/projectcontroller.cpp:463
#, kde-format
msgid "Override"
msgstr "Substituir"
-#: shell/projectcontroller.cpp:460
+#: shell/projectcontroller.cpp:464
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3020,12 +3021,12 @@
msgstr ""
"Continue a abrir o projeto e use a configuração do projeto recém fornecida."
-#: shell/projectcontroller.cpp:463
+#: shell/projectcontroller.cpp:467
#, kde-format
msgid "Open Existing File"
msgstr "Abrir um arquivo existente"
-#: shell/projectcontroller.cpp:464
+#: shell/projectcontroller.cpp:468
#, kde-format
msgctxt "@info:tooltip"
msgid ""
@@ -3033,13 +3034,13 @@
msgstr ""
"Continue a abrir o projeto mas use a configuração de projeto existente."
-#: shell/projectcontroller.cpp:467
+#: shell/projectcontroller.cpp:471
#, kde-format
msgctxt "@info:tooltip"
msgid "Cancel and do not open the project."
msgstr "Cancelar e não abrir o projeto."
-#: shell/projectcontroller.cpp:469
+#: shell/projectcontroller.cpp:473
#, kde-format
msgid ""
"There already exists a project configuration file at %1.\n"
@@ -3048,34 +3049,34 @@
"Já existe um arquivo de configuração de projeto em %1.\n"
"Você deseja substituí-lo ou abrir o arquivo existente?"
-#: shell/projectcontroller.cpp:471
+#: shell/projectcontroller.cpp:475
#, kde-format
msgid "Override existing project configuration"
msgstr "Substituir a configuração de projeto existente"
-#: shell/projectcontroller.cpp:487
+#: shell/projectcontroller.cpp:491
#, kde-format
msgid "Unable to create configuration file %1"
msgstr "Não foi possível criar o arquivo de configuração %1"
-#: shell/projectcontroller.cpp:498
+#: shell/projectcontroller.cpp:502
#, kde-format
msgid "Reopen the current project?"
msgstr "Deseja abrir de novo o projeto atual?"
-#: shell/projectcontroller.cpp:535
+#: shell/projectcontroller.cpp:539
#, kde-format
msgctxt "@action"
msgid "Open / Import Project..."
msgstr "Abrir / Importar projeto..."
-#: shell/projectcontroller.cpp:536
+#: shell/projectcontroller.cpp:540
#, kde-format
msgctxt "@info:tooltip"
msgid "Open or import project"
msgstr "Abre ou importa um projeto"
-#: shell/projectcontroller.cpp:537
+#: shell/projectcontroller.cpp:541
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3090,19 +3091,19 @@
"programa. Ao abrir uma pasta existente que não possui ainda um arquivo de "
"projeto do KDevelop, o arquivo será criado."
-#: shell/projectcontroller.cpp:548
+#: shell/projectcontroller.cpp:552
#, kde-format
msgctxt "@action"
msgid "Fetch Project..."
msgstr "Obter um projeto..."
-#: shell/projectcontroller.cpp:550
+#: shell/projectcontroller.cpp:554
#, kde-format
msgctxt "@info:tooltip"
msgid "Fetch project"
msgstr "Obter um projeto"
-#: shell/projectcontroller.cpp:551
+#: shell/projectcontroller.cpp:555
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
@@ -3112,65 +3113,65 @@
"Guia o usuário pelo processo de obtenção do projeto e posterior importação "
"para o KDevelop 4."
-#: shell/projectcontroller.cpp:565
+#: shell/projectcontroller.cpp:569
#, kde-format
msgctxt "@action"
msgid "Close Project(s)"
msgstr "Fechar o(s) projeto(s)"
-#: shell/projectcontroller.cpp:567
+#: shell/projectcontroller.cpp:571
#, kde-format
msgctxt "@info:tooltip"
msgid "Closes all currently selected projects"
msgstr "Fecha todos os projetos selecionados no momento"
-#: shell/projectcontroller.cpp:572
+#: shell/projectcontroller.cpp:576
#, kde-format
msgid "Open Configuration..."
msgstr "Abrir configuração..."
-#: shell/projectcontroller.cpp:578
+#: shell/projectcontroller.cpp:582
#, kde-format
msgid "Commit Current Project..."
msgstr "Enviar o projeto atual..."
-#: shell/projectcontroller.cpp:579 vcs/vcspluginhelper.cpp:80
+#: shell/projectcontroller.cpp:583 vcs/vcspluginhelper.cpp:81
#, kde-format
msgid "Commit..."
msgstr "Enviar..."
-#: shell/projectcontroller.cpp:590
+#: shell/projectcontroller.cpp:594
#, kde-format
msgid "Open Recent Project"
msgstr "Abrir um projeto recente"
-#: shell/projectcontroller.cpp:591
+#: shell/projectcontroller.cpp:595
#, kde-format
msgctxt "@info:whatsthis"
msgid "Opens recently opened project."
msgstr "Abre um projeto aberto recentemente."
-#: shell/projectcontroller.cpp:596
+#: shell/projectcontroller.cpp:600
#, kde-format
msgid "Open Project for Current File"
msgstr "Abrir o projeto para o arquivo atual"
-#: shell/projectcontroller.cpp:713
+#: shell/projectcontroller.cpp:717
#, kde-format
msgid "Project already open: %1"
msgstr "O projeto já está aberto: %1"
-#: shell/projectcontroller.cpp:716
+#: shell/projectcontroller.cpp:720
#, kde-format
msgid "No active document"
msgstr "Nenhum documento ativo"
-#: shell/projectcontroller.cpp:787
+#: shell/projectcontroller.cpp:791
#, kde-format
msgid "Project Already Open"
msgstr "O projeto já está aberto"
-#: shell/projectcontroller.cpp:790
+#: shell/projectcontroller.cpp:794
#, kde-format
msgid ""
"The project you're trying to open is already open in at least one other "
@@ -3179,12 +3180,12 @@
"O projeto que você está tentando abrir já está aberto em pelo menos uma "
"outra sessão. O que deseja fazer?"
-#: shell/projectcontroller.cpp:794
+#: shell/projectcontroller.cpp:798
#, kde-format
msgid "Add project to current session"
msgstr "Adicionar o projeto à sessão atual"
-#: shell/projectcontroller.cpp:798
+#: shell/projectcontroller.cpp:802
#, kde-format
msgid "Open session %1"
msgstr "Abrir a sessão %1"
@@ -3640,19 +3641,19 @@
msgid "Create New Session"
msgstr "Criar nova sessão"
-#: shell/sessionlock.cpp:171
+#: shell/sessionlock.cpp:172
#, kde-format
msgctxt "@info:shell"
msgid "made running %1 instance (PID: %2) visible"
msgstr "tornou visível a instância de %1 em execução (PID: %2)"
-#: shell/sessionlock.cpp:174
+#: shell/sessionlock.cpp:175
#, kde-format
msgctxt "@info:shell"
msgid "running %1 instance (PID: %2) is apparently hung"
msgstr "a instância %1 em execução (PID: %2) está aparentemente bloqueada"
-#: shell/sessionlock.cpp:180
+#: shell/sessionlock.cpp:181
#, kde-format
msgctxt "@info"
msgid ""
@@ -3662,7 +3663,7 @@
"O aplicativo indicado não respondeu à chamada de D-Bus. Ele pode ter falhado "
"ou bloqueado."
-#: shell/sessionlock.cpp:185
+#: shell/sessionlock.cpp:186
#, kde-format
msgctxt "@info"
msgid ""
@@ -3671,7 +3672,7 @@
"Não foi possível bloquear a sessão %1, já bloqueada por %2 em %3 "
"(PID %4)."
-#: shell/sessionlock.cpp:189
+#: shell/sessionlock.cpp:190
#, kde-format
msgctxt "@info"
msgid "Failed to lock the session %1 (lock-file unavailable)."
@@ -3679,7 +3680,7 @@
"Não foi possível bloquear a sessão %1 (arquivo de bloqueio "
"indisponível)."
-#: shell/sessionlock.cpp:193
+#: shell/sessionlock.cpp:194
#, kde-format
msgctxt "@info"
msgid ""
@@ -3688,25 +3689,25 @@
msgstr ""
"
Feche a instância do aplicativo em questão ou escolha outra sessão.
"
-#: shell/sessionlock.cpp:199
+#: shell/sessionlock.cpp:200
#, kde-format
msgctxt "@action:button"
msgid "Retry startup"
msgstr "Repetir a inicialização"
-#: shell/sessionlock.cpp:202
+#: shell/sessionlock.cpp:203
#, kde-format
msgctxt "@action:button"
msgid "Choose another session"
msgstr "Escolher outra sessão"
-#: shell/sessionlock.cpp:205
+#: shell/sessionlock.cpp:206
#, kde-format
msgctxt "@title:window"
msgid "Failed to Lock Session %1"
msgstr "Não foi possível bloquear a sessão %1"
-#: shell/sessionlock.cpp:213
+#: shell/sessionlock.cpp:214
#, kde-format
msgctxt "@info"
msgid "The session %1 is already active in another running instance."
@@ -3816,19 +3817,19 @@
msgid "Configure Environment Variables"
msgstr "Configurar as variáveis de ambiente"
-#: shell/settings/environmentwidget.cpp:53
+#: shell/settings/environmentwidget.cpp:54
#, kde-format
msgid "Enter variable ..."
msgstr "Inserir variável..."
#. i18n: ectx: property (toolTip), widget (QPushButton, batchModeEditButton)
-#: shell/settings/environmentwidget.cpp:154
+#: shell/settings/environmentwidget.cpp:155
#: shell/settings/environmentwidget.ui:112
#, kde-format
msgid "Batch Edit Mode"
msgstr "Modo de edição em lote"
-#: shell/settings/environmentwidget.cpp:202
+#: shell/settings/environmentwidget.cpp:203
#, kde-format
msgctxt "a copy of the existing environment was created"
msgid "%1 (Cloned %2)"
@@ -4400,7 +4401,7 @@
#. i18n: ectx: property (text), widget (QPushButton, btnNewStyle)
#. i18n: ectx: property (text), widget (QPushButton, newButton)
#: shell/settings/sourceformattersettings.ui:181
-#: vcs/dvcs/ui/branchmanager.ui:22
+#: vcs/dvcs/ui/branchmanager.ui:34
#, kde-format
msgid "New"
msgstr "Novo"
@@ -4682,33 +4683,33 @@
msgid "Select Tool View to Add"
msgstr "Selecione a ferramenta a adicionar"
-#: shell/workingsets/workingsettooltipwidget.cpp:77
+#: shell/workingsets/workingsettooltipwidget.cpp:78
#, kde-format
msgid "Active Working Set"
msgstr "Conjunto de trabalho ativo"
-#: shell/workingsets/workingsettooltipwidget.cpp:79
+#: shell/workingsets/workingsettooltipwidget.cpp:80
#, kde-format
msgid "Working Set"
msgstr "Espaço de trabalho"
-#: shell/workingsets/workingsettooltipwidget.cpp:97
+#: shell/workingsets/workingsettooltipwidget.cpp:98
#, kde-format
msgid "Remove this working set. The contained documents are not affected."
msgstr ""
"Remover este espaço de trabalho. Os documentos existentes não são afetados."
-#: shell/workingsets/workingsettooltipwidget.cpp:123
+#: shell/workingsets/workingsettooltipwidget.cpp:124
#, kde-format
msgid "Documents:"
msgstr "Documentos:"
-#: shell/workingsets/workingsettooltipwidget.cpp:131
+#: shell/workingsets/workingsettooltipwidget.cpp:132
#, kde-format
msgid "Add All"
msgstr "Adicionar tudo"
-#: shell/workingsets/workingsettooltipwidget.cpp:132
+#: shell/workingsets/workingsettooltipwidget.cpp:133
#, kde-format
msgid ""
"Add all documents that are part of this working set to the currently active "
@@ -4717,7 +4718,7 @@
"Adicionar todos os documentos que façam parte deste espaço de trabalho ao "
"espaço ativo no momento."
-#: shell/workingsets/workingsettooltipwidget.cpp:140
+#: shell/workingsets/workingsettooltipwidget.cpp:141
#, kde-format
msgid ""
"Remove all documents that are part of this working set from the currently "
@@ -4726,28 +4727,28 @@
"Remover todos os documentos que façam parte deste espaço de trabalho do "
"espaço ativo no momento."
-#: shell/workingsets/workingsettooltipwidget.cpp:172
+#: shell/workingsets/workingsettooltipwidget.cpp:173
#, kde-format
msgctxt "@info:tooltip"
msgid "Click to open and activate this document."
msgstr "Clique para abrir e ativar este documento."
-#: shell/workingsets/workingsettooltipwidget.cpp:283
+#: shell/workingsets/workingsettooltipwidget.cpp:284
#, kde-format
msgid "Remove this file from the current working set"
msgstr "Remover este arquivo do espaço de trabalho atual"
-#: shell/workingsets/workingsettooltipwidget.cpp:288
+#: shell/workingsets/workingsettooltipwidget.cpp:289
#, kde-format
msgid "Add this file to the current working set"
msgstr "Adicionar este arquivo ao espaço de trabalho atual"
-#: shell/workingsets/workingsettooltipwidget.cpp:317
+#: shell/workingsets/workingsettooltipwidget.cpp:318
#, kde-format
msgid "Stash"
msgstr "Modificação temporária"
-#: shell/workingsets/workingsettooltipwidget.cpp:323
+#: shell/workingsets/workingsettooltipwidget.cpp:324
#, kde-format
msgid "Load"
msgstr "Carregar"
@@ -5190,25 +5191,25 @@
msgid "There are no committed differences."
msgstr "Não existem diferenças."
-#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:277
+#: vcs/dvcs/ui/branchmanager.cpp:233 vcs/vcspluginhelper.cpp:278
#, kde-format
msgid "VCS support"
msgstr "Suporte ao SCV"
#. i18n: ectx: property (toolTip), widget (QPushButton, newButton)
-#: vcs/dvcs/ui/branchmanager.ui:19
+#: vcs/dvcs/ui/branchmanager.ui:31
#, kde-format
msgid "Creates new branch based on the selected branch"
msgstr "Cria uma nova ramificação com base na selecionada"
#. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: vcs/dvcs/ui/branchmanager.ui:29
+#: vcs/dvcs/ui/branchmanager.ui:41
#, kde-format
msgid "The same as git branch -D"
msgstr "O mesmo que o 'git-branch -D'"
#. i18n: ectx: property (toolTip), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:62
+#: vcs/dvcs/ui/branchmanager.ui:74
#, kde-format
msgid ""
"
Show changes between the current branch (or staging area, if not empty) "
@@ -5216,25 +5217,25 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, diffButton)
-#: vcs/dvcs/ui/branchmanager.ui:65
+#: vcs/dvcs/ui/branchmanager.ui:77
#, kde-format
msgid "Compare to Branch"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:88
+#: vcs/dvcs/ui/branchmanager.ui:100
#, kde-format
msgid "Checkout to the selected branch"
msgstr "Obtém a ramificação selecionada"
#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
-#: vcs/dvcs/ui/branchmanager.ui:91
+#: vcs/dvcs/ui/branchmanager.ui:103
#, kde-format
msgid "Checkout"
msgstr "Baixar"
#. i18n: ectx: property (text), widget (QPushButton, mergeButton)
-#: vcs/dvcs/ui/branchmanager.ui:98
+#: vcs/dvcs/ui/branchmanager.ui:110
#, kde-format
msgid "Merge"
msgstr "Mesclar"
@@ -5390,73 +5391,73 @@
msgid "Source Revision"
msgstr "Versão de Origem"
-#: vcs/vcspluginhelper.cpp:81
+#: vcs/vcspluginhelper.cpp:82
#, kde-format
msgid "Update"
msgstr "Atualizar"
-#: vcs/vcspluginhelper.cpp:82
+#: vcs/vcspluginhelper.cpp:83
#, kde-format
msgid "Add"
msgstr "Adicionar"
-#: vcs/vcspluginhelper.cpp:83
+#: vcs/vcspluginhelper.cpp:84
#, kde-format
msgid "Show Differences..."
msgstr "Mostrar diferenças..."
-#: vcs/vcspluginhelper.cpp:84
+#: vcs/vcspluginhelper.cpp:85
#, kde-format
msgid "Revert"
msgstr "Reverter"
-#: vcs/vcspluginhelper.cpp:85 vcs/vcspluginhelper.cpp:431
+#: vcs/vcspluginhelper.cpp:86 vcs/vcspluginhelper.cpp:432
#, kde-format
msgid "History..."
msgstr "Histórico..."
-#: vcs/vcspluginhelper.cpp:86
+#: vcs/vcspluginhelper.cpp:87
#, kde-format
msgid "Annotation..."
msgstr "Anotações..."
-#: vcs/vcspluginhelper.cpp:87
+#: vcs/vcspluginhelper.cpp:88
#, kde-format
msgid "Show Diff..."
msgstr "Mostrar diferenças..."
-#: vcs/vcspluginhelper.cpp:88
+#: vcs/vcspluginhelper.cpp:89
#, kde-format
msgid "Show Diff (all files)..."
msgstr "Mostrar diferenças (todos os arquivos)..."
-#: vcs/vcspluginhelper.cpp:89
+#: vcs/vcspluginhelper.cpp:90
#, kde-format
msgid "Push"
msgstr "Enviar"
-#: vcs/vcspluginhelper.cpp:90
+#: vcs/vcspluginhelper.cpp:91
#, kde-format
msgid "Pull"
msgstr "Obter"
-#: vcs/vcspluginhelper.cpp:276
+#: vcs/vcspluginhelper.cpp:277
#, kde-format
msgid "There are no differences."
msgstr "Não existem diferenças."
-#: vcs/vcspluginhelper.cpp:283
+#: vcs/vcspluginhelper.cpp:284
#, kde-format
msgid "Unable to get difference."
msgstr "Não foi possível obter as diferenças."
-#: vcs/vcspluginhelper.cpp:339
+#: vcs/vcspluginhelper.cpp:340
#, kde-format
msgctxt "%1: path or URL, %2: name of a version control system"
msgid "%2 History (%1)"
msgstr "Histórico de %2 (%1)"
-#: vcs/vcspluginhelper.cpp:397
+#: vcs/vcspluginhelper.cpp:398
#, kde-format
msgid ""
"Cannot display annotations, missing interface KTextEditor::"
@@ -5465,7 +5466,7 @@
"Não é possível mostrar as anotações, porque falta a interface KTextEditor::"
"AnnotationInterface no editor."
-#: vcs/vcspluginhelper.cpp:401
+#: vcs/vcspluginhelper.cpp:402
#, kde-format
msgid ""
"Cannot execute annotate action because the document was not found, or was "
@@ -5476,7 +5477,7 @@
"encontrado ou então não era um documento de texto:\n"
"%1"
-#: vcs/vcspluginhelper.cpp:427
+#: vcs/vcspluginhelper.cpp:428
#, kde-format
msgid "Copy Revision"
msgstr "Copiar revisão"
@@ -5504,40 +5505,40 @@
msgid "Recursive"
msgstr "Recursivo"
-#: vcs/widgets/vcsdiffpatchsources.cpp:59
+#: vcs/widgets/vcsdiffpatchsources.cpp:60
#, kde-format
msgid "Commit Message:"
msgstr "Mensagem de envio:"
-#: vcs/widgets/vcsdiffpatchsources.cpp:63
+#: vcs/widgets/vcsdiffpatchsources.cpp:64
#, kde-format
msgid "Old Messages"
msgstr "Mensagens antigas"
-#: vcs/widgets/vcsdiffpatchsources.cpp:116
+#: vcs/widgets/vcsdiffpatchsources.cpp:117
#, kde-format
msgid "For more detailed information please see the Version Control toolview"
msgstr ""
"Para informações mais detalhadas, veja a área de ferramentas de Controle de "
"Versões"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Unable to commit"
msgstr "Não foi possível enviar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:118
+#: vcs/widgets/vcsdiffpatchsources.cpp:119
#, kde-format
msgid "Commit unsuccessful"
msgstr "O envio não foi bem sucedido"
-#: vcs/widgets/vcsdiffpatchsources.cpp:230
+#: vcs/widgets/vcsdiffpatchsources.cpp:231
#, kde-format
msgctxt "@action:button To make a commit"
msgid "Commit"
msgstr "Enviar"
-#: vcs/widgets/vcsdiffpatchsources.cpp:261
+#: vcs/widgets/vcsdiffpatchsources.cpp:262
#, kde-format
msgid ""
"Files will be committed:\n"
@@ -5550,12 +5551,12 @@
"Com a mensagem:\n"
"
%2
"
-#: vcs/widgets/vcsdiffpatchsources.cpp:263
+#: vcs/widgets/vcsdiffpatchsources.cpp:264
#, kde-format
msgid "About to commit to repository"
msgstr "Prestes a enviar para o repositório"
-#: vcs/widgets/vcsdiffpatchsources.cpp:303
+#: vcs/widgets/vcsdiffpatchsources.cpp:304
#, kde-format
msgid "Could not create a patch for the current version."
msgstr "Não foi possível criar um caminho para a versão atual."
@@ -5566,7 +5567,7 @@
msgstr "Diferença entre a versão %1 e a %2:"
#. i18n: ectx: property (text), widget (QLabel, revLabel)
-#: vcs/widgets/vcsdiffwidget.ui:16
+#: vcs/widgets/vcsdiffwidget.ui:28
#, kde-format
msgid "Difference between revisions"
msgstr "Diferença entre as versões"
diff -Nru kdevplatform-5.1.0/po/pt_BR/kdevprojectmanagerview.po kdevplatform-5.1.1/po/pt_BR/kdevprojectmanagerview.po
--- kdevplatform-5.1.0/po/pt_BR/kdevprojectmanagerview.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/pt_BR/kdevprojectmanagerview.po 2017-05-13 10:12:40.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kdevprojectmanagerview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-06 04:40+0200\n"
"PO-Revision-Date: 2015-07-28 15:22-0300\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
@@ -196,63 +196,73 @@
#: projectmanagerviewplugin.cpp:244
#, fuzzy, kde-format
#| msgid "Create File"
-msgid "Create File..."
+msgid "Create &File..."
msgstr "Criar arquivo"
#: projectmanagerviewplugin.cpp:250
#, fuzzy, kde-format
#| msgid "Create Folder"
-msgid "Create Folder..."
+msgid "Create F&older..."
msgstr "Criar pasta"
#: projectmanagerviewplugin.cpp:257
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Build"
msgctxt "@action"
-msgid "Build"
+msgid "&Build"
msgstr "Compilar"
#: projectmanagerviewplugin.cpp:261
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Install"
msgctxt "@action"
-msgid "Install"
+msgid "&Install"
msgstr "Instalar"
#: projectmanagerviewplugin.cpp:265
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Clean"
msgctxt "@action"
-msgid "Clean"
+msgid "&Clean"
msgstr "Limpar"
#: projectmanagerviewplugin.cpp:269
-#, kde-format
-msgid "Add to Build Set"
+#, fuzzy, kde-format
+#| msgid "Add to Build Set"
+msgid "&Add to Build Set"
msgstr "Adicionar ao conjunto de compilações"
#: projectmanagerviewplugin.cpp:276
-#, kde-format
-msgid "Close Project"
+#, fuzzy, kde-format
+#| msgid "Close Project"
+#| msgid_plural "Close Projects"
+msgid "C&lose Project"
msgid_plural "Close Projects"
msgstr[0] "Fechar o projeto"
msgstr[1] "Fechar os projetos"
#: projectmanagerviewplugin.cpp:282
-#, kde-format
-msgid "Reload"
+#, fuzzy, kde-format
+#| msgid "Reload"
+msgid "&Reload"
msgstr "Recarregar"
#: projectmanagerviewplugin.cpp:288
-#, kde-format
-msgid "Remove"
+#, fuzzy, kde-format
+#| msgid "Remove"
+msgid "Remo&ve"
msgstr "Remover"
-#: projectmanagerviewplugin.cpp:292 projectmanagerviewplugin.cpp:601
-#, kde-format
-msgid "Rename..."
+#: projectmanagerviewplugin.cpp:292
+#, fuzzy, kde-format
+#| msgid "Rename..."
+msgid "Re&name..."
msgstr "Renomear..."
#: projectmanagerviewplugin.cpp:298
-#, kde-format
-msgid "Remove From Target"
+#, fuzzy, kde-format
+#| msgid "Remove From Target"
+msgid "Remove From &Target"
msgstr "Remover do alvo"
#: projectmanagerviewplugin.cpp:493
@@ -277,6 +287,11 @@
msgid "Delete Files"
msgstr "Excluir arquivos"
+#: projectmanagerviewplugin.cpp:601
+#, kde-format
+msgid "Rename..."
+msgstr "Renomear..."
+
#: projectmanagerviewplugin.cpp:602
#, kde-format
msgid "New name for '%1':"
diff -Nru kdevplatform-5.1.0/po/ro/kdevappwizard.po kdevplatform-5.1.1/po/ro/kdevappwizard.po
--- kdevplatform-5.1.0/po/ro/kdevappwizard.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/ro/kdevappwizard.po 2017-05-13 10:12:40.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevappwizard\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-05-11 04:46+0200\n"
"PO-Revision-Date: 2012-12-21 04:25+0200\n"
"Last-Translator: Sergiu Bivol \n"
"Language-Team: Romanian \n"
@@ -53,68 +53,68 @@
"skeleton for your application from a set of templates."
msgstr ""
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, fuzzy, kde-format
#| msgid "Create New Project"
msgid "Could not create project from template\n"
msgstr "Creează proiect nou"
-#: appwizardplugin.cpp:108
+#: appwizardplugin.cpp:110
#, fuzzy, kde-format
#| msgid "Create New Project"
msgid "Failed to create project"
msgstr "Creează proiect nou"
-#: appwizardplugin.cpp:134
+#: appwizardplugin.cpp:136
#, kde-format
msgid "Please see the Version Control toolview"
msgstr ""
-#: appwizardplugin.cpp:136
+#: appwizardplugin.cpp:138
#, fuzzy, kde-format
#| msgctxt "Page for version control options"
#| msgid "Version Control"
msgid "Version Control System Error"
msgstr "Control versiune"
-#: appwizardplugin.cpp:152
+#: appwizardplugin.cpp:154
#, kde-format
msgid "Could not initialize DVCS repository"
msgstr ""
-#: appwizardplugin.cpp:160
+#: appwizardplugin.cpp:162
#, kde-format
msgid "Could not add files to the DVCS repository"
msgstr ""
-#: appwizardplugin.cpp:167
+#: appwizardplugin.cpp:169
#, fuzzy, kde-format
#| msgid "Create New Project"
msgid "Could not import project into %1."
msgstr "Creează proiect nou"
-#: appwizardplugin.cpp:184
+#: appwizardplugin.cpp:186
#, kde-format
msgid "Could not import project"
msgstr ""
-#: appwizardplugin.cpp:192
+#: appwizardplugin.cpp:194
#, kde-format
msgid "Could not checkout imported project"
msgstr ""
-#: appwizardplugin.cpp:278
+#: appwizardplugin.cpp:314
#, fuzzy, kde-format
#| msgid "Create New Project"
msgid "Could not create new project"
msgstr "Creează proiect nou"
-#: appwizardplugin.cpp:402
+#: appwizardplugin.cpp:451
#, kde-format
msgid "The file %1 cannot be created."
msgstr ""
-#: appwizardplugin.cpp:501
+#: appwizardplugin.cpp:550
#, kde-format
msgid "Project Templates"
msgstr "Șabloane de proiecte"
@@ -126,62 +126,62 @@
msgid "Project"
msgstr "Proiect"
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, kde-format
msgid "Category"
msgstr ""
-#: projectselectionpage.cpp:59
+#: projectselectionpage.cpp:60
#, fuzzy, kde-format
#| msgid "Project Templates"
msgid "Project Type"
msgstr "Șabloane de proiecte"
-#: projectselectionpage.cpp:70
+#: projectselectionpage.cpp:71
#, fuzzy, kde-format
#| msgid "Project Templates"
msgid "Get More Templates"
msgstr "Șabloane de proiecte"
-#: projectselectionpage.cpp:77 projectselectionpage.cpp:310
+#: projectselectionpage.cpp:78 projectselectionpage.cpp:310
#, kde-format
msgid "Load Template From File"
msgstr ""
-#: projectselectionpage.cpp:178
+#: projectselectionpage.cpp:174
#, fuzzy, kde-format
#| msgid "Invalid Location"
msgid "Invalid location"
msgstr "Locație nevalidă"
-#: projectselectionpage.cpp:186
+#: projectselectionpage.cpp:182
#, kde-format
msgid "Empty project name"
msgstr "Denumire de proiect goală"
-#: projectselectionpage.cpp:208
+#: projectselectionpage.cpp:204
#, kde-format
msgid "Invalid project name"
msgstr "Denumire de proiect nevalidă"
-#: projectselectionpage.cpp:226
+#: projectselectionpage.cpp:222
#, kde-format
msgid "Unable to create subdirectories, missing permissions on: %1"
msgstr ""
-#: projectselectionpage.cpp:241
+#: projectselectionpage.cpp:237
#, fuzzy, kde-format
#| msgid "Invalid project name"
msgid "Invalid project template, please choose a leaf item"
msgstr "Denumire de proiect nevalidă"
-#: projectselectionpage.cpp:254
+#: projectselectionpage.cpp:250
#, fuzzy, kde-format
#| msgid "Directory already exists and is not empty!"
msgid "Path already exists and contains files. Open it as a project."
msgstr "Directorul există deja și nu este gol!"
-#: projectselectionpage.cpp:299
+#: projectselectionpage.cpp:295
#, kde-format
msgid ""
"The specified path already exists and contains files. Are you sure you want "
@@ -206,7 +206,7 @@
msgid "Location:"
msgstr "Amplasare:"
-#: projectvcspage.cpp:44
+#: projectvcspage.cpp:46
#, kde-format
msgctxt "No Version Control Support chosen"
msgid "None"
diff -Nru kdevplatform-5.1.0/po/ro/kdevgrepview.po kdevplatform-5.1.1/po/ro/kdevgrepview.po
--- kdevplatform-5.1.0/po/ro/kdevgrepview.po 2017-03-13 19:05:19.000000000 +0000
+++ kdevplatform-5.1.1/po/ro/kdevgrepview.po 2017-05-13 10:12:40.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdevgrepview\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-03-04 07:12+0100\n"
+"POT-Creation-Date: 2017-03-23 04:49+0100\n"
"PO-Revision-Date: 2008-12-22 17:35+0200\n"
"Last-Translator: Sergiu Bivol \n"
"Language-Team: Romanian \n"
@@ -107,12 +107,12 @@
msgid "Grep: %1"
msgstr "Grep: %1"
-#: grepoutputdelegate.cpp:94 grepoutputdelegate.cpp:162
+#: grepoutputdelegate.cpp:87 grepoutputdelegate.cpp:155
#, kde-format
msgid "Line %1: "
msgstr ""
-#: grepoutputmodel.cpp:389
+#: grepoutputmodel.cpp:390
#, kde-format
msgid "1 match"
msgid_plural "%1 matches"
@@ -120,7 +120,7 @@
msgstr[1] ""
msgstr[2] ""
-#: grepoutputmodel.cpp:390
+#: grepoutputmodel.cpp:391
#, kde-format
msgid "1 file"
msgid_plural "%1 files"
@@ -128,13 +128,13 @@
msgstr[1] ""
msgstr[2] ""
-#: grepoutputmodel.cpp:392
+#: grepoutputmodel.cpp:393
#, kde-format
msgctxt "%1 is e.g. '4 matches', %2 is e.g. '1 file'"
msgid "