summaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-09 16:05:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-09 16:05:54 (GMT)
commiteabcaaa9be03674d45e6bb53e098d5b5b3e9ef81 (patch)
treeaa9b70c23b2a5437d19bef9bba74373ba699cbfa /translations
parent4ec3288621aabc17ba8637611d39128566072047 (diff)
parentdb934a4e287f083f41e6a6ad1d48bbf223588efa (diff)
downloadQt-eabcaaa9be03674d45e6bb53e098d5b5b3e9ef81.zip
Qt-eabcaaa9be03674d45e6bb53e098d5b5b3e9ef81.tar.gz
Qt-eabcaaa9be03674d45e6bb53e098d5b5b3e9ef81.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'translations')
-rw-r--r--translations/designer_uk.ts10
-rw-r--r--translations/qt_uk.ts4
2 files changed, 5 insertions, 9 deletions
diff --git a/translations/designer_uk.ts b/translations/designer_uk.ts
index dccfb5f..7d1065c 100644
--- a/translations/designer_uk.ts
+++ b/translations/designer_uk.ts
@@ -4860,21 +4860,21 @@ Please select another name.</source>
<name>qdesigner_internal::PreviewDeviceSkin</name>
<message>
<source>&amp;Portrait</source>
- <translation>Книжка</translation>
+ <translation>&amp;Книжка</translation>
</message>
<message>
<source>Landscape (&amp;CCW)</source>
<extracomment>Rotate form preview counter-clockwise</extracomment>
- <translation>Альбом (проти ГС)</translation>
+ <translation>Альбом (проти &amp;ГС)</translation>
</message>
<message>
<source>&amp;Landscape (CW)</source>
<extracomment>Rotate form preview clockwise</extracomment>
- <translation>Альбом (за ГС)</translation>
+ <translation>А&amp;льбом (за ГС)</translation>
</message>
<message>
<source>&amp;Close</source>
- <translation>Закрити</translation>
+ <translation>З&amp;акрити</translation>
</message>
</context>
<context>
@@ -5833,7 +5833,7 @@ This indicates an inconsistency in the ui-file.</source>
<name>qdesigner_internal::ZoomablePreviewDeviceSkin</name>
<message>
<source>&amp;Zoom</source>
- <translation>Масштаб</translation>
+ <translation>Мас&amp;штаб</translation>
</message>
</context>
</TS>
diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts
index 52e70a2..c3cfec0 100644
--- a/translations/qt_uk.ts
+++ b/translations/qt_uk.ts
@@ -1721,10 +1721,6 @@ to
<translation>Властивість-псевдонім виходить за межі псевдоніму</translation>
</message>
<message>
- <source>Invalid alias reference. An alias reference must be specified as &lt;id&gt; or &lt;id&gt;.&lt;property&gt;</source>
- <translation type="obsolete">Неправильне посилання на псевдонім. Посилання на псевдонім має бути вказане, як &lt;id&gt; або &lt;id&gt;.&lt;property&gt;</translation>
- </message>
- <message>
<source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
<translation>Неправильне посилання на псевдонім. Неможливо знайти id &quot;%1&quot;</translation>
</message>