From a3e91910e6eed7f5523009eb0a5439f4019d16ed Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 4 Oct 2011 11:30:37 +0200 Subject: remove dead code --- tools/linguist/shared/numerus.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/linguist/shared/numerus.cpp b/tools/linguist/shared/numerus.cpp index ac519b5..87f3aee 100644 --- a/tools/linguist/shared/numerus.cpp +++ b/tools/linguist/shared/numerus.cpp @@ -361,13 +361,6 @@ static const NumerusTableEntry numerusTable[] = { static const int NumerusTableSize = sizeof(numerusTable) / sizeof(numerusTable[0]); -// magic number for the file -static const int MagicLength = 16; -static const uchar magic[MagicLength] = { - 0x3c, 0xb8, 0x64, 0x18, 0xca, 0xef, 0x9c, 0x95, - 0xcd, 0x21, 0x1c, 0xbf, 0x60, 0xa1, 0xbd, 0xdd -}; - bool getNumerusInfo(QLocale::Language language, QLocale::Country country, QByteArray *rules, QStringList *forms, const char **gettextRules) { -- cgit v0.12 From af448ba50d1c89548d41b7aebdf6047e8f2aabf2 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 5 Oct 2011 19:42:21 +0200 Subject: Fixed typo in QSettings documentation. Merge-request: 1411 Reviewed-by: Oswald Buddenhagen --- doc/src/snippets/code/src_corelib_io_qsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp index 269aa44..91c5401 100644 --- a/doc/src/snippets/code/src_corelib_io_qsettings.cpp +++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp @@ -230,7 +230,7 @@ settings.setValue("sofa", true); settings.setValue("tv", false); QStringList groups = settings.childGroups(); -// group: ["fridge"] +// groups: ["fridge"] //! [21] -- cgit v0.12 From f4f1b712e1389987e045bb8f6ba654ea9e11d24e Mon Sep 17 00:00:00 2001 From: jaanttil Date: Wed, 5 Oct 2011 21:28:19 +0200 Subject: Build fix for WINCE to qfilesystemengine_win.cpp Merge-request: 2662 Reviewed-by: Oswald Buddenhagen --- src/corelib/io/qfilesystemengine_win.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 031d64b..98404a5 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -1094,7 +1094,6 @@ QFileSystemEntry QFileSystemEngine::currentPath() if (ret.length() >= 2 && ret[1] == QLatin1Char(':')) ret[0] = ret.at(0).toUpper(); // Force uppercase drive letters. #else - Q_UNUSED(fileName); //TODO - a race condition exists when using currentPath / setCurrentPath from multiple threads if (qfsPrivateCurrentDir.isEmpty()) qfsPrivateCurrentDir = QCoreApplication::applicationDirPath(); -- cgit v0.12 From 3b51392d6ab6cc3a1760ca2c795261e185bd344a Mon Sep 17 00:00:00 2001 From: Victor Ostashevsky Date: Thu, 6 Oct 2011 12:22:12 +0200 Subject: Ukrainian translation updated Merge-request: 1415 Reviewed-by: Oswald Buddenhagen --- translations/qt_uk.ts | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index 115b9e1..44f6d69 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -408,7 +408,7 @@ have libgstreamer-plugins-base installed. Reflections delay (ms) - ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + ReflectionsDelay: Amount of delay between the arrival of the direct path from the source and the arrival of the first reflection. Затримка відбиття (мс) @@ -423,7 +423,7 @@ have libgstreamer-plugins-base installed. Reverb level (mB) - ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + ReverbLevel: Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Рівень луни (мБ) @@ -481,7 +481,7 @@ have libgstreamer-plugins-base installed. Гучність: %1% - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% + Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1% Використовуйте цей повзунок для регулювання гучності. Крайня ліва позиція - 0%, крайня права - %1% @@ -3723,7 +3723,7 @@ Do you want to delete it anyway? Corner Toolbar - + Кутова панель @@ -6477,8 +6477,8 @@ Do you want to overwrite it? QSoftKeyManager - Ok - Ok + OK + OK Select @@ -7114,6 +7114,10 @@ Do you want to overwrite it? Запит скасовано + Request canceled + Запит скасовано + + Request blocked Запит блоковано @@ -8832,7 +8836,7 @@ Do you want to overwrite it? - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) + The namespace for a user defined function cannot be empty (try the predefined prefix %1, which exists for cases like this) @@ -9676,7 +9680,7 @@ Do you want to overwrite it? - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. + Content model of complex type %1 contains %2 element, so it cannot be derived by extension from a non-empty type. @@ -10084,7 +10088,7 @@ Do you want to overwrite it? - Element %1 cannot contain other elements, as it has a fixed content. + Element %1 cannot contain other elements, as it has fixed content. -- cgit v0.12