summaryrefslogtreecommitdiffstats
path: root/translations/designer_de.ts
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-13 10:39:21 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-13 10:39:21 (GMT)
commit3aca005d4721b82446922310496271ebe206a0d7 (patch)
treef71298b19bd98c6b3751bc9009b2fdb49c2ad526 /translations/designer_de.ts
parent6088336d9237eaa94def8c2a83901b547e682abb (diff)
parent48e08ee5718b3de855ecea626179ad5323e38fa0 (diff)
downloadQt-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_de.ts')
-rw-r--r--translations/designer_de.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/translations/designer_de.ts b/translations/designer_de.ts
index 76ccbfb..b731595 100644
--- a/translations/designer_de.ts
+++ b/translations/designer_de.ts
@@ -3920,7 +3920,7 @@ Möchten Sie sie überschreiben?</translation>
</message>
<message>
<location line="+2"/>
- <source>%1&lt;br/&gt;Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</source>
+ <source>%1&lt;br/&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</source>
<translation type="unfinished"></translation>
</message>
</context>