From e2654a15e78165c91c068f68265cc11b2f07c588 Mon Sep 17 00:00:00 2001 From: Victor Ostashevsky Date: Sun, 8 May 2011 12:01:06 +0300 Subject: Ukrainian translation updated --- translations/designer_uk.ts | 10 +++++----- translations/qt_uk.ts | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'translations') diff --git a/translations/designer_uk.ts b/translations/designer_uk.ts index dccfb5f376..7d1065c0c2 100644 --- a/translations/designer_uk.ts +++ b/translations/designer_uk.ts @@ -4860,21 +4860,21 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin &Portrait - Книжка + &Книжка Landscape (&CCW) Rotate form preview counter-clockwise - Альбом (проти ГС) + Альбом (проти &ГС) &Landscape (CW) Rotate form preview clockwise - Альбом (за ГС) + А&льбом (за ГС) &Close - Закрити + З&акрити @@ -5833,7 +5833,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomablePreviewDeviceSkin &Zoom - Масштаб + Мас&штаб diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index 52e70a207a..c3cfec0bbf 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -1720,10 +1720,6 @@ to Alias property exceeds alias bounds Властивість-псевдонім виходить за межі псевдоніму - - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> - Неправильне посилання на псевдонім. Посилання на псевдонім має бути вказане, як <id> або <id>.<property> - Invalid alias reference. Unable to find id "%1" Неправильне посилання на псевдонім. Неможливо знайти id "%1" -- cgit v1.2.3 From 1eea52e5b18ef2167d375285e3838bd7883cfd7d Mon Sep 17 00:00:00 2001 From: Jyri Tahtela Date: Fri, 13 May 2011 17:24:24 +0300 Subject: Update licenseheader text in source files for qt4.8 Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me --- translations/check-ts.pl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'translations') diff --git a/translations/check-ts.pl b/translations/check-ts.pl index 09a46232af..2cd53a4d9b 100755 --- a/translations/check-ts.pl +++ b/translations/check-ts.pl @@ -8,29 +8,29 @@ ## This file is part of the translations module of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ -## No Commercial Usage -## This file contains pre-release code and may not be distributed. -## You may use this file in accordance with the terms and conditions -## contained in the Technology Preview License Agreement accompanying -## this package. -## ## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## This file may be used under the terms of the GNU Lesser General Public +## License version 2.1 as published by the Free Software Foundation and +## appearing in the file LICENSE.LGPL included in the packaging of this +## file. Please review the following information to ensure the GNU Lesser +## General Public License version 2.1 requirements will be met: +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## ## In addition, as a special exception, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception +## rights. These rights are described in the Nokia Qt LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## -## If you have questions regarding the use of this file, please contact -## Nokia at qt-info@nokia.com. -## -## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU General +## Public License version 3.0 as published by the Free Software Foundation +## and appearing in the file LICENSE.GPL included in the packaging of this +## file. Please review the following information to ensure the GNU General +## Public License version 3.0 requirements will be met: +## http://www.gnu.org/copyleft/gpl.html. ## +## Other Usage +## Alternatively, this file may be used in accordance with the terms and +## conditions contained in a signed written agreement between you and Nokia. ## ## ## -- cgit v1.2.3