diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-13 18:55:05 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-13 18:55:05 (GMT) |
| commit | 7d1e48639d6d3897e66779f22fe02d17d6c38707 (patch) | |
| tree | 7abc16568274e1f54c976f890e92d73f7a00160c /translations/designer_fr.ts | |
| parent | 20e0e7a849d70139f9106f60c78fd0c736ec3c4b (diff) | |
| parent | e1b03bac22f87edbbe78eba366966259be6eb0ed (diff) | |
| download | Qt-7d1e48639d6d3897e66779f22fe02d17d6c38707.zip Qt-7d1e48639d6d3897e66779f22fe02d17d6c38707.tar.gz Qt-7d1e48639d6d3897e66779f22fe02d17d6c38707.tar.bz2 | |
Merge branch '4.6'
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'translations/designer_fr.ts')
| -rw-r--r-- | translations/designer_fr.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/translations/designer_fr.ts b/translations/designer_fr.ts index 7c18290..b3bf4de 100644 --- a/translations/designer_fr.ts +++ b/translations/designer_fr.ts @@ -3951,8 +3951,8 @@ Voulez-vous le remplacer ?</translation> </message> <message> <location filename="../tools/designer/src/designer/versiondialog.cpp" line="175"/> - <source>%1<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</source> - <translation>%1<br/>Copyright (C) 2009 Nokia Corporation et/ou ses filiales.</translation> + <source>%1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source> + <translation>%1<br/>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</translation> </message> </context> <context> |