diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 10:39:21 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 10:39:21 (GMT) |
| commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
| tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /translations/designer_fr.ts | |
| parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
| parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
| download | Qt-3aca005d4721b82446922310496271ebe206a0d7.zip Qt-3aca005d4721b82446922310496271ebe206a0d7.tar.gz Qt-3aca005d4721b82446922310496271ebe206a0d7.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.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> |