summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge v5.1.0 releasebaserock/morphRichard Dale2013-07-0420-3668/+3353
|\
| * fix qm output dir for non-prefix buildsv5.1.0-rc2v5.1.0Oswald Buddenhagen2013-06-141-2/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-31727 Change-Id: I696a7423beffb3114ac6f6b2a5dcbb297801c5a0 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Updated Russian translationv5.1.0-rc1Sergey Belyashov2013-06-107-2856/+1271
| | | | | | | | | | | | Change-Id: Ia04bbd1df9a903945f0af8d5baef8983b3cef57f Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Ukrainian translation updateViktor Ostashevskyi2013-05-317-572/+1515
| | | | | | | | | | Change-Id: I3ca7f3a56175ffa1aa09ad844da7309d93dc22cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Update German translations for 5.1.Friedemann Kleint2013-05-275-238/+563
| | | | | | | | | | | | Change-Id: I86bad82d6004eac9f6471060973fd8119c04c597 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* | Add qttranslations.morph to build the chunkRichard Dale2013-05-301-0/+13
|/
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-8/+9
| | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I52efbaa437979b4f01e0c10cbb5d09021e8cc39f Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge branch 'release' into stablev5.1.0-beta1Sergio Ahumada2013-04-1011-11091/+9474
|\ | | | | | | Change-Id: Ia071dc309030c484ce0571ba6ee0d7baaee87b36
| * Split and updated Czech translationsv5.0.2Pavel Fric2013-04-0811-11091/+9474
| | | | | | | | | | | | Change-Id: I4fe83f25a16439cf4990fba236f86971880e9adf Reviewed-by: Tomas Pospichal <tm.pospichal@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add license files mandated by (L)GPL.v5.1.0-alpha1Timo Jyrinki2013-03-273-0/+1210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL (in qttranslations, no FDL licensed files so LICENSE.FDL not needed) Change-Id: I5d50fe74e735b0f6395f0fcd53f06c7022e066ca Reviewed-by: Jason McDonald <macadder1@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-271-1/+1
| | | | | | | | | | Change-Id: I6be2570c1487e454ba329176fb06f07c72d48444 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | remove horrendeous hacksOswald Buddenhagen2013-03-271-25/+2
| | | | | | | | | | | | | | | | there is no need to make this module "buildable" with visual studio, so we just use the partly implemented aux TEMPLATE. Change-Id: Ie7989c674ad6f854764ac2617123bb1150695148 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | use cleaner way to force build of qm filesOswald Buddenhagen2013-03-271-2/+1
| | | | | | | | | | Change-Id: I6fa77812a19ea0bc453c12a89e627c6165a4902e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-190-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Conflicts: sync.profile Change-Id: Iee9311ffd7827b6893234bc2667691e4c559281e
| * | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: I38e3aac93439845c2a42ac87e3f46343075ba7dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-181-0/+2
|\ \ \ | | |/ | |/| | | | Change-Id: I3a54f62113889ea6ffad1265900ce28dd4f78d28
| * | define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I67f9035616a873994f5165ba5c08a1a4b9dce162 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge branch 'stable' into releaseJohanna Aijala2013-02-2131-12469/+85038
| |\ \ | |/ / |/| | | | | Change-Id: I05e0c7370b5485e2cdea6f72551b19c017659a78
* | | Update German translations for 5.0.2.Friedemann Kleint2013-02-147-1735/+582
| | | | | | | | | | | | | | | | | | | | | Update translations after .pro-file changes and various fixes. Change-Id: Ia52841754bb73d4a09e0d0bee8e3dbb4d83dfb5f Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* | | don't extract strings from linguist toolsOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | some of the tools are already bootstrapped, and even more will be. as we have no solution for the console encoding in bootstrapped apps, we don't actually translate them. so the translations are simply wasted. Change-Id: Id1b4849daea5b67bfd124e0a1f0b9b55a3289929 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | make sure that new files are treated with lconvert as wellOswald Buddenhagen2013-02-061-0/+2
| | | | | | | | | | | | | | | Change-Id: I035f3fc4efabf4812b9f428f4ea26fe28d7a791c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Fix lupdate scanning of assistant.Friedemann Kleint2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Do not scan help library for the application. Change-Id: Id839fb2953d5abf492a8507d979a4605745e1907 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge branch 'release' into stableSergio Ahumada2013-01-316-35/+32
|\ \ \ | |/ / | | | | | | Change-Id: I9d5880c3e8a3360c67aa2c7942dfa615cc1a576a
| * | Updated Russian translationSergey Belyashov2013-01-306-35/+32
| | | | | | | | | | | | | | | | | | | | | Change-Id: I1d018d999d4d61907e0dff11403f423ea435d769 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge branch 'stable' into releasev5.0.1Sergio Ahumada2013-01-092-0/+4414
| |\ \ | | | | | | | | | | | | Change-Id: I98ca7e12110341f2797788ea228e4c330c3b481e
| * | | point dependencies to 'release' branchesSergio Ahumada2012-12-181-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5089429808f399858941997754950440f7fccfe Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | Ukrainian translation split and updatedViktor Ostashevskyi2013-01-1713-10644/+11375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything except xmlpatterns is translated Change-Id: Iee77a600a47eb377c2e93de80f1c3e2d7704e397 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Update copyright year in Digia's license headersSergio Ahumada2013-01-102-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1b32b5a2c3b0a35d6544938b277db13585159dca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Slovak translation of designerZdenko Podobný2013-01-091-0/+5690
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8587f43ff6a65d70f1bf08886ffb6fd738a94f1f Reviewed-by: Roman Paholík <wizzardsk@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Adding translation files for qt_hu.ts metacatalog.Kristof Kiszel2012-12-205-0/+56662
| | | | | | | | | | | | | | | | | | | | Change-Id: I11152309b24489fa71aaafc057424faf719a18a1 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | | | Updating the Hungarian translation of Qt AssistantKristof Kiszel2012-12-201-86/+85
| | | | | | | | | | | | | | | | | | | | Change-Id: I39157ec1119f72c29c7fb8021841ade55ea21bfc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | | | Adding Hungarian translation of qmlviewerKristof Kiszel2012-12-201-0/+10638
| |/ / |/| | | | | | | | | | | | | | Change-Id: I8940bf5e72f1824d5d76c9fa81b2670c1cd11a5d Reviewed-by: Daniel Kasza <daniel@kasza.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | | Added Slovak translation of linguistZdenko Podobný2012-12-191-0/+2506
| | | | | | | | | | | | | | | | | | Change-Id: I64d1a466e364f56e520dfa72e6abf3170f7a2ba8 Reviewed-by: Roman Paholík <wizzardsk@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Add Slovak translation of assistantZdenko Podobný2012-12-181-0/+1908
|/ / | | | | | | | | | | Change-Id: I7f96f80859620ba8af50177331c0205fd95eeb5d Reviewed-by: Roman Paholík <wizzardsk@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | remove symbian vestigev5.0.0Oswald Buddenhagen2012-12-161-5/+0
| | | | | | | | | | Change-Id: Ic051730cb2c5feff78765068151e7916d22f616f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Slovak translation split and updates.Zdenko Podobný2012-12-1410-7971/+11151
| | | | | | | | | | | | Change-Id: I1ad47f33365b989d6f8229c6219cf61ba4b83b4a Reviewed-by: Roman Paholík <wizzardsk@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc2v5.0.0-rc1Sergio Ahumada2012-12-041-8/+8
| | | | | | | | | | | | | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I8eda77404c916d7cd5416eb28b0a54c68161f40a Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* | Fixes in German translationRobert Loehning2012-12-041-11/+11
| | | | | | | | | | Change-Id: I32791f19d5b618e00a2171713083638ddd68431c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | German translation split and updated.Friedemann Kleint2012-12-037-9917/+9758
|/ | | | | | | Replace qt_de.ts by meta catalog. Change-Id: Id6eed07f47084f9ef5cf156a99a41f884cf99d50 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Updated Russian translationSergey Belyashov2012-11-306-141/+142
| | | | | Change-Id: I119538f2637211f29e8870e64e5b14057207a837 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Russian translation splitted and updatedSergey Belyashov2012-11-2812-10838/+11254
| | | | | Change-Id: I9f9290f437d9aa0f4cb4be0c12d2639f0fc8aa08 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* set the right language on meta catalogsOswald Buddenhagen2012-11-221-1/+1
| | | | Change-Id: Ie27babd5fbb7f21531681ee90cd9af05866b80ad
* don't crash when ts files contains no stringsOswald Buddenhagen2012-11-221-1/+3
| | | | | | this will be valid for the qt aggregator catalogs Change-Id: I93af54b7a1e27a90040fdf4c72b437f6bcc69cac
* split out qmlviewer catalog as wellOswald Buddenhagen2012-11-221-1/+2
| | | | Change-Id: I93c41aa8027f443dd668eca5b298710bc35d0c73
* hacky magic handling for qtbase catalogOswald Buddenhagen2012-11-211-1/+3
| | | | | | it now includes qtactiveqt and qtimageformats for practical reasons. Change-Id: I68387d6fef382c16c34cd917e01bc2d84c0c02d9
* modularize translationsOswald Buddenhagen2012-11-204-27/+109
| | | | | | | this includes a script to modularize the old qt_??.ts files. Change-Id: I0fff36be18f5a9764d3ab1d2ee73e53cac43b979 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* simplify qtPrepareTool(LRELEASE, ...)Oswald Buddenhagen2012-11-201-1/+1
| | | | | | | no need to specify a source module any more Change-Id: Ie5ad576163c26057f20902a1131601622600cebe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* clean up sync.profileOswald Buddenhagen2012-11-201-10/+0
| | | | | | | no c++ modules expected here Change-Id: I1bf9e29f630c5a383a72a1c21a12de26cc6ba870 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update Traditional Chinese translationJuei-ray Tseng2012-11-201-1459/+563
| | | | | | | Change-Id: I4e958c1a0053a0c582a10a36dc0f4841ad39f715 Reviewed-by: Leonard Lee <leonard.lee@nokia.com> Reviewed-by: Jing Bai <jing.t.bai@nokia.com> (cherry picked from qt/25ba7b8e2d8c804d8daca2a9466c9dc375488b1d)
* Persian translation of Qt has been updated for 4.8soroush2012-11-201-17/+561
| | | | | | | | Change-Id: I30537aed87cc793c74588f0220072e97b7232e46 Reviewed-by: Mahdi Reviewed-by: Abbas Farahmand Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from qt/dde808a9e08641b6e76d2b0edb6529a436cfe74c)
View Lorry Controller Status