Ignore:
Timestamp:
Mar 8, 2010, 12:52:58 PM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.2 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/translations/designer_de.ts

    r561 r651  
    518518    <message>
    519519        <location line="+89"/>
    520         <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+907"/>
     520        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+9"/>
    521521        <source>Move action</source>
    522522        <translation>Aktion verschieben</translation>
    523523    </message>
    524524    <message>
    525         <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-424"/>
     525        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-4"/>
    526526        <source>Change Title</source>
    527527        <translation>Titel Àndern</translation>
     
    10281028    <name>FormBuilder</name>
    10291029    <message>
    1030         <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+359"/>
     1030        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+3"/>
    10311031        <source>Invalid stretch value for &apos;%1&apos;: &apos;%2&apos;</source>
    10321032        <extracomment>Parsing layout stretch values</extracomment>
     
    14131413    </message>
    14141414    <message>
    1415         <location line="+119"/>
     1415        <location line="+1"/>
    14161416        <source>The creation of a widget of the class &apos;%1&apos; failed.</source>
    14171417        <translation>Es konnte kein Widget der Klasse &apos;%1&apos; erzeugt werden.</translation>
     
    22742274    <name>QFormBuilder</name>
    22752275    <message>
    2276         <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+163"/>
     2276        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+16"/>
    22772277        <source>An empty class name was passed on to %1 (object name: &apos;%2&apos;).</source>
    22782278        <extracomment>Empty class name passed to widget factory method</extracomment>
     
    23132313        <source>The property %1 could not be written. The type %2 is not supported yet.</source>
    23142314        <translation>Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstÃŒtzt wird.</translation>
     2315
     2316
     2317
     2318
     2319
     2320
     2321
     2322
     2323
     2324
    23152325    </message>
    23162326</context>
     
    24472457    <name>QtBoolEdit</name>
    24482458    <message>
    2449         <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+226"/>
     2459        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+2"/>
    24502460        <location line="+10"/>
    24512461        <location line="+25"/>
     
    24762486    <name>QtCharEdit</name>
    24772487    <message>
    2478         <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1581"/>
     2488        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+158"/>
    24792489        <source>Clear Char</source>
    24802490        <translation>Zeichen löschen</translation>
     
    24922502    <name>QtColorPropertyManager</name>
    24932503    <message>
    2494         <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4743"/>
     2504        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+47"/>
    24952505        <source>Red</source>
    24962506        <translation>Rot</translation>
     
    25152525    <name>QtCursorDatabase</name>
    25162526    <message>
    2517         <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-206"/>
     2527        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-26"/>
    25182528        <source>Arrow</source>
    25192529        <translation>Pfeil</translation>
     
    30633073    <message>
    30643074        <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.ui"/>
     3075
    30653076        <source>Select Gradient</source>
    30663077        <translation>Gradienten auswÀhlen</translation>
     
    30703081    <name>QtKeySequenceEdit</name>
    30713082    <message>
    3072         <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+221"/>
     3083        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+21"/>
    30733084        <source>Clear Shortcut</source>
    30743085        <translation>TastenkÃŒrzel löschen</translation>
     
    31323143    <name>QtPropertyBrowserUtils</name>
    31333144    <message>
    3134         <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-136"/>
     3145        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-16"/>
    31353146        <source>[%1, %2, %3] (%4)</source>
    31363147        <translation>[%1, %2, %3] (%4)</translation>
     
    39053916    <name>VersionDialog</name>
    39063917    <message>
    3907         <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+171"/>
     3918        <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+17"/>
    39083919        <source>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;&lt;br/&gt;Version %2</source>
    39093920        <translation>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;&lt;br/&gt;Version %2</translation>
     
    39213932    <message>
    39223933        <location line="+2"/>
    3923         <source>%1&lt;br/&gt;Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</source>
     3934        <source>%1&lt;br/&gt;Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).</source>
    39243935        <translation type="unfinished"></translation>
    39253936    </message>
     
    47434754    </message>
    47444755    <message>
    4745         <location line="+445"/>
     4756        <location line="+4"/>
    47464757        <source>Lay out</source>
    47474758        <translation>Layout</translation>
     
    47544765    </message>
    47554766    <message numerus="yes">
    4756         <location line="-1058"/>
     4767        <location line="-10"/>
    47574768        <source>Paste %n action(s)</source>
    47584769        <translation>
     
    47954806    </message>
    47964807    <message>
    4797         <location line="+576"/>
     4808        <location line="+5"/>
    47984809        <source>A QMainWindow-based form does not contain a central widget.</source>
    47994810        <translation>Ein auf QMainWindow basierendes Formular enthÀlt kein zentrales Widget.</translation>
    48004811    </message>
    48014812    <message>
    4802         <location line="-797"/>
     4813        <location line="-"/>
    48034814        <source>Raise widgets</source>
    48044815        <translation>Widgets nach vorn bringen</translation>
     
    48264837    <name>qdesigner_internal::FormWindowManager</name>
    48274838    <message>
    4828         <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+364"/>
     4839        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+36"/>
    48294840        <source>Cu&amp;t</source>
    48304841        <translation>&amp;Ausschneiden</translation>
Note: See TracChangeset for help on using the changeset viewer.