general wording change for some file type names

- .ts file -> TS file
- .qm file -> QM file
- .ui file -> UI file

+ a handfull of typos I stumbled over

Merge-request: 802
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

18 files changed, 62 insertions, 62 deletions

diff --git a/tools/designer/data/generate_shared.xsl b/tools/designer/data/generate_shared.xsl
index f7859cd..ec95fe2 100644
--- a/tools/designer/data/generate_shared.xsl
+++ b/tools/designer/data/generate_shared.xsl
@@ -6,8 +6,8 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 <!-- Hack to make names camel case
-     All names in ui files are lowercase, while the element names are
-     capital case. To make the ui files conforming to the xsd file + keep
+     All names in UI files are lowercase, while the element names are
+     capital case. To make the UI files conforming to the XSD file + keep
      the DOM interface we rename them here -->
     <xsl:template name="camel-case">
         <xsl:param name="text"/>
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index de4b57b..ac03909 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -631,13 +631,13 @@ static bool readUiAttributes(QIODevice *dev, QString *errorMessage,
                     *language = attributes.value(languageAttribute).toString();
                 return true;
             } else {
-                *errorMessage = QCoreApplication::translate("Designer", "Invalid ui file: The root element <ui> is missing.");
+                *errorMessage = QCoreApplication::translate("Designer", "Invalid UI file: The root element <ui> is missing.");
                 return false;
 
             }
         }
     }
-    *errorMessage = QCoreApplication::translate("Designer", "An error has occurred while reading the ui file at line %1, column %2: %3")
+    *errorMessage = QCoreApplication::translate("Designer", "An error has occurred while reading the UI file at line %1, column %2: %3")
                     .arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString());
     return false;
 }
@@ -756,7 +756,7 @@ void QDesignerResource::setSaveRelative(bool relative)
 QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
 {
     // Load extra info extension. This is used by Jambi for preventing
-    // C++ ui files from being loaded
+    // C++ UI files from being loaded
     if (QDesignerExtraInfoExtension *extra = qt_extension<QDesignerExtraInfoExtension*>(core()->extensionManager(), core())) {
         if (!extra->loadUiExtraInfo(ui)) {
             const QString errorMessage = QApplication::translate("Designer", "This file cannot be read because the extra info extension failed to load.");
diff --git a/tools/designer/src/designer/mainwindow.cpp b/tools/designer/src/designer/mainwindow.cpp
index b72a790..a3ca234 100644
--- a/tools/designer/src/designer/mainwindow.cpp
+++ b/tools/designer/src/designer/mainwindow.cpp
@@ -155,7 +155,7 @@ DockedMdiArea::DockedMdiArea(const QString &extension, QWidget *parent) :
 
 QStringList DockedMdiArea::uiFiles(const QMimeData *d) const
 {
-    // Extract dropped ui files from Mime data.
+    // Extract dropped UI files from Mime data.
     QStringList rc;
     if (!d->hasFormat(QLatin1String(uriListMimeFormatC)))
         return rc;
diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp
index 923687a2..f21da8c 100644
--- a/tools/designer/src/designer/qdesigner_workbench.cpp
+++ b/tools/designer/src/designer/qdesigner_workbench.cpp
@@ -960,7 +960,7 @@ QDesignerFormWindow * QDesignerWorkbench::loadForm(const QString &fileName,
         removeFormWindow(formWindow);
         formWindowManager->removeFormWindow(editor);
         m_core->metaDataBase()->remove(editor);
-        *errorMessage = tr("The file <b>%1</b> is not a valid Designer ui file.").arg(file.fileName());
+        *errorMessage = tr("The file <b>%1</b> is not a valid Designer UI file.").arg(file.fileName());
         return 0;
     }
     *uic3Converted = editor->fileName().isEmpty();
diff --git a/tools/designer/src/lib/sdk/abstractformwindow.cpp b/tools/designer/src/lib/sdk/abstractformwindow.cpp
index 89c1015..313b324 100644
--- a/tools/designer/src/lib/sdk/abstractformwindow.cpp
+++ b/tools/designer/src/lib/sdk/abstractformwindow.cpp
@@ -247,7 +247,7 @@ QDesignerFormWindowInterface *QDesignerFormWindowInterface::findFormWindow(QObje
 /*!
     \fn virtual QString QDesignerFormWindowInterface::fileName() const
 
-    Returns the file name of the .ui file that describes the form
+    Returns the file name of the UI file that describes the form
     currently being shown.
 
     \sa setFileName()
@@ -399,11 +399,11 @@ QDesignerFormWindowInterface *QDesignerFormWindowInterface::findFormWindow(QObje
     \fn virtual QStringList QDesignerFormWindowInterface::includeHints() const
 
     Returns a list of the header files that will be included in the
-    form window's associated \c .ui file.
+    form window's associated UI file.
 
     Header files may be local, i.e. relative to the project's
-    directory,\c "mywidget.h", or global, i.e. part of Qt or the
-    compilers standard libraries:\c <QtGui/QWidget>.
+    directory, \c "mywidget.h", or global, i.e. part of Qt or the
+    compilers standard libraries: \c <QtGui/QWidget>.
 
     \sa setIncludeHints()
 */
@@ -412,11 +412,11 @@ QDesignerFormWindowInterface *QDesignerFormWindowInterface::findFormWindow(QObje
     \fn virtual void QDesignerFormWindowInterface::setIncludeHints(const QStringList &includeHints)
 
     Sets the header files that will be included in the form window's
-    associated \c .ui file to the specified \a includeHints.
+    associated UI file to the specified \a includeHints.
 
     Header files may be local, i.e. relative to the project's
-    directory,\c "mywidget.h", or global, i.e. part of Qt or the
-    compilers standard libraries:\c <QtGui/QWidget>.
+    directory, \c "mywidget.h", or global, i.e. part of Qt or the
+    compilers standard libraries: \c <QtGui/QWidget>.
 
     \sa includeHints()
 */
diff --git a/tools/designer/src/lib/sdk/script.cpp b/tools/designer/src/lib/sdk/script.cpp
index 90b4c73..2eda3d1 100644
--- a/tools/designer/src/lib/sdk/script.cpp
+++ b/tools/designer/src/lib/sdk/script.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \since 4.3
 
     On saving the form, the extension is queried for a script snippet
-    to be associated with the widget while saving the \c .ui file.
+    to be associated with the widget while saving the UI file.
     This script is then run after creating the widget by \l uic or
     QUiLoader.
 
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     for which an editor is provided by the QDesignerTaskMenuExtension.
 
     While saving the form, the state is serialized as a QVariantMap of
-    \QD-supported properties, which is stored in the \c .ui file. This is
+    \QD-supported properties, which is stored in the UI file. This is
     handled by data() and setData().
 
     For item view contents, there might be for example a key that determines
@@ -97,7 +97,7 @@ QDesignerScriptExtension::~QDesignerScriptExtension()
     \fn virtual QVariantMap QDesignerScriptExtension::data() const
 
     Returns a map of variants describing the internal state to be
-    stored in the  \c .ui file.
+    stored in the UI file.
 */
 
 /*!
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 65ea375..05e05c1 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -135,7 +135,7 @@ public:
     QAbstractFormBuilder provides a standard interface and a default
     implementation for constructing forms from user interface
     files. It is not intended to be instantiated directly. Use the
-    QFormBuilder class to create user interfaces from \c{.ui} files at
+    QFormBuilder class to create user interfaces from UI files at
     run-time. For example:
 
     \snippet doc/src/snippets/code/tools_designer_src_lib_uilib_abstractformbuilder.cpp 0
@@ -145,10 +145,10 @@ public:
     functions:
 
     \list
-    \o load() handles reading of \c{.ui} format files from arbitrary
+    \o load() handles reading of UI format files from arbitrary
        QIODevices, and construction of widgets from the XML data
        that they contain.
-    \o save() handles saving of widget details in \c{.ui} format to
+    \o save() handles saving of widget details in UI format to
        arbitrary QIODevices.
     \o workingDirectory() and setWorkingDirectory() control the
        directory in which forms are held. The form builder looks for
@@ -208,13 +208,13 @@ QWidget *QAbstractFormBuilder::load(QIODevice *dev, QWidget *parentWidget)
         }
     }
     if (reader.hasError()) {
-        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "An error has occurred while reading the ui file at line %1, column %2: %3")
+        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "An error has occurred while reading the UI file at line %1, column %2: %3")
                                 .arg(reader.lineNumber()).arg(reader.columnNumber())
                                 .arg(reader.errorString()));
         return 0;
     }
     if (!initialized) {
-        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "Invalid ui file: The root element <ui> is missing."));
+        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "Invalid UI file: The root element <ui> is missing."));
         return 0;
     }
 
@@ -657,7 +657,7 @@ void QAbstractFormBuilder::layoutInfo(DomLayout *ui_layout, QObject *parent, int
         spac = p->elementNumber();
 
 #ifdef Q_OS_MAC
-    // here we recognize ui file < 4.3 (no we don't store margin property)
+    // here we recognize UI file < 4.3 (no we don't store margin property)
     if (mar != INT_MIN) {
         const int defaultMargin = parent->inherits("QLayoutWidget") ? 0 : 9;
         if (mar == defaultMargin)
@@ -1202,7 +1202,7 @@ QActionGroup *QAbstractFormBuilder::createActionGroup(QObject *parent, const QSt
     \fn void QAbstractFormBuilder::save(QIODevice *device, QWidget *widget)
 
     Saves an XML representation of the given \a widget to the
-    specified \a device in the standard \c{.ui} file format.
+    specified \a device in the standard UI file format.
 
     \sa load()*/
 void QAbstractFormBuilder::save(QIODevice *dev, QWidget *widget)
diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp
index 043991e..f737311 100644
--- a/tools/designer/src/lib/uilib/formbuilder.cpp
+++ b/tools/designer/src/lib/uilib/formbuilder.cpp
@@ -57,12 +57,12 @@ namespace QFormInternal {
     \class QFormBuilder
 
     \brief The QFormBuilder class is used to dynamically construct
-    user interfaces from .ui files at run-time.
+    user interfaces from UI files at run-time.
 
     \inmodule QtDesigner
 
     The QFormBuilder class provides a mechanism for dynamically
-    creating user interfaces at run-time, based on \c{.ui} files
+    creating user interfaces at run-time, based on UI files
     created with \QD. For example:
 
     \snippet doc/src/snippets/code/tools_designer_src_lib_uilib_formbuilder.cpp 0
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index 5387c2d..1c7d1cc 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -574,20 +574,20 @@ void QUiLoaderPrivate::setupWidgetMap() const
 
     \brief The QUiLoader class enables standalone applications to
     dynamically create user interfaces at run-time using the
-    information stored in .ui files or specified in plugin paths.
+    information stored in UI files or specified in plugin paths.
 
     In addition, you can customize or create your own user interface by
     deriving your own loader class.
 
     If you have a custom component or an application that embeds \QD, you can
     also use the QFormBuilder class provided by the QtDesigner module to create
-    user interfaces from \c{.ui} files.
+    user interfaces from UI files.
 
     The QUiLoader class provides a collection of functions allowing you to
-    create widgets based on the information stored in \c .ui files (created
+    create widgets based on the information stored in UI files (created
     with \QD) or available in the specified plugin paths. The specified plugin
     paths can be retrieved using the pluginPaths() function. Similarly, the
-    contents of a \c{.ui} file  can be retrieved using the load() function. For
+    contents of a UI file can be retrieved using the load() function. For
     example:
 
     \snippet doc/src/snippets/quiloader/mywidget.cpp 0
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index 534bc11..4bed02f 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -81,10 +81,10 @@ static int usage(const QStringList &args)
         "    --output-format <outformat>\n"
         "           Specify output format. See -if.\n\n"
         "    --input-codec <codec>\n"
-        "           Specify encoding for .qm input files. Default is 'Latin1'.\n"
+        "           Specify encoding for QM input files. Default is 'Latin1'.\n"
         "           UTF-8 is always tried as well, corresponding to the trUtf8() function.\n\n"
         "    --drop-tags <regexp>\n"
-        "           Drop named extra tags when writing 'ts' or 'xlf' files.\n"
+        "           Drop named extra tags when writing TS or XLIFF files.\n"
         "           May be specified repeatedly.\n\n"
         "    --drop-translations\n"
         "           Drop existing translations and reset the status to 'unfinished'.\n"
@@ -101,10 +101,10 @@ static int usage(const QStringList &args)
         "    --no-finished\n"
         "           Drop finished messages.\n\n"
         "    --locations {absolute|relative|none}\n"
-        "           Override how source code references are saved in ts files.\n"
+        "           Override how source code references are saved in TS files.\n"
         "           Default is absolute.\n\n"
         "    --no-ui-lines\n"
-        "           Drop line numbers from references to .ui files.\n\n"
+        "           Drop line numbers from references to UI files.\n\n"
         "    --verbose\n"
         "           be a bit more verbose\n\n"
         "Long options can be specified with only one leading dash, too.\n\n"
diff --git a/tools/linguist/linguist/mainwindow.ui b/tools/linguist/linguist/mainwindow.ui
index 4f66f31..613241b 100644
--- a/tools/linguist/linguist/mainwindow.ui
+++ b/tools/linguist/linguist/mainwindow.ui
@@ -747,7 +747,7 @@
     <string>Release As...</string>
    </property>
    <property name="whatsThis">
-    <string>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file.</string>
+    <string>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file.</string>
    </property>
   </action>
   <action name="actionFile">
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 9e77504..8dd14b2 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -51,10 +51,10 @@ This page documents the
 tool for the Qt GUI toolkit.
 .B Lrelease
 reads a qmake/tmake project file (.pro file) and converts the
-translation files (.ts files) specified in it into Qt message files
-(.qm files) used by the application to translate.
+translation files (TS files) specified in it into Qt message files
+(QM files) used by the application to translate.
 .PP
-The .qm file format is a compact binary format that provides
+The QM file format is a compact binary format that provides
 extremely fast lookups for translations and that is used by Qt.
 .SH OPTIONS
 .TP
@@ -62,7 +62,7 @@ extremely fast lookups for translations and that is used by Qt.
 Display the usage and exit.
 .TP
 .I "-compress"
-Compress the .qm files.
+Compress the QM files.
 .TP
 .I "-nounfinished"
 Do not include unfinished translations.
@@ -72,7 +72,7 @@ If the translated text is the same as
 the source text, do not include the message.
 .TP
 .I "-silent"
-Don't explain what is being done.
+Do not explain what is being done.
 .TP
 .I "-version"
 Display the version of
@@ -105,7 +105,7 @@ generated from gnomovision_dk.ts, gnomovision_fi.ts,
 gnomovision_no.ts and gnomovision_se.ts, respectively.
 .PP
 .B Lrelease
-can also be invoked with a list of .ts files to convert:
+can also be invoked with a list of TS files to convert:
 .PP
 .in +4
 .nf
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 5fbecac..aeed1f2 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -66,21 +66,21 @@ static void printUsage()
         "    lrelease [options] project-file\n"
         "    lrelease [options] ts-files [-qm qm-file]\n\n"
         "lrelease is part of Qt's Linguist tool chain. It can be used as a\n"
-        "stand-alone tool to convert XML based translations files in the .ts\n"
-        "format into the 'compiled' .qm format used by QTranslator objects.\n\n"
+        "stand-alone tool to convert XML-based translations files in the TS\n"
+        "format into the 'compiled' QM format used by QTranslator objects.\n\n"
         "Options:\n"
         "    -help  Display this information and exit\n"
         "    -idbased\n"
         "           Use IDs instead of source strings for message keying\n"
         "    -compress\n"
-        "           Compress the .qm files\n"
+        "           Compress the QM files\n"
         "    -nounfinished\n"
         "           Do not include unfinished translations\n"
         "    -removeidentical\n"
         "           If the translated text is the same as\n"
         "           the source text, do not include the message\n"
         "    -silent\n"
-        "           Don't explain what is being done\n"
+        "           Do not explain what is being done\n"
         "    -version\n"
         "           Display the version of lrelease and exit\n"
     ));
@@ -244,7 +244,7 @@ int main(int argc, char **argv)
                 }
             } else {
                 qWarning("error: lrelease encountered project file functionality that is currently not supported.\n"
-                    "You might want to consider using .ts files as input instead of a project file.\n"
+                    "You might want to consider using TS files as input instead of a project file.\n"
                     "Try the following syntax:\n"
                     "    lrelease [options] ts-files [-qm qm-file]\n");
             }
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
index 68958b9..b37e7b3 100644
--- a/tools/linguist/lupdate/lupdate.1
+++ b/tools/linguist/lupdate/lupdate.1
@@ -52,12 +52,12 @@ tool for the Qt GUI toolkit.
 .B Lupdate
 reads a qmake/tmake project file (.pro file), finds the translatable
 strings in the specified source, header and interface files, and
-updates the translation files (.ts files) specified in it. The
+updates the translation files (TS files) specified in it. The
 translation files are given to the translator who uses
 .B Qt Linguist
 to read the files and insert the translations.
 .PP
-The .ts file format is a simple human-readable XML format that can be
+The TS file format is a simple human-readable XML format that can be
 used with version control systems if required.
 .PP
 .SH OPTIONS
@@ -74,7 +74,7 @@ Default: 'ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx'.
 Display the usage and exit.
 .TP
 .I "-locations {absolute|relative|none}"
-Specify/override how source code references are saved in ts files.
+Specify/override how source code references are saved in TS files.
 Default is absolute.
 .TP
 .I "-no-obsolete"
@@ -84,7 +84,7 @@ Drop all obsolete strings.
 Do not recursively scan the following directories.
 .TP
 .I "-no-sort"
-Do not sort contexts in .ts files.
+Do not sort contexts in TS files.
 .TP
 .I "-pluralonly"
 Only include plural form messages.
@@ -97,7 +97,7 @@ file syntax but different file suffix
 Recursively scan the following directories.
 .TP
 .I "-silent"
-Don't explain what is being done.
+Do not explain what is being done.
 .TP
 .I "-source-language <language>[_<region>]"
 Specify/override the language of the source strings. Defaults to
@@ -139,8 +139,8 @@ translations will be reused as far as possible, and translated
 strings that have vanished from the source files are marked obsolete.
 .PP
 .B lupdate
-can also be invoked with a list of C++ source files, .ui files
-and .ts files:
+can also be invoked with a list of C++ source files, UI files
+and TS files:
 .PP
 .in +4
 .nf
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 18c8932..c9250c6 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -103,7 +103,7 @@ static void printUsage()
         "    -silent\n"
         "           Do not explain what is being done.\n"
         "    -no-sort\n"
-        "           Do not sort contexts in .ts files.\n"
+        "           Do not sort contexts in TS files.\n"
         "    -no-recursive\n"
         "           Do not recursively scan the following directories.\n"
         "    -recursive\n"
@@ -112,10 +112,10 @@ static void printUsage()
         "           Additional location to look for include files.\n"
         "           May be specified multiple times.\n"
         "    -locations {absolute|relative|none}\n"
-        "           Specify/override how source code references are saved in ts files.\n"
+        "           Specify/override how source code references are saved in TS files.\n"
         "           Default is absolute.\n"
         "    -no-ui-lines\n"
-        "           Do not record line numbers in references to .ui files.\n"
+        "           Do not record line numbers in references to UI files.\n"
         "    -disable-heuristic {sametext|similartext|number}\n"
         "           Disable the named merge heuristic. Can be specified multiple times.\n"
         "    -pro <filename>\n"
diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp
index 05d8e12..9523fde 100644
--- a/tools/linguist/shared/qm.cpp
+++ b/tools/linguist/shared/qm.cpp
@@ -245,7 +245,7 @@ void Releaser::writeMessage(const ByteTranslatorMessage &msg, QDataStream &strea
     if (mode == SaveEverything)
         prefix = HashContextSourceTextComment;
 
-    // lrelease produces "wrong" .qm files for QByteArrays that are .isNull().
+    // lrelease produces "wrong" QM files for QByteArrays that are .isNull().
     switch (prefix) {
     default:
     case HashContextSourceTextComment:
diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd
index ab77f64..4d2cdeb 100644
--- a/tools/linguist/shared/ts.dtd
+++ b/tools/linguist/shared/ts.dtd
@@ -34,7 +34,7 @@
           version CDATA #IMPLIED
           sourcelanguage CDATA #IMPLIED
           language CDATA #IMPLIED>
-<!-- The encoding to use in the .qm file by default. Default is ISO-8859-1. -->
+<!-- The encoding to use in the QM file by default. Default is ISO-8859-1. -->
 <!ELEMENT defaultcodec (#PCDATA) >
 <!ELEMENT context (name?, comment?, (context|message)+) >
 <!ATTLIST context
@@ -54,7 +54,7 @@
 <!ELEMENT message (location*, source?, oldsource?, comment?, oldcomment?, extracomment?, translatorcomment?, translation?, userdata?, extra-**) >
 <!--
  ! If utf8 is true, the defaultcodec is overridden and the message is encoded
- ! in UTF-8 in the .qm file.
+ ! in UTF-8 in the QM file.
   -->
 <!ATTLIST message
           id CDATA #IMPLIED
@@ -70,7 +70,7 @@
  ! is omitted, the "current" one is used. For the 1st location in a message,
  ! "current" is the filename used for the 1st location of the previous message.
  ! For subsequent locations, it is the filename used for the previous location.
- ! A single .ts file has either all absolute or all relative locations.
+ ! A single TS file has either all absolute or all relative locations.
   -->
 <!ATTLIST location 
           filename CDATA #IMPLIED
@@ -106,7 +106,7 @@
 <!--
  ! The translation variants have a priority between 1 ("highest") and 9 ("lowest")
  ! Typically longer translations get a higher priority.
- ! If omitted, the order of appearance of the variants in the .ts files is used.
+ ! If omitted, the order of appearance of the variants in the TS files is used.
   -->
 <!ATTLIST lengthvariant
           priority (1|2|3|4|5|6|7|8|9) #IMPLIED>
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 45f6a45..36cbd89 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -55,7 +55,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( QWidget * parent,
                                               const char * name, bool modal, Qt::WindowFlags f )
     : PaletteEditorAdvancedBase( parent, name, modal, f ), selectedPalette(0)
 {
-    // work around buggy ui file
+    // work around buggy UI file
     comboEffect->setEnabled(false);
     buttonEffect->setEnabled(false);
     onToggleBuildEffects(true);