From 3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:07:55 -0600 Subject: Sync again --- doc/html/canvas-chart-example.html | 2 +- doc/html/chart-chart-pro.html | 2 +- doc/html/emb-fonts.html | 2 +- doc/html/extension-dialog-example.html | 2 +- doc/html/linguist-manual-3.html | 2 +- doc/html/linguist-manual-4.html | 2 +- doc/html/motif-walkthrough-5.html | 2 +- doc/html/qmake-manual-8.html | 6 +++--- doc/html/qmessagebox-h.html | 4 ++-- doc/html/tutorial2-10.html | 2 +- doc/qws.doc | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'doc') diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html index 19df8421..bcf4ae44 100644 --- a/doc/html/canvas-chart-example.html +++ b/doc/html/canvas-chart-example.html @@ -44,7 +44,7 @@ demonstrates basic canvas usage. CONFIG += warn_on -RETQUIRES = full-config +REQUIRES = full-config HEADERS += element.h \ canvastext.h \ diff --git a/doc/html/chart-chart-pro.html b/doc/html/chart-chart-pro.html index 4f439ced..6b474179 100644 --- a/doc/html/chart-chart-pro.html +++ b/doc/html/chart-chart-pro.html @@ -36,7 +36,7 @@ body { background: #ffffff; color: black; } CONFIG += warn_on -RETQUIRES = full-config +REQUIRES = full-config HEADERS += element.h \ canvastext.h \ diff --git a/doc/html/emb-fonts.html b/doc/html/emb-fonts.html index da311789..09dc1a4b 100644 --- a/doc/html/emb-fonts.html +++ b/doc/html/emb-fonts.html @@ -64,7 +64,7 @@ fonts and sizes you need, then remove TTF and BDF support.

See tools/makeqpf for a tool that helps produce TQPF files from the TTF and BDF, or just run your application with the -savefonts option. -

Memory Retquirements +

Memory Requirements

With TTF fonts, each character in the font at a given point size is only rendered when first used in a drawing or metrics operation. With diff --git a/doc/html/extension-dialog-example.html b/doc/html/extension-dialog-example.html index 5951601c..281905ab 100644 --- a/doc/html/extension-dialog-example.html +++ b/doc/html/extension-dialog-example.html @@ -46,7 +46,7 @@ LANGUAGE = C++ CONFIG += qt warn_on release -RETQUIRES = full-config nocrosscompiler +REQUIRES = full-config nocrosscompiler SOURCES += main.cpp FORMS = mainform.ui \ diff --git a/doc/html/linguist-manual-3.html b/doc/html/linguist-manual-3.html index 73cee991..0837075a 100644 --- a/doc/html/linguist-manual-3.html +++ b/doc/html/linguist-manual-3.html @@ -57,7 +57,7 @@ body { background: #ffffff; color: black; }

Common Tasks

Leaving a Translation for Later

If you wish to leave a translation press Ctrl+L (Next Unfinished) to move to the next unfinished translation. An unfinished translation is one that either has not been translated at all or one which fails validation. To move to the next phrase press Shift+Ctrl+L. You can also navigate using the Translation menu. If you want to go to a different context entirely, click the context you want to work on in the Context list, then click the source text in the Source Text area.

-

Phrases That Retquire Multiple Translations Depending on Context

+

Phrases That Require Multiple Translations Depending on Context

The same phrase may occur in two or more contexts without conflict. Once a phrase has been translated in one context, TQt Linguist notes that the translation has been made and when the translator reaches a later occurrence of the same phrase TQt Linguist will provide the previous translation as a possible translation candidate in the phrases and guesses area. If the previous translation is acceptable just click the Done & Next button (press Ctrl+Enter) to move on to the next unfinished phrase.

If a phrase occurs more than once in a particular context it will only be shown once in TQt Linguist's context list and the translation will be applied to every occurrence within the context. If the same phrase needs to be translated differently within the same context the programmer must provide a distinguishing comment for each of the phrases concerned. If such comments are used the duplicate phrases will appear in the context list. The programmers comments will appear in the translation area on a light blue background.

Changing Keyboard Accelerators

diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html index bffd3062..5be94e04 100644 --- a/doc/html/linguist-manual-4.html +++ b/doc/html/linguist-manual-4.html @@ -92,7 +92,7 @@ body { background: #ffffff; color: black; } 
     TQObject::tr("&Quit")
-

Distinguishing Identical Strings That Retquire Different Translations

+

Distinguishing Identical Strings That Require Different Translations

The lupdate program automatically provides a context for every source text. This context is the class name of the class that contains the tr() call. This is sufficient in the vast majority of cases. Sometimes however, the translator will need further information to uniquely identify a source text; for example, a dialog that contained two separate frames, each of which contained an "Enabled" option would need each identified because in some languages the translation would differ between the two. This is easily achieved using the two argument form of the tr() call, e.g.

     rbc = new TQRadioButton( tr("Enabled", "Color frame"), this );
diff --git a/doc/html/motif-walkthrough-5.html b/doc/html/motif-walkthrough-5.html
index 8d0be21c..d93d3258 100644
--- a/doc/html/motif-walkthrough-5.html
+++ b/doc/html/motif-walkthrough-5.html
@@ -43,7 +43,7 @@ removed once we have finished our migration, since we will use
 worth replacing the Print dialog with a custom TQDialog replacement.
 Instead, we will keep the Motif based dialog and use TQMotifDialog to
 integrate the dialog with the application.
-
 
 Modality Retquirements
+
 
 Modality Requirements
 

 
 Modality with TQDialog is different from Motif.  The TQDialog::exec()
 function does not return until the dialog is finished.  In Motif,
diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index 5eded6cb..b239495c 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -212,8 +212,8 @@ win32:UI_HEADERS_DIR = c:\myproject\ui\include
 unix:UI_SOURCES_DIR = ../myproject/ui/src
 win32:UI_SOURCES_DIR = c:\myproject\ui\src
-
RETQUIRES
-

This is a special variable processed by qmake. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to RETQUIRES) are missing.

+
REQUIRES
+

This is a special variable processed by qmake. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to REQUIRES) are missing.

This is mainly used in TQt's build system for building the examples.

SOURCES

This variable contains the name of all source files in the project.

@@ -369,7 +369,7 @@ app {

This variable contains C++ compiler flags for generating compiler warnings. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

QMAKE_EXTENSION_SHLIB

This variable contains the extention for shared libraries. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

-
QMAKE_FAILED_RETQUIREMENTS
+
QMAKE_FAILED_REQUIREMENTS

This variable contains the list of requirements that were failed to be met when qmake was used. For example, the sql module is needed and wasn't compiled into TQt. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

QMAKE_FILETAGS

This variable contains the file tags needed to be entered into the makefile, such as SOURCES and HEADERS. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html index 1b971095..31197dbc 100644 --- a/doc/html/qmessagebox-h.html +++ b/doc/html/qmessagebox-h.html @@ -240,11 +240,11 @@ private: // Disabled copy constructor and operator= * #include <qmessagebox.h> * int main( int argc, char**argv ) * { -* QT_RETQUIRE_VERSION( argc, argv, "3.0.5" ) +* QT_REQUIRE_VERSION( argc, argv, "3.0.5" ) * ... * } */ -#define QT_RETQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ +#define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \ diff --git a/doc/html/tutorial2-10.html b/doc/html/tutorial2-10.html index d234b19d..badf321c 100644 --- a/doc/html/tutorial2-10.html +++ b/doc/html/tutorial2-10.html @@ -40,7 +40,7 @@ body { background: #ffffff; color: black; } CONFIG += warn_on - RETQUIRES = full-config + REQUIRES = full-config HEADERS += element.h \ canvastext.h \ diff --git a/doc/qws.doc b/doc/qws.doc index 419411dc..746baa96 100644 --- a/doc/qws.doc +++ b/doc/qws.doc @@ -226,7 +226,7 @@ See \link makeqpf.html tools/makeqpf\endlink for a tool that helps produce QPF files from the TTF and BDF, or just run your application with the \c -savefonts option. -\section1 Memory Retquirements +\section1 Memory Requirements With TTF fonts, each character in the font at a given point size is only rendered when first used in a drawing or metrics operation. With -- cgit v1.2.3