diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 08:57:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 08:57:04 (GMT) |
| commit | 287a8d25b0e13602d02abc301e64060f46fff0e9 (patch) | |
| tree | 80bafdfad740e2618f04d165182c6f88cbd537da | |
| parent | 622a27c582f859274a5b9e40c625a6fda600b7b1 (diff) | |
| parent | 04b2c18ea04abcf38df4f924479a0aed75fe40c9 (diff) | |
| download | Qt-287a8d25b0e13602d02abc301e64060f46fff0e9.zip Qt-287a8d25b0e13602d02abc301e64060f46fff0e9.tar.gz Qt-287a8d25b0e13602d02abc301e64060f46fff0e9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix translation mistake spotted by Laurent Montel
| -rw-r--r-- | translations/designer_fr.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/translations/designer_fr.ts b/translations/designer_fr.ts index b3bf4de..bfdbb73 100644 --- a/translations/designer_fr.ts +++ b/translations/designer_fr.ts @@ -1166,7 +1166,7 @@ <message> <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="166"/> <source>&Pixmap Function</source> - <translation>Function de &pixmap</translation> + <translation>Fonction de &pixmap</translation> </message> <message> <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="219"/> |