Fix original string messages

Change-Id: Icc7819585a8382a02b02a28f39dcea8ec1c6a7e6
Reviewed-on: http://codereview.qt.nokia.com/1142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
index e84cb51..0d6e672 100644 (file)
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
@@ -1,6 +1,6 @@
 include(../../../qtcreator.pri)
 
-LANGUAGES = cs de fr hu ja ru sl zh_CN
+LANGUAGES = cs de fr hu ja pl ru sl zh_CN
 
 # var, prepend, append
 defineReplace(prependAll) {

diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index 82398e3..960d05b 100644 (file)
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -78,7 +78,7 @@
         <item>
          <widget class="QPushButton" name="resetButton">
           <property name="toolTip">
-           <string>Reset to default.</string>
+           <string comment="Color">Reset to default.</string>
           </property>
           <property name="text">
            <string>Reset</string>
@@ -196,7 +196,7 @@
       <item row="0" column="2">
        <widget class="QPushButton" name="resetTerminalButton">
         <property name="toolTip">
-         <string>Reset to default.</string>
+         <string comment="Terminal">Reset to default.</string>
         </property>
         <property name="text">
          <string>Reset</string>
@@ -206,7 +206,7 @@
       <item row="1" column="2">
        <widget class="QPushButton" name="resetFileBrowserButton">
         <property name="toolTip">
-         <string>Reset to default.</string>
+         <string comment="File Browser">Reset to default.</string>
         </property>
         <property name="text">
          <string>Reset</string>

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 61a8e3b..904ced3 100644 (file)
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1509,7 +1509,7 @@ QString DebuggerEngine::msgWatchpointByExpressionTriggered(BreakpointModelId id,
     return id
         ? tr("Data breakpoint %1 (%2) at %3 in thread %4 triggered.")
             .arg(id.toString()).arg(number).arg(expr).arg(threadId)
-        : tr("Internal data breakpoint %1 at %2 in thread %4 triggered.")
+        : tr("Internal data breakpoint %1 at %2 in thread %3 triggered.")
             .arg(number).arg(expr).arg(threadId);
 }
 

diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index 9445a0d..6fb810f 100644 (file)
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -154,7 +154,7 @@ on slow machines. In this case, the value should be increased.</string>
          <string>This is the slowest but safest option.</string>
         </property>
         <property name="text">
-         <string>Try to set breakpoints in plugins always automatically</string>
+         <string>Always try to set breakpoints in plugins automatically</string>
         </property>
        </widget>
       </item>

diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index d547b6a..92e0722 100644 (file)
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -173,7 +173,7 @@ void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
     else if (act == actAdjust)
         resizeColumnsToContents();
     else if (act == actShowMemory) {
-        const QString title = tr("Memory at Frame #%1 (%2) 0x%3)").
+        const QString title = tr("Memory at Frame #%1 (%2) 0x%3").
         arg(row).arg(frame.function).arg(address, 0, 16);
         QList<MemoryMarkup> ml;
         ml.push_back(MemoryMarkup(address, 1, QColor(Qt::blue).lighter(),

diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 10ed4fe..9bad66f 100644 (file)
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -462,7 +462,7 @@ static inline void addStackLayoutMemoryView(DebuggerEngine *engine,
                              regMap, true, background);
     const unsigned flags = separateView ? (DebuggerEngine::MemoryView|DebuggerEngine::MemoryReadOnly) : 0;
     const QString title =
-        WatchWindow::tr("Memory Layout of Local Variables at 0x%2").arg(start, 0, 16);
+        WatchWindow::tr("Memory Layout of Local Variables at 0x%1").arg(start, 0, 16);
     engine->openMemoryView(start, flags, markup, p, title, parent);
 }
 

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index daccbb7..3af5c4f 100644 (file)
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -203,7 +203,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
        QMessageBox::warning(0, tr("Cannot Find QML Puppet Executable"),
                             tr("The executable of the QML Puppet process (%1) cannot be found. "
                                "Please check your installation. "
-                               "QML Puppet is a process which runs in the background to render the the items.").
+                               "QML Puppet is a process which runs in the background to render the items.").
                             arg(applicationPath));
    }
 }

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
index c1e748f..25e9409 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
@@ -633,13 +633,13 @@ void S60DeployConfigurationWidget::getInstalledPackagesResult(const Coda::CodaCo
                 break;
                 case QTMOBILITY_UID: {
                     if (error)
-                        addErrorToTable(str, tr("QtMobility version: "), tr("Error reading QtMobility version"));
+                        addErrorToTable(str, tr("Qt Mobility version: "), tr("Error reading Qt Mobility version"));
                     else
-                        addToTable(str, tr("QtMobility version: "), versionString);
+                        addToTable(str, tr("Qt Mobility version: "), versionString);
                 }
                 break;
                 case QTCOMPONENTS_UID: {
-                    addToTable(str, tr("QtQuick components version: "), error ? tr("Not installed") : versionString);
+                    addToTable(str, tr("Qt Quick components version: "), error ? tr("Not installed") : versionString);
                 }
                 break;
                 default: break;

diff --git a/src/plugins/remotelinux/maemopackagecreationstep.cpp b/src/plugins/remotelinux/maemopackagecreationstep.cpp
index f48b456..af25188 100644 (file)
--- a/src/plugins/remotelinux/maemopackagecreationstep.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationstep.cpp
@@ -640,7 +640,7 @@ MaemoTarPackageCreationStep::MaemoTarPackageCreationStep(BuildStepList *buildCon
 
 void MaemoTarPackageCreationStep::ctor()
 {
-    setDefaultDisplayName(tr("Create tar ball"));
+    setDefaultDisplayName(tr("Create tarball"));
 }
 
 bool MaemoTarPackageCreationStep::createPackage(QProcess *buildProc,