diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
| commit | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (patch) | |
| tree | 191b227596f18333f1609ff824d2746dd7f1090f /translations | |
| parent | 26139fcacc05b4a74fce1ef4e0db819118765310 (diff) | |
| parent | 2d071521228a6bc9ef423cbdbbd8560d28208790 (diff) | |
| download | Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.zip Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.gz Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/qwindowsurface_gl.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> |