From e02e31c8b9d854cd62cbe9799228f6e08e882773 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:04:08 -0600 Subject: Sync with latest script --- tools/assistant/LICENSE.GPL | 6 +++--- tools/assistant/book/assistant.leaf | 2 +- tools/assistant/config.cpp | 2 +- tools/assistant/config.h | 2 +- tools/assistant/docuparser.cpp | 2 +- tools/assistant/docuparser.h | 2 +- tools/assistant/finddialog.ui | 2 +- tools/assistant/finddialog.ui.h | 2 +- tools/assistant/helpdialog.ui | 2 +- tools/assistant/helpdialogimpl.cpp | 2 +- tools/assistant/helpdialogimpl.h | 2 +- tools/assistant/helpwindow.cpp | 2 +- tools/assistant/helpwindow.h | 2 +- tools/assistant/index.cpp | 2 +- tools/assistant/index.h | 2 +- tools/assistant/lib/qassistantclient.cpp | 4 ++-- tools/assistant/lib/qassistantclient.h | 2 +- tools/assistant/main.cpp | 2 +- tools/assistant/mainwindow.ui | 2 +- tools/assistant/mainwindow.ui.h | 2 +- tools/assistant/profile.cpp | 2 +- tools/assistant/profile.h | 2 +- tools/assistant/settingsdialog.ui | 2 +- tools/assistant/settingsdialogimpl.cpp | 2 +- tools/assistant/settingsdialogimpl.h | 2 +- tools/assistant/tabbedbrowser.ui | 2 +- tools/assistant/topicchooser.ui | 2 +- tools/assistant/topicchooserimpl.cpp | 2 +- tools/assistant/topicchooserimpl.h | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tools/assistant') diff --git a/tools/assistant/LICENSE.GPL b/tools/assistant/LICENSE.GPL index 65cb2ad07..3221c0305 100644 --- a/tools/assistant/LICENSE.GPL +++ b/tools/assistant/LICENSE.GPL @@ -109,9 +109,9 @@ above, provided that you also meet all of these conditions: these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on - the Program is not retquired to print an announcement.) + the Program is not required to print an announcement.) -These retquirements apply to the modified work as a whole. If +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those @@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - 5. You are not retquired to accept this License, since you have not + 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by diff --git a/tools/assistant/book/assistant.leaf b/tools/assistant/book/assistant.leaf index 588f9df18..57bab4c2a 100644 --- a/tools/assistant/book/assistant.leaf +++ b/tools/assistant/book/assistant.leaf @@ -488,7 +488,7 @@ describes the contents in the About dialog that is opened for the to the location of the profile. The property name is \c abouturl \i \QA Documentation- This property describes the location of -the \QA documentation. This is retquired since \QA provides +the \QA documentation. This is required since \QA provides self help, such as the full text search help and the \QA Manual option in the \Menu Help menu. The location is a directory relative to the location of the profile. The property name is \c diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp index 1fbe8f6cb..931985bd0 100644 --- a/tools/assistant/config.cpp +++ b/tools/assistant/config.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/config.h b/tools/assistant/config.h index 242cf7148..9a38fb8a1 100644 --- a/tools/assistant/config.h +++ b/tools/assistant/config.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp index 30b6a1d8f..3d21d286d 100644 --- a/tools/assistant/docuparser.cpp +++ b/tools/assistant/docuparser.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/docuparser.h b/tools/assistant/docuparser.h index d7f58cf00..820766c31 100644 --- a/tools/assistant/docuparser.h +++ b/tools/assistant/docuparser.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/finddialog.ui b/tools/assistant/finddialog.ui index 716dec409..6e7e8253d 100644 --- a/tools/assistant/finddialog.ui +++ b/tools/assistant/finddialog.ui @@ -15,7 +15,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/finddialog.ui.h b/tools/assistant/finddialog.ui.h index eabb5cf7f..7e07a4f9c 100644 --- a/tools/assistant/finddialog.ui.h +++ b/tools/assistant/finddialog.ui.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/helpdialog.ui b/tools/assistant/helpdialog.ui index 3c97ee2e2..9f329ceba 100644 --- a/tools/assistant/helpdialog.ui +++ b/tools/assistant/helpdialog.ui @@ -15,7 +15,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index f166b86b5..81d216f8c 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h index 2fa0bcfaf..a12317b80 100644 --- a/tools/assistant/helpdialogimpl.h +++ b/tools/assistant/helpdialogimpl.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp index 9b4516fec..3230afcea 100644 --- a/tools/assistant/helpwindow.cpp +++ b/tools/assistant/helpwindow.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h index 833c3d329..d12ece1fc 100644 --- a/tools/assistant/helpwindow.h +++ b/tools/assistant/helpwindow.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp index e542b627e..4f04f595d 100644 --- a/tools/assistant/index.cpp +++ b/tools/assistant/index.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/index.h b/tools/assistant/index.h index 2a23681e5..236b03db2 100644 --- a/tools/assistant/index.h +++ b/tools/assistant/index.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp index fc772b55b..d6acac3c9 100644 --- a/tools/assistant/lib/qassistantclient.cpp +++ b/tools/assistant/lib/qassistantclient.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -70,7 +70,7 @@ static TQAssistantClientPrivate *data( const TQAssistantClient *client, bool cre it isn't already running. The TQAssistantClient instance can open (openAssistant()) or close - (closeAssistant()) TQt Assistant whenever retquired. If TQt Assistant + (closeAssistant()) TQt Assistant whenever required. If TQt Assistant is open, isOpen() returns TRUE. One TQAssistantClient instance interacts with one TQt Assistant diff --git a/tools/assistant/lib/qassistantclient.h b/tools/assistant/lib/qassistantclient.h index 2f93d48c0..891dc1bab 100644 --- a/tools/assistant/lib/qassistantclient.h +++ b/tools/assistant/lib/qassistantclient.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index 4d2c82fc9..b0c0082a7 100644 --- a/tools/assistant/main.cpp +++ b/tools/assistant/main.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui index 13568deee..a5d87237e 100644 --- a/tools/assistant/mainwindow.ui +++ b/tools/assistant/mainwindow.ui @@ -15,7 +15,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index 639c00450..9b4c7d973 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp index aa37442ac..8eb7330d3 100644 --- a/tools/assistant/profile.cpp +++ b/tools/assistant/profile.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/profile.h b/tools/assistant/profile.h index fe4d00092..dbc140369 100644 --- a/tools/assistant/profile.h +++ b/tools/assistant/profile.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/settingsdialog.ui b/tools/assistant/settingsdialog.ui index 0e62cc715..0fa37afe5 100644 --- a/tools/assistant/settingsdialog.ui +++ b/tools/assistant/settingsdialog.ui @@ -15,7 +15,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp index 61f844241..f0edcc134 100644 --- a/tools/assistant/settingsdialogimpl.cpp +++ b/tools/assistant/settingsdialogimpl.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h index b29d11ab5..3fed90681 100644 --- a/tools/assistant/settingsdialogimpl.h +++ b/tools/assistant/settingsdialogimpl.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/tabbedbrowser.ui b/tools/assistant/tabbedbrowser.ui index 050297339..33dd9170a 100644 --- a/tools/assistant/tabbedbrowser.ui +++ b/tools/assistant/tabbedbrowser.ui @@ -15,7 +15,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/topicchooser.ui b/tools/assistant/topicchooser.ui index 810024bb4..e6fea8d16 100644 --- a/tools/assistant/topicchooser.ui +++ b/tools/assistant/topicchooser.ui @@ -15,7 +15,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/topicchooserimpl.cpp b/tools/assistant/topicchooserimpl.cpp index 7083a0cfc..7e8e685d9 100644 --- a/tools/assistant/topicchooserimpl.cpp +++ b/tools/assistant/topicchooserimpl.cpp @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h index 4df133ca3..34334e6e9 100644 --- a/tools/assistant/topicchooserimpl.h +++ b/tools/assistant/topicchooserimpl.h @@ -13,7 +13,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: -- cgit v1.2.1