Merge commit 'origin/4.5'

Conflicts:

	src/sql/drivers/ibase/qsql_ibase.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qsqldatabase/tst_databases.h
	tests/auto/qsqldatabase/tst_qsqldatabase.cpp
	translations/qt_ru.ts

1 files changed, 98 insertions, 102 deletions

diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index a27b8c4..c856786 100644
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -57,7 +57,7 @@
     <message>
         <location line="+2"/>
         <source>Accessibility</source>
-        <translation>Средства для людей с ограниченными возможностями</translation>
+        <translation>Специальные возможности</translation>
     </message>
 </context>
 <context>
@@ -917,22 +917,22 @@ to
 <context>
     <name>QAxSelect</name>
     <message>
-        <location filename="../src/activeqt/container/qaxselect.ui" line="+54"/>
+        <location filename="../src/activeqt/container/qaxselect.ui"/>
         <source>Select ActiveX Control</source>
         <translation>Выберите компоненту ActiveX</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location/>
         <source>OK</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location/>
         <source>COM &amp;Object:</source>
         <translation>COM &amp;Объект:</translation>
     </message>
@@ -1022,7 +1022,7 @@ to
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+544"/>
+        <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+556"/>
         <source>False</source>
         <translation>Нет</translation>
     </message>
@@ -1491,32 +1491,32 @@ Please verify the correct file name was given.</source>
         <translation>Показать скр&amp;ытые файлы</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui" line="+84"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="+73"/>
+        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="+14"/>
+        <location/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Parent Directory</source>
         <translation>Родительский каталог</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="+14"/>
+        <location/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>List View</source>
         <translation>Список</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="+7"/>
+        <location/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Detail View</source>
         <translation>Подробный вид</translation>
     </message>
     <message>
-        <location line="+141"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="+162"/>
+        <location/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Files of type:</source>
         <translation>Типы файлов:</translation>
     </message>
@@ -1619,8 +1619,8 @@ Do you want to delete it anyway?</source>
         <translation>Показать </translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui" line="-169"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="-190"/>
+        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Forward</source>
         <translation>Вперед</translation>
     </message>
@@ -1652,14 +1652,14 @@ Do you want to delete it anyway?</source>
         <translation>&amp;Имя файла:</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui" line="-32"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="+212"/>
+        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Look in:</source>
         <translation>Перейти к:</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui" line="-198"/>
+        <location/>
+        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Create New Folder</source>
         <translation>Создать каталог</translation>
     </message>
@@ -1828,7 +1828,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+3"/>
         <source>Arabic</source>
-        <translation type="unfinished"></translation>
+        <translation>Арабская</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1838,57 +1838,57 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+3"/>
         <source>Thaana</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Таана</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Devanagari</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Деванагири</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Bengali</source>
-        <translation type="unfinished"></translation>
+        <translation>Бенгальская</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Gurmukhi</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Гурмукхи</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Gujarati</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Гуджарати</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Oriya</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ория</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Tamil</source>
-        <translation type="unfinished"></translation>
+        <translation>Тамильская</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Telugu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Телугу</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Kannada</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Каннада</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Malayalam</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Малайялам</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Sinhala</source>
-        <translation type="unfinished"></translation>
+        <translation>Сингальская</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1898,7 +1898,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+3"/>
         <source>Lao</source>
-        <translation type="unfinished"></translation>
+        <translation>Лаосская</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1908,7 +1908,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+3"/>
         <source>Myanmar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Мьянма</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1953,7 +1953,7 @@ Do you want to delete it anyway?</source>
     <message>
         <location line="+3"/>
         <source>Ogham</source>
-        <translation type="unfinished"></translation>
+        <translation>Огамическая</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2401,7 +2401,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIBaseDriver</name>
     <message>
-        <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1434"/>
+        <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1454"/>
         <source>Error opening database</source>
         <translation>Невозможно открыть базу данных</translation>
     </message>
@@ -2424,7 +2424,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QIBaseResult</name>
     <message>
-        <location line="-1095"/>
+        <location line="-1112"/>
         <source>Unable to create BLOB</source>
         <translation>Невозможно создать BLOB</translation>
     </message>
@@ -2470,7 +2470,7 @@ Do you want to delete it anyway?</source>
         <translation>Невозможно выполнить транзакцию</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+42"/>
         <source>Could not allocate statement</source>
         <translation>Не удалось получить ресурсы для создания выражения</translation>
     </message>
@@ -2481,12 +2481,12 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <location line="+5"/>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Could not describe input statement</source>
         <translation>Не удалось описать входящее выражение</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+14"/>
         <source>Could not describe statement</source>
         <translation>Не удалось описать выражение</translation>
     </message>
@@ -3288,7 +3288,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QOCIDriver</name>
     <message>
-        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+2079"/>
+        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+2082"/>
         <source>Unable to logon</source>
         <translation>Невозможно авторизоваться</translation>
     </message>
@@ -3317,7 +3317,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QOCIResult</name>
     <message>
-        <location line="-973"/>
+        <location line="-976"/>
         <location line="+161"/>
         <location line="+15"/>
         <source>Unable to bind column for batch execute</source>
@@ -3329,7 +3329,7 @@ Do you want to delete it anyway?</source>
         <translation>Невозможно выполнить пакетное выражение</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+305"/>
         <source>Unable to goto next</source>
         <translation>Невозможно перейти к следующей строке</translation>
     </message>
@@ -3376,7 +3376,7 @@ Do you want to delete it anyway?</source>
         <translation>Невозможно соединиться - Драйвер не поддерживает требуемый функционал</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+239"/>
         <source>Unable to disable autocommit</source>
         <translation>Невозможно отключить автовыполнение транзакции</translation>
     </message>
@@ -3399,7 +3399,7 @@ Do you want to delete it anyway?</source>
 <context>
     <name>QODBCResult</name>
     <message>
-        <location line="-1218"/>
+        <location line="-1216"/>
         <location line="+349"/>
         <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
         <translation>QODBCResult::reset: Невозможно установить &apos;SQL_CURSOR_STATIC&apos; атрибутом выражение. Проверьте настройки драйвера ODBC</translation>
@@ -3428,12 +3428,12 @@ Do you want to delete it anyway?</source>
     <message>
         <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+194"/>
         <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-475"/>
-        <location line="+578"/>
+        <location line="+579"/>
         <source>Unable to fetch last</source>
         <translation>Невозможно получить последнюю строку</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-672"/>
+        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-673"/>
         <source>Unable to fetch</source>
         <translation>Невозможно получить данные</translation>
     </message>
@@ -3520,7 +3520,7 @@ Do you want to delete it anyway?</source>
         <translation>Не удалось начать транзакцию</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Could not commit transaction</source>
         <translation>Не удалось выполнить транзакцию</translation>
     </message>
@@ -3576,86 +3576,82 @@ Do you want to delete it anyway?</source>
         <translation>Точки (pt)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupwidget.ui" line="+13"/>
+        <location filename="../src/gui/dialogs/qpagesetupwidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location/>
         <source>Paper</source>
         <translation>Бумага</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Page size:</source>
         <translation>Размер страницы:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>Width:</source>
         <translation>Ширина:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location/>
         <source>Height:</source>
         <translation>Высота:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location/>
         <source>Paper source:</source>
         <translation>Источник бумаги:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location/>
         <source>Orientation</source>
         <translation>Ориентация страницы</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Portrait</source>
         <translation>Книжная</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Landscape</source>
         <translation>Альбомная</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>Reverse landscape</source>
         <translation>Перевёрнутая альбомная</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>Reverse portrait</source>
         <translation>Перевёрнутая книжная</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location/>
         <source>Margins</source>
         <translation>Поля</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+3"/>
+        <location/>
         <source>top margin</source>
         <translation>верхнее поле</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+3"/>
+        <location/>
         <source>left margin</source>
         <translation>Левое поле</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location line="+3"/>
+        <location/>
         <source>right margin</source>
         <translation>правое поле</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+3"/>
+        <location/>
         <source>bottom margin</source>
         <translation>Нижнее поле</translation>
     </message>
@@ -4213,17 +4209,17 @@ Please choose a different file name.</source>
 <context>
     <name>QPrintPropertiesWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpropertieswidget.ui" line="+13"/>
+        <location filename="../src/gui/dialogs/qprintpropertieswidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location/>
         <source>Page</source>
         <translation>Страница</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
@@ -4231,97 +4227,97 @@ Please choose a different file name.</source>
 <context>
     <name>QPrintSettingsOutput</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintsettingsoutput.ui" line="+13"/>
+        <location filename="../src/gui/dialogs/qprintsettingsoutput.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location/>
         <source>Copies</source>
         <translation>Копии</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location/>
         <source>Print range</source>
         <translation>Печатать диапазон</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location/>
         <source>Print all</source>
         <translation>Печатать все</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>Pages from</source>
         <translation>Страницы от</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location/>
         <source>to</source>
         <translation>до</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location/>
         <source>Selection</source>
         <translation>Выделенные</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location/>
         <source>Output Settings</source>
         <translation>Настройки вывода</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Copies:</source>
         <translation>Количество копий:</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location/>
         <source>Collate</source>
         <translation>Разобрать про копиям</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location/>
         <source>Reverse</source>
         <translation>Обратный порядок</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Color Mode</source>
         <translation>Режим цвета</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Grayscale</source>
         <translation>Оттенки серого</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Duplex Printing</source>
         <translation>Двусторонняя печать</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Long side</source>
         <translation>По длинной стороне</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>Short side</source>
         <translation>По короткой стороне</translation>
     </message>
@@ -4329,47 +4325,47 @@ Please choose a different file name.</source>
 <context>
     <name>QPrintWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintwidget.ui" line="+13"/>
+        <location filename="../src/gui/dialogs/qprintwidget.ui"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location/>
         <source>Printer</source>
         <translation>Принтер</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Имя:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location/>
         <source>P&amp;roperties</source>
         <translation>С&amp;войства</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>Location:</source>
         <translation>Положение:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Output &amp;file:</source>
         <translation>Выходной &amp;файл:</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -6329,7 +6325,7 @@ Please choose a different file name.</source>
 <context>
     <name>QWizard</name>
     <message>
-        <location filename="../src/gui/dialogs/qwizard.cpp" line="+637"/>
+        <location filename="../src/gui/dialogs/qwizard.cpp" line="+638"/>
         <source>Go Back</source>
         <translation>Назад</translation>
     </message>