diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-10-07 14:21:59 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-10-07 14:21:59 +0200 |
| commit | 7cf9030bd7a50b6d98d454510417c6ecc3f33d49 (patch) | |
| tree | 7c5c562ba490e217d8cef81ff1fd5958a0cacccb /translations | |
| parent | 7f3cd2949ccb16b1b611c05bf6ab7274cf04a0f8 (diff) | |
| parent | 96fcfc720aa1c6d0b6d741f8169cd37ea9fcd9a9 (diff) | |
| download | qt4-tools-7cf9030bd7a50b6d98d454510417c6ecc3f33d49.tar.gz | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/qt_ko.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/translations/qt_ko.ts b/translations/qt_ko.ts index c7ab8e3638..b9e30f5b5e 100644 --- a/translations/qt_ko.ts +++ b/translations/qt_ko.ts @@ -6328,11 +6328,11 @@ Do you want to overwrite it?</source> </message> <message> <source>Touroku</source> - <translation type="unfinished"></translation> + <translation>단어 등록</translation> </message> <message> <source>Massyo</source> - <translation type="unfinished"></translation> + <translation>단어 지움</translation> </message> <message> <source>Kana Lock</source> @@ -6344,11 +6344,11 @@ Do you want to overwrite it?</source> </message> <message> <source>Eisu Shift</source> - <translation type="unfinished"></translation> + <translation>한자 Shift</translation> </message> <message> <source>Eisu toggle</source> - <translation type="unfinished"></translation> + <translation>한자 반전</translation> </message> <message> <source>Code input</source> |