summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-05-07 21:58:34 -0500
committerTimothy Pearson <[email protected]>2013-05-07 21:58:34 -0500
commitc740211ffba3330d951f4c3ddefea8edf23a01cd (patch)
tree0a8b7641d3c5b576d18a2f7912c75fc600f494e2 /tools
parent8a4eacb6185de3653f6ae401c352aef833a9e72a (diff)
downloadtqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.tar.gz
tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.zip
Automated update from Qt3
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/assistant_de.ts2
-rw-r--r--tools/assistant/assistant_fr.ts2
-rw-r--r--tools/designer/designer/designer_de.ts2
-rw-r--r--tools/designer/designer/designer_fr.ts2
-rw-r--r--tools/designer/designer/designerappiface.cpp2
-rw-r--r--tools/designer/designer/mainwindowactions.cpp2
-rw-r--r--tools/designer/plugins/cppeditor/yyreg.cpp2
-rw-r--r--tools/linguist/book/linguist-programmer.leaf2
-rw-r--r--tools/linguist/shared/metatranslator.h2
-rw-r--r--tools/qtconfig/mainwindow.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/tools/assistant/assistant_de.ts b/tools/assistant/assistant_de.ts
index 5d2f00a37..15b0b971a 100644
--- a/tools/assistant/assistant_de.ts
+++ b/tools/assistant/assistant_de.ts
@@ -2,7 +2,7 @@
<context>
<name>Assistant</name>
<message>
- <source>Welcome to the &lt;b&gt;Qt Assistant&lt;/b&gt;. Qt Assistant will give you tquicker access to help and tips while using applications like Qt Designer.</source>
+ <source>Welcome to the &lt;b&gt;Qt Assistant&lt;/b&gt;. Qt Assistant will give you quicker access to help and tips while using applications like Qt Designer.</source>
<translation type="obsolete">Wilkommen bei &lt;b&gt;Qt Assistant&lt;/b&gt;. Qt Assistant ermöglicht einen schnellen Zugriff der Onlinehilfe während dem Arbeiten mit Programmen wie dem Qt Designer.</translation>
</message>
<message>
diff --git a/tools/assistant/assistant_fr.ts b/tools/assistant/assistant_fr.ts
index 58785a1d5..0dfa69fc0 100644
--- a/tools/assistant/assistant_fr.ts
+++ b/tools/assistant/assistant_fr.ts
@@ -2,7 +2,7 @@
<context>
<name>Assistant</name>
<message>
- <source>Welcome to the &lt;b&gt;Qt Assistant&lt;/b&gt;. Qt Assistant will give you tquicker access to help and tips while using applications like Qt Designer.</source>
+ <source>Welcome to the &lt;b&gt;Qt Assistant&lt;/b&gt;. Qt Assistant will give you quicker access to help and tips while using applications like Qt Designer.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index 5ed9aaaca..64f3cf3f5 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -2237,7 +2237,7 @@ but they are not known to the designer:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a tquick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
+ <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a quick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index 5ed9aaaca..64f3cf3f5 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -2237,7 +2237,7 @@ but they are not known to the designer:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a tquick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
+ <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a quick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index 98aa69e52..bbcba7784 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -317,7 +317,7 @@ TQString DesignerProjectImpl::customSetting( const TQString &key ) const
{
if ( key == "TQTSCRIPT_PACKAGES" ) {
TQString s = getenv( "TQTSCRIPT_PACKAGES" );
- TQString s2 = project->customSetting( "TQUICK_PACKAGES" );
+ TQString s2 = project->customSetting( "QUICK_PACKAGES" );
if ( !s.isEmpty() && !s2.isEmpty() )
#if defined(Q_OS_WIN32)
s += ";";
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 07d9c3c2f..9fb744b93 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -108,7 +108,7 @@ static const char * whatsthis_image[] = {
" ooo "};
const TQString toolbarHelp = "<p>Toolbars contain a number of buttons to "
-"provide tquick access to often used functions.%1"
+"provide quick access to often used functions.%1"
"<br>Click on the toolbar handle to hide the toolbar, "
"or drag and place the toolbar to a different location.</p>";
diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp
index bec1bd9fb..7cc81ff2f 100644
--- a/tools/designer/plugins/cppeditor/yyreg.cpp
+++ b/tools/designer/plugins/cppeditor/yyreg.cpp
@@ -129,7 +129,7 @@ static void stopTokenizer()
}
/*
- These two macros implement tquick-and-dirty hashing for telling
+ These two macros implement quick-and-dirty hashing for telling
apart keywords fast.
*/
#define HASH( ch, len ) ( (ch) | ((len) << 8) )
diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf
index 7074d59ff..570380bc7 100644
--- a/tools/linguist/book/linguist-programmer.leaf
+++ b/tools/linguist/book/linguist-programmer.leaf
@@ -709,7 +709,7 @@ Now, enter the following translations:
\endlist
\endlist
-It's tquickest to press \Key Alt+D (which clicks the \e {Done \& Next}
+It's quickest to press \Key Alt+D (which clicks the \e {Done \& Next}
button) after typing each translation, since this marks the
translation as done and moves on to the next source text.
diff --git a/tools/linguist/shared/metatranslator.h b/tools/linguist/shared/metatranslator.h
index 7e0419d21..4462a77f5 100644
--- a/tools/linguist/shared/metatranslator.h
+++ b/tools/linguist/shared/metatranslator.h
@@ -112,7 +112,7 @@ private:
};
/*
- This is a tquick hack. The proper way to handle this would be
+ This is a quick hack. The proper way to handle this would be
to extend MetaTranslator's interface.
*/
#define ContextComment "QT_LINGUIST_INTERNAL_CONTEXT_COMMENT"
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 79506cef2..07c2f92ad 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -387,7 +387,7 @@ MainWindow::MainWindow()
This code makes it possible to set up default input method.
The list of identifier names of input method which can be used
- is actquired using TQInputContextFactory::keys(). And it is
+ is acquired using TQInputContextFactory::keys(). And it is
translated to display name and set to inputMethodCombo which
displays the list of input method.
*/