diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
| commit | cb50699b39e016a64a2a06088042622546c428a2 (patch) | |
| tree | 77d269a3103a6c140098b9caaafd17a29a81addd /translations | |
| parent | 89807f70656b95c1568ef183dd7f28c527fc3eaa (diff) | |
| parent | 890c1110ec5e39bb6e63e99fe09c296c1ea824be (diff) | |
| download | Qt-cb50699b39e016a64a2a06088042622546c428a2.zip Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.gz Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'translations')
| -rw-r--r--[-rwxr-xr-x] | translations/assistant_ja.ts | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | translations/linguist_ja.ts | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | translations/qt_ja.ts | 0 | ||||
| -rw-r--r-- | translations/qt_zh_CN.ts | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/translations/assistant_ja.ts b/translations/assistant_ja.ts index c449e00..c449e00 100755..100644 --- a/translations/assistant_ja.ts +++ b/translations/assistant_ja.ts diff --git a/translations/linguist_ja.ts b/translations/linguist_ja.ts index 2f948e8..2f948e8 100755..100644 --- a/translations/linguist_ja.ts +++ b/translations/linguist_ja.ts diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts index 095631e..095631e 100755..100644 --- a/translations/qt_ja.ts +++ b/translations/qt_ja.ts diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts index df23f43..6fe8c60 100644 --- a/translations/qt_zh_CN.ts +++ b/translations/qt_zh_CN.ts @@ -921,7 +921,7 @@ to <message> <location line="-8"/> <source>&Select All</source> - <translation>选择关部(&S)</translation> + <translation>选择全部(&S)</translation> </message> </context> <context> |