summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.15.10.15.10Liang Qi2018-01-2112-7822/+16915
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf translations/qtbase_fi.ts Change-Id: I3caeac23157280f25db535ae4ef846f0d46c427b
| * Update Finnish translations for 5.9v5.9.45.9.4Aki Koskinen2017-12-183-143/+489
| | | | | | | | | | | | | | | | | | These are backported from commit b073cec77661b2a42bf41d54891a533a66e7cc8a. Change-Id: Ic6e017d7fde22558808b3f01a9d0975212104a0c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: Iaa4f428c3126c6ae19f68b6062f7d311019915af
| * Update Arabic translations for Qt5Safa AlFulaij2017-11-1510-7821/+16910
| | | | | | | | | | Change-Id: Ic76223435bc24e15a3ce1d987a94713df8b7cc6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | Change-Id: Ic9b05ac458fac1958aa0f97cb64de41b91697022
* | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-089-270/+858
|\ \ | | | | | | | | | Change-Id: Ib1cde07e86324648307967a1ecc053d1fb9312ef
| * | Update danish translation to 5.10v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0scootergrisen2017-11-236-87/+260
| | | | | | | | | | | | | | | Change-Id: I08a0c266b5e1afe53a29d55c64c2eb79541b16cb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Update Finnish translations for 5.10Aki Koskinen2017-11-213-183/+598
|/ / | | | | | | | | Change-Id: Ia94e760f97afa012fa779676bca508a43b2a91b3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-37/+539
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iabfdd46c0cbc500c7008cb6fd655f5d2e11b8bde
| * Update Scottish Gaelic translationv5.9.35.9.3GunChleoc2017-10-161-37/+539
| | | | | | | | | | | | Change-Id: Ic651515c2f060fc0fbe8ddb7c968b0352630d236 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: GunChleoc <fios@foramnagaidhlig.net>
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I5683a9bc2c9f78bdf61fb91821f3d0d8ca3c8a42
* | Update Russian translationSergey Belyashov2017-11-0811-593/+1810
| | | | | | | | | | | | Change-Id: Ic387514b3c1715d4617e6ab6dd297855b4c852be Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Update German translations for 5.10v5.10.0-beta4Friedemann Kleint2017-11-065-49/+154
| | | | | | | | | | Change-Id: Iaee5c462278b61e9888d5df80e72733f1b33391a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Catalan translations for Qt 5.10v5.10.0-beta3Josep Ma. Ferrer2017-10-241-12/+63
| | | | | | | | | | | | | | | | | | Updated Catalan translations for Qt 5.10 Change-Id: I5686b0b574bffc6fd3908e50025ee90fa29170bd Reviewed-by: Josep Ma. Ferrer <txemaq@gmail.com> Reviewed-by: Albert Astals Cid <aacid@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Friedemann Kleint2017-08-2874-10100/+59336
|\ \ | |/ | | | | Change-Id: Ib9759bc1fd01c159962a8c5fdfc247a893643600
| * Bump versionv5.9.25.9.2Oswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: Ia0f8116df98bacdba5c6cbda168fd46a5875158c
| * don't delete .qm files on "make clean"Oswald Buddenhagen2017-06-201-1/+3
| | | | | | | | | | | | | | | | | | they are final artifacts, so they should be deleted only by a distclean. Task-number: QTBUG-42729 Change-Id: Ib0c024646e13faefa0e18c94e9464500063373e0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| * Fix licensingv5.9.15.9.1Jani Heikkinen2017-06-016-752/+49
| | | | | | | | | | | | | | | | | | | | | | Currently tools are licensed under GPL-EXCEPT so replase old LGPL21 license header with GPL-EXCEPT one. Also remove old & unused license files Task-number: QTBUG-57147 Change-Id: Idc9c2189ee76c38fefb54b2e4b3b2d3622d7b892 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-3111-301/+1843
| |\ | | | | | | | | | Change-Id: I725ba2efa0aa2b18fe0ec7b64b889624c9d1f52c
| | * Update danish Qt translation from 5.8 to 5.9v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0scootergrisen2017-05-159-218/+1296
| | | | | | | | | | | | | | | | | | Change-Id: I0083cbee6fc1702bca14c08b1707dfe7479a8fbe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * Catalan translations for Qt 5.9Josep Ma. Ferrer2017-05-082-83/+547
| | | | | | | | | | | | | | | | | | | | | | | | New Catalan translations for Qt 5.9 (qtbase & qtmultimedia). Change-Id: Ibac184e37752aeb8b76acbfe848d6ea5eb749d2f Reviewed-by: Albert Astals Cid <aacid@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Update Polish translationsJarek Kobus2017-05-298-376/+691
| | | | | | | | | | | | | | | | | | Change-Id: Ief200858946207698c522e7dcb420162bcadf3ca Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: I4c43d0a8e3331b9c2baee69499b478ad2d120c96
| * Merge remote-tracking branch 'origin/5.8' into 5.9.0v5.9.0-beta4Oswald Buddenhagen2017-05-041-21/+134
| |\
| | * Catalan translation update for Qt 5.85.8Josep Ma. Ferrer2017-04-231-21/+134
| | | | | | | | | | | | | | | | | | This contains Catalan translation updates for Qt 5.8 branch Change-Id: I485072de98bfaad1e0f34fb500aa3eadf2a6b10c
| * | Update German translations for 5.9Friedemann Kleint2017-05-029-369/+1419
| | | | | | | | | | | | | | | Change-Id: I155fca766a29264f55028f9c1ee1764377e8f0fe Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Oswald Buddenhagen2017-05-0218-8082/+30366
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1f526a22222a69a8f9f156216dc9ca8b26bbf73a
| | * | Add Scottish Gaelic translation for qtbaseGunChleoc2017-04-211-0/+6660
| | | | | | | | | | | | | | | | | | | | Change-Id: I30f2448f0faa61b0aaee77858adce3123422d721 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | Qt Spanish translationJesus Fernandez2017-04-0317-8082/+23706
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spanish translation updates Change-Id: Id6e1e2b6716391687dff603e6f372933d09d4099 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2892459781b4b66158c2f3b0a4cb1cc6834991b8
| * | | Update Czech translationsPavel Fric2017-04-285-13/+783
| | | | | | | | | | | | | | | | Change-Id: I2f46ab12456e4c5419add69f1d1fcd36937aac8a
| * | | Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3Liang Qi2017-04-1924-839/+24702
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I68bbf7130c9f5ae5a11f09bc3c085713b17c50ea
| | * | Add Bulgarian translationLyubomir Vasilev2017-04-1916-0/+23847
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59bd22de612b97bd626361affcbaee9d1ad39b2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
| | * | Update some danish Qt translationsscootergrisen2017-04-038-839/+855
| | | | | | | | | | | | | | | | | | | | Change-Id: I90d340396f953a6f98b4492f78dcddb037d69976 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: I908a7ff4526def640634d7921f36e8707fdd59a1
* | | Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2v5.9.0-beta1v5.9.0-alpha1Liang Qi2017-01-3054-10187/+29614
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I51d9dc5f0e6536e7ec76098f7b87acda7dc593f1
| * | Merge remote-tracking branch 'origin/5.8.0' into 5.8Oswald Buddenhagen2017-01-218-313/+1093
| |\ \
| | * | Update Polish translationsv5.8.0-rc1v5.8.05.8.0Jarek Kobus2016-12-158-313/+1093
| | | | | | | | | | | | | | | | | | | | Change-Id: I57d04245d1da31db05656ea91c2521fc69aae249 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Oswald Buddenhagen2017-01-2115-8628/+22310
| |\ \ \
| | * | | Update danish translation5.7scootergrisen2017-01-2014-8627/+22309
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b9af1ffa37cf8d018bbbc9428a1fbcb473042f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | | Hebrew: Minor improvementOrgad Shaneh2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09f24d0868e5f052e7234f0a66ef1cf07f235fc5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2017-01-181-26/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Ic24b592e58e2ca0daaba6a201423ff61952c0d49
| | * | | Update Hebrew translationOrgad Shaneh2017-01-061-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id71265b5285860ceed766bb855d3b7bd93992d86 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | | Update Finnish translation for 5.8Lasse Liehu2017-01-123-140/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0893dbe20143dae5db8fc7ed3ab48298fa2522f Reviewed-by: Aki Koskinen <qt@akikoskinen.info> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9512ad541ce33a1f6ea16943da004d48cd1ee9ec
| * | | | Update Korean translations for Qt 5.8Shinjo Park2016-12-2113-238/+3002
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This contains Korean translations for Qt 5.8 branch. Change-Id: Ibae3290f111f366258c8583815cf04bd3f4244bf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-10/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ie91720458cb7386279b75d507e0e6a1b6707e53d
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-241-10/+1
| | |\ \ | | | |/ | | | | | | | | Change-Id: Icd10b90cb56d5a7fae05d2eaff6a67f747358c29
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-231-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ibfe818917b5ecf347f0251ac7d0743ca804374b0 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | Update German translations for 5.8Friedemann Kleint2016-11-037-181/+312
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1b4dc578c7e7a22277d3ab6b08e84ace9c5a69c Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>