Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	configure.exe
	examples/multimedia/audioinput/audioinput.cpp
	src/corelib/io/qfsfileengine.cpp
	src/gui/egl/qegl_wince.cpp
	src/gui/egl/qeglproperties.cpp
	src/gui/egl/qeglproperties_p.h
	src/gui/embedded/directfb.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/painting/qdrawutil.cpp
	src/opengl/qgl_p.h
	src/sql/drivers/odbc/qsql_odbc.cpp
	src/sql/drivers/odbc/qsql_odbc.h
	tests/auto/auto.pro
	tests/auto/qgl/tst_qgl.cpp
	translations/assistant_adp_ru.ts

1 files changed, 140 insertions, 157 deletions

diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts
index 9f74712..7be0f04 100644
--- a/translations/qtconfig_ru.ts
+++ b/translations/qtconfig_ru.ts
@@ -45,7 +45,7 @@
     <message>
         <location line="+31"/>
         <source>Phonon GStreamer backend not available.</source>
-        <translation type="unfinished">Модуль Phonon поддержки GStreamer недоступен.</translation>
+        <translation>Модуль поддержки GStreamer недоступен.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -156,363 +156,347 @@
 <context>
     <name>MainWindowBase</name>
     <message>
-        <location filename="../tools/qtconfig/mainwindowbase.ui" line="+54"/>
+        <location filename="../tools/qtconfig/mainwindowbase.ui"/>
         <source>Qt Configuration</source>
         <translation>Конфигурация Qt</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>GUI Style</source>
         <translation>Стиль пользовательского графического интерфейса</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>Select GUI &amp;Style:</source>
         <translation type="unfinished">&amp;Стиль интерфейса:</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location/>
         <source>Build Palette</source>
         <translation type="unfinished">Палитра</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location/>
         <source>&amp;3-D Effects:</source>
         <translation>Эффекты &amp;3D:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location/>
         <source>Window Back&amp;ground:</source>
         <translation>&amp;Фон окна:</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location/>
         <source>&amp;Tune Palette...</source>
         <translation>&amp;Настроить палитру...</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Please use the KDE Control Center to set the palette.</source>
         <translation>Используйте Центр управления KDE для настройки цветов.</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location/>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Select &amp;Palette:</source>
         <translation>Выбор &amp;палитры:</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location/>
         <source>Active Palette</source>
         <translation>Палитра активных элементов</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Inactive Palette</source>
         <translation>Палитра неактивных элементов</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Disabled Palette</source>
         <translation>Палитра выключенных элементов</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Default Font</source>
         <translation>Шрифт по умолчанию</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location/>
         <source>&amp;Style:</source>
         <translation>&amp;Начертание:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>&amp;Point Size:</source>
         <translation>&amp;Размер:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>F&amp;amily:</source>
         <translation>&amp;Шрифт:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Sample Text</source>
         <translation>Текст для примера (Sample Text)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>Font Substitution</source>
         <translation>Подстановка шрифтов</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location/>
         <source>S&amp;elect or Enter a Family:</source>
         <translation>&amp;Выберите шрифт для замены:</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location/>
         <source>Current Substitutions:</source>
         <translation>Текущие замены:</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+501"/>
+        <location/>
         <source>Up</source>
         <translation>Выше</translation>
     </message>
     <message>
-        <location line="-494"/>
-        <location line="+508"/>
+        <location/>
         <source>Down</source>
         <translation>Ниже</translation>
     </message>
     <message>
-        <location line="-501"/>
-        <location line="+494"/>
+        <location/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="-464"/>
+        <location/>
         <source>Select s&amp;ubstitute Family:</source>
         <translation>&amp;Заменять на шрифт:</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+487"/>
+        <location/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location line="-474"/>
+        <location/>
         <source>Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Feel Settings</source>
         <translation type="unfinished">Настройка указателя</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+26"/>
+        <location/>
         <source> ms</source>
         <translation> мс</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location/>
         <source>&amp;Double Click Interval:</source>
         <translation>&amp;Интервал двойного щелчка:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>No blinking</source>
         <translation>Без мигания</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location/>
         <source>&amp;Cursor Flash Time:</source>
         <translation>&amp;Период мигания курсора:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source> lines</source>
         <translation> строк</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>Wheel &amp;Scroll Lines:</source>
         <translation type="unfinished">&amp;Прокручивать строк при повороте колёсика:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Resolve symlinks in URLs</source>
         <translation>Разрешать символьные ссылки в URL-ах</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>GUI Effects</source>
         <translation type="unfinished">Эффекты пользовательского интерфейса</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location/>
         <source>&amp;Enable</source>
         <translation>&amp;Включить</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>Alt+E</source>
         <translation>Alt+D</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location/>
         <source>&amp;Menu Effect:</source>
         <translation>Эффект &amp;меню:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>C&amp;omboBox Effect:</source>
         <translation type="unfinished">Эффект C&amp;omboBox:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>&amp;ToolTip Effect:</source>
         <translation type="unfinished">Эффект &amp;ToolTip:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Tool&amp;Box Effect:</source>
         <translation type="unfinished">Эффект Tool&amp;Box:</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+19"/>
-        <location line="+14"/>
-        <location line="+19"/>
+        <location/>
         <source>Disable</source>
         <translation>Выключен</translation>
     </message>
     <message>
-        <location line="-47"/>
-        <location line="+19"/>
-        <location line="+14"/>
-        <location line="+19"/>
+        <location/>
         <source>Animate</source>
         <translation>Анимация</translation>
     </message>
     <message>
-        <location line="-47"/>
-        <location line="+33"/>
+        <location/>
         <source>Fade</source>
         <translation>Затухание</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location/>
         <source>Global Strut</source>
         <translation type="unfinished">Специальные возможности</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location/>
         <source>Minimum &amp;Width:</source>
         <translation>Минимальная &amp;ширина:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Minimum Hei&amp;ght:</source>
         <translation>Минимальная в&amp;ысота:</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+10"/>
+        <location/>
         <source> pixels</source>
         <translation> пикселей</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>Enhanced support for languages written right-to-left</source>
         <translation>Расширенная поддержка письма справа налево</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>XIM Input Style:</source>
         <translation>Стиль ввода XIM:</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location/>
         <source>On The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Over The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Off The Spot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location/>
         <source>Default Input Method:</source>
         <translation>Метод ввода по умолчанию:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location/>
         <source>Printer</source>
         <translation>Принтер</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Enable Font embedding</source>
         <translation>Разрешить встраивание шрифтов</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location/>
         <source>Font Paths</source>
         <translation>Пути к шрифтам</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location/>
         <source>Press the &lt;b&gt;Browse&lt;/b&gt; button or enter a directory and press Enter to add them to the list.</source>
         <translation>Нажмите кнопку &lt;b&gt;Обзор...&lt;/b&gt; или укажите каталог и нажмите Ввод для добавления его в список.</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location/>
         <source>Phonon</source>
         <translation>Phonon</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>About Phonon</source>
         <translation>О Phonon</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+44"/>
+        <location/>
         <source>Current Version:</source>
         <translation>Текущая версия:</translation>
     </message>
     <message>
-        <location line="-37"/>
-        <location line="+44"/>
+        <location/>
         <source>Not available</source>
         <translation>Недоступно</translation>
     </message>
     <message>
-        <location line="-37"/>
-        <location line="+44"/>
+        <location/>
         <source>Website:</source>
         <translation>Вэб-сайт:</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -525,12 +509,12 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location/>
         <source>About GStreamer</source>
         <translation>О GStreamer</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -543,22 +527,22 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location/>
         <source>GStreamer backend settings</source>
         <translation>Настройки модуля GStreamer</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Preferred audio sink:</source>
         <translation>Предпочитаемое звуковое устройство:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>Preferred render method:</source>
         <translation>Предпочитаемый метод отрисовки:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -571,57 +555,57 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Внимание: Изменение данных настроек может повлечь невозможность корректного запуска приложений.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>E&amp;xit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location/>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
@@ -629,208 +613,207 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PaletteEditorAdvancedBase</name>
     <message>
-        <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="+61"/>
+        <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui"/>
         <source>Tune Palette</source>
         <translation>Настройка палитры</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Изменение палитры&lt;/b&gt;&lt;p&gt;Изменение палитры текущего виджета или формы.&lt;/p&gt;&lt;p&gt;Используйте сформированную палитру или выберите цвета для каждой группы цветов и каждой их роли.&lt;/p&gt;&lt;p&gt;Палитру можно проверить на виджетах в разных режимах отображения в разделе предпросмотра.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location/>
         <source>Select &amp;Palette:</source>
         <translation>Выбор &amp;палитры:</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location/>
         <source>Active Palette</source>
         <translation>Палитра активных элементов</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Inactive Palette</source>
         <translation>Палитра неактивных элементов</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Disabled Palette</source>
         <translation>Палитра выключенных элементов</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location/>
         <source>Auto</source>
         <translation>Автоматически</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>Build inactive palette from active</source>
         <translation type="unfinished">Создать неактивную палитру из активной</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>Build disabled palette from active</source>
         <translation type="unfinished">Создать выключенную палитру из активной</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location/>
         <source>Central color &amp;roles</source>
         <translation type="unfinished">Роли &amp;цветов</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>Choose central color role</source>
         <translation type="unfinished">Выберите роль цвета</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt;&lt;li&gt;Window - основной цвет фона.&lt;/li&gt; &lt;li&gt;WindowText - основной цвет текста.&lt;/li&gt; &lt;li&gt;Base - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.&lt;/li&gt; &lt;li&gt;Text - цвет текста используемый совместно с Base. Обычно, он совпадает с WindowText, так как в этом случае получается максимальный контраст и с Window, и с Base.&lt;/li&gt; &lt;li&gt;Button - основной цвет фона кнопки, которой требуется цвет отличный от Window, например, в стиле Macintosh.&lt;/li&gt; &lt;li&gt;ButtonText - цвет текста используемый совместно с Button.&lt;/li&gt; &lt;li&gt;Highlight - цвет для обозначения выбранного или выделенного элемента.&lt;/li&gt; &lt;li&gt;HighlightedText - цвет текста контрастирующий с Highlight.&lt;/li&gt; &lt;li&gt;BrightText - цвет текста, который отличается от WindowText и хорошо контрастирует с черным.&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>WindowText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>BrightText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>ButtonText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Highlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>HighlightedText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location/>
         <source>&amp;Select Color:</source>
         <translation>&amp;Выбор цвета:</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+171"/>
+        <location/>
         <source>Choose a color</source>
         <translation>Выберите цвет</translation>
     </message>
     <message>
-        <location line="-168"/>
+        <location/>
         <source>Choose a color for the selected central color role.</source>
         <translation>Выберите цвет для указанной роли.</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location/>
         <source>3-D shadow &amp;effects</source>
         <translation>Эффекты т&amp;рехмерной тени</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location/>
         <source>Build &amp;from button color</source>
         <translation>Получ&amp;ить из цвета кнопки</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Generate shadings</source>
         <translation type="unfinished">Создание полутонов</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>Check to let 3D-effect colors be calculated from button-color.</source>
         <translation type="unfinished">Включите, чтобы цвета эффекта трёхмерности были получены из цвета кнопки.</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Choose 3D-effect color role</source>
         <translation type="unfinished">Выбор роли цвета дял эффекта трёхмерности</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location/>
         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</source>
         <translation>&lt;b&gt;Выбор роли цвета.&lt;/b&gt;&lt;p&gt;Доступны следующие роли: &lt;ul&gt; &lt;li&gt;Light - светлее цвета Button. &lt;/li&gt; &lt;li&gt;Midlight - среднее между Light и Button. &lt;/li&gt; &lt;li&gt;Mid - среднее между Button и Dark. &lt;/li&gt; &lt;li&gt;Dark - темнее цвета Button. &lt;/li&gt; &lt;li&gt;Shadow - очень темный цвет. &lt;/li&gt; &lt;/ul&gt;</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Midlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Mid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location/>
         <source>Shadow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location/>
         <source>Select Co&amp;lor:</source>
         <translation>Выбор &amp;цвета:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location/>
         <source>Choose a color for the selected effect color role.</source>
         <translation type="unfinished">Выбор цвета для указанной роли.</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location/>
         <source>OK</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location/>
         <source>Close dialog and apply all changes.</source>
         <translation>Закрыть окно с применением изменений.</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location/>
         <source>Close dialog and discard all changes.</source>
         <translation>Закрыть окно с отменой изменений.</translation>
     </message>
@@ -846,62 +829,62 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PreviewWidgetBase</name>
     <message>
-        <location filename="../tools/qtconfig/previewwidgetbase.ui" line="+66"/>
+        <location filename="../tools/qtconfig/previewwidgetbase.ui"/>
         <source>Preview Window</source>
         <translation>Окно предпросмотра</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location/>
         <source>ButtonGroup</source>
         <translation>ButtonGroup</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>RadioButton1</source>
         <translation>RadioButton1</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>RadioButton2</source>
         <translation>RadioButton2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location/>
         <source>RadioButton3</source>
         <translation>RadioButton3</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>ButtonGroup2</source>
         <translation>ButtonGroup2</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location/>
         <source>CheckBox1</source>
         <translation>CheckBox1</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location/>
         <source>CheckBox2</source>
         <translation>CheckBox2</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location/>
         <source>LineEdit</source>
         <translation>LineEdit</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location/>
         <source>ComboBox</source>
         <translation>ComboBox</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location/>
         <source>PushButton</source>
         <translation>PushButton</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location/>
         <source>&lt;p&gt;
 &lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;
 &lt;/p&gt;