summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into ↵v5.15.14-lts-lgpl5.15Tarja Sundqvist2024-05-081-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iec9a5141e11ef3e828e999582b74e9fd531a3164
| * Bump version to 5.15.14Tarja Sundqvist2023-03-011-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgplTarja Sundqvist2024-01-041-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iccf7c1246943d5b7a77fbe885b981c2a9d01a2c4
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I72b97fb8d5c94edc84e294080e1362491712299c Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I76ae62626c2ed198bd7c2e3c4d4396a0c22fa9d7
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: Id1d1213273aa1fa63bbb4e3087d68a1542b4787e
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ief45cf65a8f2e4ffb0520336eab8f82a85124100
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ie4d011fd79bba854e3bbb942855488c9040a7449
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ica66325cafbaed3cb4e4ab8909b1fa4c6248fa06
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I3e8fd934afd6d9e5554e4ceff22721204689015d
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-1224-3035/+4360
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia14d1bfbb009d7e97f62737ac64a3b775dc23d9a
| * Merge remote-tracking branch 'origin/5.15-tr' into lts-5.15Kai Köhne2021-09-2723-3034/+4359
| |\ | | | | | | | | | Change-Id: I90a8896a8e52cf7aafa0e0ae53add012076b8c1b
| | * Merge branch '5.12' into 5.15Oswald Buddenhagen2021-09-251-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I7e95d62f08fd102d07d0ede9ceb231545feb3303
| | | * rename (outdated) qt_pt.ts => qt_pt_PT.tsOswald Buddenhagen2021-09-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as that's what it really is. Fixes: QTBUG-95013 Change-Id: I7ecffed15c5bea3f47c2d5c0eea15dc7b13eeb83 Reviewed-by: Luiz Fernando Ranghetti <elchevive68@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Merge remote-tracking branch 'origin/5.12' into 5.15Oswald Buddenhagen2021-07-161-4/+4
| | |\| | | | | | | | | | | | | Change-Id: I19e42db2ac313cb27253f5dc06d699271c4e79e9
| | | * fix pt_BR meta catalogOswald Buddenhagen2021-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-95014 Change-Id: If01521cc23038328006533f08eb0ba4de1a64eee Reviewed-by: Luiz Fernando Ranghetti <elchevive68@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | Update simplified chinese translationTyson Tan2021-06-285-698/+1404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1dc30179591b758720f37f109c553fd910ae3ee Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Zhang Hao <zhanghao@uniontech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| | * | update dutch translationsOswald Buddenhagen2021-06-1410-2250/+2869
| | | | | | | | | | | | | | | | | | | | | | | | | | | | contributed by Freek de Kruijf. Change-Id: I229b20a76d1671ca1ef97555deb9c3e97016611d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| | * | Update Catalan translations for Qt 5.15.2Josep Ma. Ferrer2021-06-096-82/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Typos & improvements Change-Id: Ibcdd3b3b5b5da8f8bca275b02da577acb963dc8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * | | Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | | | | | | | | | Change-Id: I979c00e164975078904af16284c51286f6c064c4
* | | | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I78c223ad0caab3a25fd41ede15e021eac434752b
| * | | Bump versionTarja Sundqvist2021-06-071-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\| | | | | | | | | | | | | | | tqtc/lts-5.15-opensource
| * | | Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ibd344ca318c7fe7151a3973bdf1ab7a5efc5203e
* | | | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9670b492d2a6889a3306f55c1edfb1fe88cc77f5
| * | | Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | | | | | | | | | Change-Id: I745f15156531549eec6348cb8511fcd2ba0bf0f0
* | | | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-232-22/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1bd8194ea9ea5f3085a0cb689fc5408782d14a2f. Revert of commercial license header changes is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I9fe565533596e75cd41bb55d6fc0857b61f2fdd4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* / / Update commercial license headersTarja Sundqvist2021-01-262-22/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated header.COMM to the files with GPL-EXCEPT license header in tqtc-qttranslations. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4212 Change-Id: I6a71caed50a34b0d6b38f6b5cfdb625df497050e Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.15Oswald Buddenhagen2020-12-124-4304/+1
|\| | | | | | | | | | | | | | | this also sneaks in the deletions of qmlviewer and qtquick1 files which slipped through the previous merges due to not causing physical conflicts due to being new. Change-Id: I7d88ad542b70fc30142ebac0979836a29f2380c7
| * prune bogus comment from linguist_nlv5.12.11Oswald Buddenhagen2020-12-111-1995/+1
| | | | | | | | | | | | | | | | something must have gone wrong during the po => ts conversion. Change-Id: I84d4b0e7558d371ccba0b69d60ea0c87208d29f9 Reviewed-by: Freek de Kruijf <freekdekruijf@kde.nl> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | Update pt_BR translations for 5.15 branchLuiz Fernando Ranghetti2020-12-017-875/+993
| | | | | | | | | | | | Change-Id: Ia5f7894d3bc58c6f026f37629bc8e8b2c05a70b7 Reviewed-by: André Marcelo Alvarenga <alvarenga@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | Merge remote-tracking branch 'origin/5.12' into 5.15Oswald Buddenhagen2020-11-2611-5260/+44
|\| | | | | | | Change-Id: Idccf10b1abf4ebabf47760b783c532b1f818d4a0
| * Remove obsolete entries from zh_CN translationsLi Xinwei2020-11-2611-5260/+44
| | | | | | | | | | | | | | Amends 0106ec52. Change-Id: I86f58e480c863a52b180d062b2609a84ed4e47a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | Merge remote-tracking branch 'origin/5.13' into 5.15Oswald Buddenhagen2020-11-2514-0/+23876
|\ \ | | | | | | | | | Change-Id: I86a1817f3ca9b12cd54956e7a0d72a1a8078fdb0
| * | add croatian translation5.13Oswald Buddenhagen2020-04-0214-0/+23876
| | | | | | | | | | | | | | | | | | | | | | | | contributed by Milo Ivir. Fixes: QTBUG-75911 Change-Id: I2c853e4a3efbd43aaaf52eb9a046cc0128e049c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | | Merge remote-tracking branch 'origin/5.12' into 5.15Oswald Buddenhagen2020-11-2550-24171/+80368
|\ \ \ | | |/ | |/| | | | Change-Id: Ic0b22edb19619d0e642f663cb9ee66038040f6d9
| * | update chinese simplifid language for qt5.12Wenjia Wang2020-11-2514-13826/+23416
| | | | | | | | | | | | | | | Change-Id: I82de2d5265429b9177f8b7d37f5c579e42205afb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * | Add dutch (nl) files and partial translationsRichard Duivenvoorde2020-11-2516-0/+27196
| | | | | | | | | | | | | | | | | | | | | | | | | | | There were no dutch ts files yet. Translations done by Freek de Kruijf. They are current as of Qt 5.11. Change-Id: Id3c063c89f72b9422dedc43b0f6140647ec9db35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * | Split and update Persian translationsSoroush Rabiei2020-11-257-10343/+12248
| | | | | | | | | | | | | | | | | | | | | | | | Current as of Qt 5.6; many translated strings still marked as unfinished. Change-Id: I656c591522b3f405632e1cdfa03a6b998898ce65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * | Add pt_BR translations for 5.12Luiz Fernando Ranghetti2020-11-2512-0/+17506
| | | | | | | | | | | | | | | | | | Change-Id: Icc4b902063e9f161273a51af0582eae43a4f484d Reviewed-by: André Marcelo Alvarenga <alvarenga@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * | Bump versionJani Heikkinen2020-11-061-1/+1
| | | | | | | | | | | | Change-Id: I69b33aed3f24726a7d68b17c623addabcca382c0
| * | Bump versionv5.12.10Jani Heikkinen2020-10-141-1/+1
| | | | | | | | | | | | Change-Id: I8af0e7a85d9798afc8fe2d82329c39eed1029a62
| * | Bump versionv5.12.9Alexandru Croitor2020-04-221-1/+1
| | | | | | | | | | | | Change-Id: Id584aa8fa5534903ec89cc08f2066b307a25c498
| * | Bump versionv5.12.8Alexandru Croitor2020-01-281-1/+1
| | |
| * | fix translation of "discard" in italianv5.12.7Oswald Buddenhagen2020-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | contributed by Matteo Monteleone. Fixes: QTBUG-81089 Change-Id: Iad46a27a9927dbbb37217e2549693a9d230d087f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | | Add initial translation for Norwegian NynorskKarl Ove Hufthammer2020-11-258-0/+11152
| | | | | | | | | | | | | | | Change-Id: I50102fe4d9beef77dc0be087334240125dfe71af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>