diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
| commit | 226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch) | |
| tree | 491c25c4c9f08b6ef732a9179d2e64776a9e8446 /translations/designer_fr.ts | |
| parent | 84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff) | |
| parent | 59a35a794e433f9526aff72025c0899e76ef362e (diff) | |
| download | Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.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 9bf3810..5b75a77 100644 --- a/translations/designer_fr.ts +++ b/translations/designer_fr.ts @@ -3975,8 +3975,8 @@ Voulez-vous le remplacer ?</translation> </message> <message> <location line="+2"/> - <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> + <source>%1<br/>Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</source> + <translation>%1<br/>Copyright (C) 2011 Nokia Corporation et/ou ses filiales.</translation> </message> </context> <context> |