OSDN Git Service
(root)
/
qt-creator-jp
/
qt-creator-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2cf9910
)
Translator corrections
author
Jarek Kobus
<jkobus@trolltech.com>
Wed, 29 Sep 2010 10:48:00 +0000
(12:48 +0200)
committer
Jarek Kobus
<jkobus@trolltech.com>
Wed, 29 Sep 2010 10:48:50 +0000
(12:48 +0200)
src/libs/utils/synchronousprocess.cpp
patch
|
blob
|
history
src/plugins/debugger/cdb/cdbengine.cpp
patch
|
blob
|
history
src/plugins/debugger/debuggeractions.cpp
patch
|
blob
|
history
src/plugins/debugger/debuggerrunner.cpp
patch
|
blob
|
history
src/plugins/help/generalsettingspage.ui
patch
|
blob
|
history
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
patch
|
blob
|
history
src/plugins/qt4projectmanager/librarydetailswidget.ui
patch
|
blob
|
history
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui
patch
|
blob
|
history
diff --git
a/src/libs/utils/synchronousprocess.cpp
b/src/libs/utils/synchronousprocess.cpp
index
7a8d5a0
..
c35b148
100644
(file)
--- a/
src/libs/utils/synchronousprocess.cpp
+++ b/
src/libs/utils/synchronousprocess.cpp
@@
-365,7
+365,7
@@
static inline bool askToKill(const QString &binary = QString())
SynchronousProcess::tr("The process is not responding.") :
SynchronousProcess::tr("The process '%1' is not responding.").arg(binary);
msg += QLatin1Char(' ');
SynchronousProcess::tr("The process is not responding.") :
SynchronousProcess::tr("The process '%1' is not responding.").arg(binary);
msg += QLatin1Char(' ');
- msg += SynchronousProcess::tr("
Would you like to terminate it?");
+ msg += SynchronousProcess::tr("Would you like to terminate it?");
// Restore the cursor that is set to wait while running.
const bool hasOverrideCursor = QApplication::overrideCursor() != 0;
if (hasOverrideCursor)
// Restore the cursor that is set to wait while running.
const bool hasOverrideCursor = QApplication::overrideCursor() != 0;
if (hasOverrideCursor)
diff --git
a/src/plugins/debugger/cdb/cdbengine.cpp
b/src/plugins/debugger/cdb/cdbengine.cpp
index
363daa6
..
1fc7817
100644
(file)
--- a/
src/plugins/debugger/cdb/cdbengine.cpp
+++ b/
src/plugins/debugger/cdb/cdbengine.cpp
@@
-481,7
+481,7
@@
void CdbEngine::runEngine()
}
break;
case AttachCore:
}
break;
case AttachCore:
- errorMessage = tr("Attaching to core files is not supported
!
");
+ errorMessage = tr("Attaching to core files is not supported
.
");
break;
}
if (rc) {
break;
}
if (rc) {
diff --git
a/src/plugins/debugger/debuggeractions.cpp
b/src/plugins/debugger/debuggeractions.cpp
index
2c6dfe5
..
0a5ded2
100644
(file)
--- a/
src/plugins/debugger/debuggeractions.cpp
+++ b/
src/plugins/debugger/debuggeractions.cpp
@@
-240,7
+240,7
@@
DebuggerSettings *DebuggerSettings::instance()
item->setCheckable(true);
item->setDefaultValue(true);
item->setSettingsKey(debugModeGroup, QLatin1String("AutoDerefPointers"));
item->setCheckable(true);
item->setDefaultValue(true);
item->setSettingsKey(debugModeGroup, QLatin1String("AutoDerefPointers"));
- item->setToolTip(tr("This switches the Locals&Watchers view to "
+ item->setToolTip(tr("This switches the Locals&
&
Watchers view to "
"automatically dereference pointers. This saves a level in the "
"tree view, but also loses data for the now-missing intermediate "
"level."));
"automatically dereference pointers. This saves a level in the "
"tree view, but also loses data for the now-missing intermediate "
"level."));
diff --git
a/src/plugins/debugger/debuggerrunner.cpp
b/src/plugins/debugger/debuggerrunner.cpp
index
7eea602
..
8c01662
100644
(file)
--- a/
src/plugins/debugger/debuggerrunner.cpp
+++ b/
src/plugins/debugger/debuggerrunner.cpp
@@
-613,7
+613,7
@@
bool DebuggerRunControl::aboutToStop() const
{
QTC_ASSERT(isRunning(), return true;)
{
QTC_ASSERT(isRunning(), return true;)
- const QString question = tr("A debugging session
are
still in progress. "
+ const QString question = tr("A debugging session
is
still in progress. "
"Terminating the session in the current"
" state can leave the target in an inconsistent state."
" Would you still like to terminate it?");
"Terminating the session in the current"
" state can leave the target in an inconsistent state."
" Would you still like to terminate it?");
diff --git
a/src/plugins/help/generalsettingspage.ui
b/src/plugins/help/generalsettingspage.ui
index
0bcd55e
..
2a49b65
100644
(file)
--- a/
src/plugins/help/generalsettingspage.ui
+++ b/
src/plugins/help/generalsettingspage.ui
@@
-368,7
+368,7
@@
<string>Switch to editor context after last help page is closed.</string>
</property>
<property name="text">
<string>Switch to editor context after last help page is closed.</string>
</property>
<property name="text">
- <string>Return to editor on closing the
last page</string>
+ <string>Return to editor on closing the last page</string>
</property>
</widget>
</item>
</property>
</widget>
</item>
diff --git
a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index
226479a
..
f133869
100644
(file)
--- a/
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@
-457,14
+457,14
@@
border-bottom: 1px solid "#C9C9C9";
</size>
</property>
<property name="text">
</size>
</property>
<property name="text">
- <string>Image</string>
+ <string
notr="true"
>Image</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="featuredTextLabel">
<property name="text">
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="featuredTextLabel">
<property name="text">
- <string>Text</string>
+ <string
notr="true"
>Text</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
@@
-489,7
+489,7
@@
border-bottom: 1px solid "#C9C9C9";
<item>
<widget class="QLabel" name="detailsLabel">
<property name="text">
<item>
<widget class="QLabel" name="detailsLabel">
<property name="text">
- <string>Link</string>
+ <string
notr="true"
>Link</string>
</property>
</widget>
</item>
</property>
</widget>
</item>
diff --git
a/src/plugins/qt4projectmanager/librarydetailswidget.ui
b/src/plugins/qt4projectmanager/librarydetailswidget.ui
index
cf8da06
..
af3be9b
100644
(file)
--- a/
src/plugins/qt4projectmanager/librarydetailswidget.ui
+++ b/
src/plugins/qt4projectmanager/librarydetailswidget.ui
@@
-10,9
+10,6
@@
<height>306</height>
</rect>
</property>
<height>306</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout">
diff --git
a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui
b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui
index
55aafb1
..
a0278c3
100644
(file)
--- a/
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui
+++ b/
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui
@@
-11,7
+11,7
@@
</rect>
</property>
<property name="windowTitle">
</rect>
</property>
<property name="windowTitle">
- <string>Form</string>
+ <string
notr="true"
>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>