summaryrefslogtreecommitdiff
path: root/translations
AgeCommit message (Collapse)AuthorFilesLines
2010-06-04Synchronizing to latest treeGarami Gábor6-444/+1088
Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
2010-06-04Adding correct hungarian translationGarami Gábor7-5244/+8184
translations/assistant_hu.ts: Translated: 231 of 231 (100%) translations/designer_hu.ts: Translated: 85 of 1248 (6%) translations/linguist_hu.ts: Translated: 393 of 393 (100%) translations/qtconfig_hu.ts: Translated: 73 of 168 (43%) translations/qt_help_hu.ts: Translated: 80 of 81 (98%) translations/qt_hu.ts: Translated: 2402 of 2464 (97%) translations/qvfb_hu.ts: Translated: 65 of 65 (100%) Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
2010-05-31update Russian translations for Qt toolsRitt Konstantin5-525/+508
Merge-request: 621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-05-31update Russian translation for Qt librariesRitt Konstantin1-1528/+2948
this contains some changes from symbian-commissioned "professional" translations Merge-request: 621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-05-19Merge remote branch 'origin/4.7' into HEADOlivier Goffart4-61/+2
Conflicts: src/corelib/tools/qlocale_symbian.cpp
2010-05-19Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2-51/+0
4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
2010-05-18Update Polish translationsJarek Kobus6-621/+618
2010-05-18Removed mediaservices.Kurt Korbatits2-51/+0
2010-05-17Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2-10/+2
Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
2010-05-14define qtPrepareTool() function and use it throughoutOswald Buddenhagen2-10/+2
the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
2010-05-04Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2-1/+1
Conflicts: translations/translations.pri
2010-05-03rename qt_iw.ts to qt_he.tsOswald Buddenhagen2-1/+1
iw comes from the obsolete ISO639. we are using ISO639-1 or something newer.
2010-04-30Update Polish translationsJarek Kobus1-114/+156
2010-04-29French translation strings, originally made by external translators.Pierre Rossi1-1674/+2976
Plus some fixes and additional translations. Reviewed-by: TrustMe Reviewed-by: Benjamin Poulain Reviewed-by: Gabriel
2010-04-28Update Polish translationsJarek Kobus1-160/+160
2010-04-27Update Polish translationJarek Kobus1-316/+2044
2010-04-19I10n: Update German translations for 4.7.0Friedemann Kleint5-284/+648
2010-04-09Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira1-1/+1
Conflicts: src/multimedia/audio/qaudioinput_win32_p.h
2010-03-31Fix translation mistake spotted by Laurent MontelDavid Faure1-1/+1
Merge-request: 542 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-03-19Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy1-1/+7
Conflicts: mkspecs/common/symbian/symbian.conf
2010-03-1810n: Update German translation for 4.7.0Friedemann Kleint1-970/+1064
Complete QML, spell-check and purge.
2010-03-18Incorrect translation for Application menu items in Mac.Prasanth Ullattil11-0/+165
A behavior change was introduced by the commit 97b8727635a73197fac4f5edb8a1122733933db4. The menu items with menuRoles will now be translated like Native Mac applications. Translations/merging of menu items are done as follows: 1) AboutRole ==> "About <Application>" 2) PreferencesRole ==> "Preferences..." 3) QuitRole ==> "Quit <Application>" Task-number: QTBUG-4463 Reviewed-by: mortens
2010-03-16Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis1-0/+1
Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
2010-03-15Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira1-0/+1
Conflicts: src/gui/styles/qs60style_s60.cpp
2010-03-11Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis22-1733/+3783
Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
2010-03-09fix qm file installation from shadow buildOswald Buddenhagen1-0/+1
2010-03-09Fix obsolete URL's.Jason McDonald1-1/+1
Task-number: QT-3051 Reviewed-by: Trust Me
2010-03-07Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System11-0/+253
4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
2010-03-07Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern7-1244/+2113
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
2010-03-05check in MAC_APPLICATION_MENU translationsOswald Buddenhagen11-0/+253
these are stolen directly from mac and should not be altered. extracted from patch by Prasanth. Task-number: QTBUG-4463
2010-03-02update russian translations and phrasebookRitt Konstantin8-1363/+2229
Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-02-25fix ts-assistant targetOswald Buddenhagen1-1/+1
2010-02-24Prepare German translations for 4.7 (except Quick).Friedemann Kleint5-488/+1416
2010-02-23Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis1-1/+1
Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
2010-02-23Implemented recursive "sis" target and enabled sis_targets feature.axis1-1/+6
The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
2010-02-19Fixed URL in Russian translation.Robert Loehning1-1/+1
Reviewed-by: hjk
2010-02-18Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis1-0/+1
merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
2010-02-16Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis14-5974/+22221
Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
2010-02-16Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis1-4/+4
Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
2010-02-16Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System1-0/+1
master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
2010-02-15Prepare translations of the declarative module.Friedemann Kleint1-0/+1
Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
2010-02-12Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis8-147/+21346
Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
2010-02-12Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira1-4/+4
2010-02-10Make the symbian build not bail out over missing filesThomas Zander1-0/+1
2010-02-09Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2-142/+436
Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
2010-02-09fix a few mistakes in German translationFrederik Schwarzer1-4/+4
Merge-request: 2302 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-02-04Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart6-1/+20906
Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
2010-02-04I10n/German: Update translations for 4.6.2Friedemann Kleint2-142/+436
2010-02-03Move the Hungarian translation to the translations folderBenjamin Poulain7-0/+22219
2010-02-03Add Qt base hungarian translationLaszlo Papp1-1/+1
Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>