| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
|
| |
| |
| |
| |
| | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
typo fixes;
clarify several strings;
use 'own languages' hack
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
almost done; only few strings left untranslated.
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
- unification
- typos
Merge-request: 823
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
|
| |
| |
| |
| |
| | |
Merge-request: 689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Added QtWebkit and QXmlPatterns translations.
This is an almost complete translation.
Merge-request: 689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
it simply breaks too much (embedded builds in particular).
will come up with something better in master.
note however, that the .qm files do NOT return to the repository. the
release manager needs to run "make qm" before packaging, just like
Qt-from-git users who want translations do (i.e., almost nobody).
Reviewed-by: Jason McDonald
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
search path
unlike moc and uic, lrelease is not statically built, so when building
without RPATH, we need to ensure that our libraries are found first.
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- avoid exclamation mark
- prefer passive forms ("Tue dies" -> "Dies tun")
- unification in wording (Katalogdatei, "QT" -> "Qt", "wollen" -> "möchten")
- typos (missing dahes, casing, ...)
Merge-request: 680
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
consequently, remove the qm files from the repository
this uses some really black magic to convince qmake to do the right
thing. this will be fixed properly in a later version.
Reviewed-by: mariusSO
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Thomas Sondergaard (2):
Danish translations
Updated danish translations. Added them to relevant project files.
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Frederik Schwarzer (4):
wording: Warnung -> Achtung
wording: Voransicht -> Vorschau
wrong translation of the Chinese writing systems
quite a bunch of fixes and suggenstions
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/504
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
If it comes to unification in wording style, there is a long road
ahead...
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The translations for Traditional and Simplified Chinese are
Chinesisch (Langzeichen) and Chinesisch (Kurzzeichen)
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Ritt Konstantin (1):
Update Russian translation for Qt libraries (xmlpatterns and
statemachine are not translated yet)
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/525
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |/ / /
| | | |
| | | |
| | | | |
are not translated yet)
|
|/ / / |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
KOBAYASHI Tomoyuki (1):
Update japanese translation file "translations/qt_ja_JP.ts".
Repository: git://gitorious.org/~maron/qt/marons-clone.git
Branch: master (6a94214e691966874faaab0bacd5d787850e0546)
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/447
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Merge commit '6a94214e691966874faaab0bacd5d787850e0546' into HEAD
Merge commit '6a94214e691966874faaab0bacd5d787850e0546' into HEAD
|
| | | |
| | | |
| | | |
| | | | |
QtXmlPatterns is not completed.
|
|\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |
| |
| |
| |
| |
| |
| |
| | |
Remove the *_tr_TR.ts files added in change
5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from
.pro files to prevent them coming back next time someone does "make ts".
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|
| |
| |
| |
| |
| |
| | |
Add Copyright message as requested by Legal, and update .ts files again.
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qheaderview_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update the text of the About Qt dialog, as directed by Legal. Note that
this change breaks string freeze as the text is translatable, however
Legal has decided that shipping legally correct text has priority over
shipping complete translations. This change includes updated .ts files
to correct the source strings, but no updated translations.
This change also removes out-of-date licensing text from the About
dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer.
Those particular changes should not break translations as they only
remove translatable strings and do not modify any others.
Task-number: 247608
Reviewed-by: Trust Me
.....review will be conducted after submission.
|
| |
|
|
|