diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 09:33:35 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 09:33:35 (GMT) |
commit | 78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0 (patch) | |
tree | ad6ea9ebd921cb1c3ee896f4f29cb52f1b6dcdfb /translations/qt_ja_JP.ts | |
parent | 71dedbee1f5a23411e2c82157a6fe6ee5d48ab6e (diff) | |
parent | 02bdd61245da529ff99cdebc939b33fefe398f48 (diff) | |
download | Qt-78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0.zip Qt-78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0.tar.gz Qt-78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits)
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
10n: Update German translation for 4.7.0
Redesigned filter widgets
Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07
Add Japanese/Korean keyboard specific keys to QKeySequence
Fixed qmdiarea autotest regression on Cocoa
Fix JSC export macros
Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890
Incorrect translation for Application menu items in Mac.
doc: Fixed use of Qt 3 support function in QIcon doc snippet
Build and run QElapsedTimer test.
Fix license headers.
Add flag to indicate that network sessions are expected on a platform.
...
Diffstat (limited to 'translations/qt_ja_JP.ts')
-rw-r--r-- | translations/qt_ja_JP.ts | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/translations/qt_ja_JP.ts b/translations/qt_ja_JP.ts index f0dae3a..e6f92b7 100644 --- a/translations/qt_ja_JP.ts +++ b/translations/qt_ja_JP.ts @@ -23,6 +23,21 @@ <source>Show All</source> <translation>すべてを表示</translation> </message> + <message> + <location line="+1"/> + <source>Preferences...</source> + <translation>環境設定...</translation> + </message> + <message> + <location line="+1"/> + <source>Quit %1</source> + <translation>%1 を終了</translation> + </message> + <message> + <location line="+1"/> + <source>About %1</source> + <translation>%1 について</translation> + </message> </context> <context> <name>CloseButton</name> |